Update faiss to v1.7.2 release (#51) Update faiss to v1.7.2 release
@@ -64,7 +64,7 @@ jobs:
|
|
64 |
- name: Build wheels
|
65 |
uses: pypa/cibuildwheel@v2.1.1
|
66 |
env:
|
67 |
-
|
68 |
CIBW_ARCHS: ${{ matrix.arch }}
|
69 |
CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
|
70 |
CIBW_ENVIRONMENT: >
|
@@ -80,7 +80,7 @@ jobs:
|
|
80 |
LIB="${LIB};${CMAKE_PREFIX_PATH}\\lib;${CONDA}\\Library\\lib"
|
81 |
CPATH="${CPATH};${CMAKE_PREFIX_PATH}\\include;${CONDA}\\Library\\include"
|
82 |
CIBW_BEFORE_ALL: bash scripts/build_${{ runner.os }}.sh
|
83 |
-
CIBW_BEFORE_BUILD_WINDOWS: pip install delvewheel
|
84 |
CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: delvewheel repair -v -w {dest_dir} {wheel}
|
85 |
CIBW_TEST_REQUIRES: pytest scipy
|
86 |
CIBW_TEST_COMMAND: >
|
64 |
- name: Build wheels
|
65 |
uses: pypa/cibuildwheel@v2.1.1
|
66 |
env:
|
67 |
+
CIBW_SKIP: pp*
|
68 |
CIBW_ARCHS: ${{ matrix.arch }}
|
69 |
CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
|
70 |
CIBW_ENVIRONMENT: >
|
80 |
LIB="${LIB};${CMAKE_PREFIX_PATH}\\lib;${CONDA}\\Library\\lib"
|
81 |
CPATH="${CPATH};${CMAKE_PREFIX_PATH}\\include;${CONDA}\\Library\\include"
|
82 |
CIBW_BEFORE_ALL: bash scripts/build_${{ runner.os }}.sh
|
83 |
+
CIBW_BEFORE_BUILD_WINDOWS: pip install delvewheel
|
84 |
CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: delvewheel repair -v -w {dest_dir} {wheel}
|
85 |
CIBW_TEST_REQUIRES: pytest scipy
|
86 |
CIBW_TEST_COMMAND: >
|
@@ -1 +1 @@
|
|
1 |
-
Subproject commit
|
1 |
+
Subproject commit c08cbff1a4d6c9afb6b8f69004c5530aaf80237a
|
@@ -7,7 +7,8 @@ FAISS_OPT_LEVEL=${FAISS_OPT_LEVEL:-"generic"}
|
|
7 |
|
8 |
CUDA_VERSION="10.0"
|
9 |
CUDA_PKG_VERSION="10-0-10.0.130-1"
|
10 |
-
CUBLAS_PKG_VERSION
|
|
|
11 |
NVIDIA_REPO_URL="http://developer.download.nvidia.com/compute/cuda/repos/rhel7/x86_64/cuda-rhel7.repo"
|
12 |
CMAKE_CUDA_ARCHITECTURES="35-real;50-real;60-real;70-real;75"
|
13 |
|
@@ -25,6 +26,7 @@ if [[ ${FAISS_ENABLE_GPU} == "ON" ]]; then
|
|
25 |
yum -y install \
|
26 |
cuda-command-line-tools-${CUDA_PKG_VERSION} \
|
27 |
cuda-cublas-dev-${CUBLAS_PKG_VERSION} \
|
|
|
28 |
devtoolset-7-gcc \
|
29 |
devtoolset-7-gcc-c++ \
|
30 |
devtoolset-7-gcc-gfortran \
|
7 |
|
8 |
CUDA_VERSION="10.0"
|
9 |
CUDA_PKG_VERSION="10-0-10.0.130-1"
|
10 |
+
CUBLAS_PKG_VERSION=${CUDA_PKG_VERSION}
|
11 |
+
CURAND_PKG_VERSION=${CUDA_PKG_VERSION}
|
12 |
NVIDIA_REPO_URL="http://developer.download.nvidia.com/compute/cuda/repos/rhel7/x86_64/cuda-rhel7.repo"
|
13 |
CMAKE_CUDA_ARCHITECTURES="35-real;50-real;60-real;70-real;75"
|
14 |
|
26 |
yum -y install \
|
27 |
cuda-command-line-tools-${CUDA_PKG_VERSION} \
|
28 |
cuda-cublas-dev-${CUBLAS_PKG_VERSION} \
|
29 |
+
cuda-curand-dev-${CURAND_PKG_VERSION} \
|
30 |
devtoolset-7-gcc \
|
31 |
devtoolset-7-gcc-c++ \
|
32 |
devtoolset-7-gcc-gfortran \
|
@@ -5,7 +5,7 @@
|
|
5 |
import os
|
6 |
|
7 |
NAME = 'faiss-cpu'
|
8 |
-
VERSION = '1.7.
|
9 |
|
10 |
LONG_DESCRIPTION = """
|
11 |
Faiss is a library for efficient similarity search and clustering of dense
|
@@ -55,6 +55,7 @@ def __str__(self):
|
|
55 |
'-Doverride=',
|
56 |
'-I' + FAISS_INCLUDE,
|
57 |
'-I' + FAISS_ROOT,
|
|
|
58 |
]
|
59 |
|
60 |
if sys.platform == 'win32':
|
5 |
import os
|
6 |
|
7 |
NAME = 'faiss-cpu'
|
8 |
+
VERSION = '1.7.2'
|
9 |
|
10 |
LONG_DESCRIPTION = """
|
11 |
Faiss is a library for efficient similarity search and clustering of dense
|
55 |
'-Doverride=',
|
56 |
'-I' + FAISS_INCLUDE,
|
57 |
'-I' + FAISS_ROOT,
|
58 |
+
'-doxygen',
|
59 |
]
|
60 |
|
61 |
if sys.platform == 'win32':
|
Faiss is a library for efficient similarity search and clustering of dense vectors. It contains algorithms that search in sets of vectors of any size, up to ones that possibly do not fit in RAM. It also contains supporting code for evaluation and parameter tuning. Faiss is written in C++ with complete wrappers for Python/numpy. It is developed by Facebook AI Research.