Sync upstream to v1.8.0 (#98)

* Sync upstream to v1.8.0 * Use clang in windows
kyamagu · Mar 1, 2024 · 63ec52d · 63ec52d
1 parent 116b034
commit 63ec52d
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -56,7 +56,7 @@ jobs:
             opt_level: generic
           - os: windows-latest
             arch: auto64
-            opt_level: generic  # Upstream incompatible with AVX2 and AVX512
+            opt_level: avx2
 
     steps:
       - uses: actions/checkout@v4
@@ -74,7 +74,7 @@ jobs:
           platforms: arm64
 
       - name: Install cibuildwheel
-        run: python -m pip install cibuildwheel==2.16.2
+        run: python -m pip install cibuildwheel==2.16.5
 
       - name: Build wheels
         run: python -m cibuildwheel --output-dir wheelhouse

diff --git a/faiss b/faiss
diff --git a/pyproject.toml b/pyproject.toml
@@ -8,7 +8,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "faiss-cpu"
-version = "1.7.4"
+version = "1.8.0"
 authors = [
     { name = "Kota Yamaguchi", email = "[email protected]" },
 ]

diff --git a/scripts/build_Windows.sh b/scripts/build_Windows.sh
@@ -13,6 +13,7 @@ cd faiss && \
     cmake . \
         -B build \
         -A x64 \
+        -T ClangCL \
         -DFAISS_ENABLE_GPU=OFF \
         -DFAISS_ENABLE_PYTHON=OFF \
         -DFAISS_OPT_LEVEL=${FAISS_OPT_LEVEL:-"generic"} \

diff --git a/setup.py b/setup.py
@@ -40,7 +40,7 @@ def win32_options(
     """Windows options."""
     return dict(
         extra_compile_args=extra_compile_args + [
-            "/openmp",
+            "/openmp:llvm",
             "/std:c++17",
             "/Zc:inline",
             "/wd4101",  # unreferenced local variable.
+80 −34		.circleci/config.yml
+30 −2		CHANGELOG.md
+4 −4		CMakeLists.txt
+90 −32		benchs/bench_fw/benchmark.py
+23 −11		benchs/bench_fw/benchmark_io.py
+4 −1		benchs/bench_fw/descriptors.py
+127 −76		benchs/bench_fw/index.py
+333 −0		benchs/bench_fw/optimize.py
+155 −14		benchs/bench_fw/utils.py
+528 −616		benchs/bench_fw_notebook.ipynb
+58 −0		benchs/bench_fw_optimize.py
+193 −0		benchs/bench_ivfflat_raft.py
+168 −0		benchs/bench_ivfpq_raft.py
+1 −1		cmake/thirdparty/fetch_rapids.cmake
+1 −0		conda/conda_build_config.yaml
+13 −4		conda/faiss-gpu-raft/meta.yaml
+11 −4		conda/faiss-gpu/meta.yaml
+5 −0		contrib/ivf_tools.py
+2 −2		faiss/Index.h
+0 −2		faiss/IndexBinaryIVF.cpp
+10 −3		faiss/IndexIDMap.cpp
+18 −8		faiss/IndexIVF.cpp
+4 −1		faiss/IndexIVF.h
+1 −1		faiss/IndexIVFFastScan.cpp
+4 −3		faiss/IndexIVFFlat.cpp
+2 −1		faiss/IndexIVFFlat.h
+10 −6		faiss/IndexIVFPQ.cpp
+4 −2		faiss/IndexIVFPQ.h
+2 −1		faiss/IndexIVFPQR.cpp
+2 −1		faiss/IndexIVFPQR.h
+5 −5		faiss/IndexScalarQuantizer.cpp
+2 −1		faiss/IndexScalarQuantizer.h
+45 −15		faiss/gpu/CMakeLists.txt
+3 −4		faiss/gpu/GpuCloner.cpp
+4 −0		faiss/gpu/GpuClonerOptions.h
+16 −5		faiss/gpu/GpuDistance.cu
+7 −0		faiss/gpu/GpuDistance.h
+13 −2		faiss/gpu/GpuIndex.cu
+8 −0		faiss/gpu/GpuIndex.h
+7 −3		faiss/gpu/GpuIndexFlat.cu
+8 −43		faiss/gpu/GpuIndexIVF.cu
+130 −70		faiss/gpu/GpuIndexIVFFlat.cu
+3 −1		faiss/gpu/GpuIndexIVFFlat.h
+238 −75		faiss/gpu/GpuIndexIVFPQ.cu
+18 −1		faiss/gpu/GpuIndexIVFPQ.h
+5 −0		faiss/gpu/GpuResources.h
+19 −20		faiss/gpu/StandardGpuResources.cpp
+4 −7		faiss/gpu/StandardGpuResources.h
+2 −2		faiss/gpu/impl/IVFBase.cuh
+2 −2		faiss/gpu/impl/IVFPQ.cuh
+2 −2		faiss/gpu/impl/RaftFlatIndex.cu
+2 −0		faiss/gpu/impl/RaftFlatIndex.cuh
+97 −153		faiss/gpu/impl/RaftIVFFlat.cu
+12 −11		faiss/gpu/impl/RaftIVFFlat.cuh
+546 −0		faiss/gpu/impl/RaftIVFPQ.cu
+150 −0		faiss/gpu/impl/RaftIVFPQ.cuh
+2 −1		faiss/gpu/test/TestGpuIndexFlat.cpp
+29 −24		faiss/gpu/test/TestGpuIndexIVFFlat.cpp
+299 −208		faiss/gpu/test/TestGpuIndexIVFPQ.cpp
+1 −0		faiss/gpu/test/TestGpuMemoryException.cpp
+18 −6		faiss/gpu/test/test_gpu_index.py
+9 −3		faiss/gpu/test/test_gpu_index_ivfsq.py
+8 −3		faiss/gpu/test/test_gpu_index_serialize.py
+7 −1		faiss/gpu/test/test_multi_gpu.py
+1 −0		faiss/gpu/utils/CopyUtils.cuh
+2 −2		faiss/gpu/utils/DeviceVector.cuh
+117 −0		faiss/gpu/utils/RaftUtils.cu
+20 −2		faiss/gpu/utils/RaftUtils.h
+1 −1		faiss/impl/HNSW.cpp
+3 −1		faiss/impl/LocalSearchQuantizer.cpp
+1 −1		faiss/impl/ProductAdditiveQuantizer.h
+9 −0		faiss/impl/platform_macros.h
+11 −7		faiss/invlists/InvertedLists.cpp
+9 −3		faiss/invlists/InvertedLists.h
+1 −1		faiss/invlists/OnDiskInvertedLists.cpp
+1 −1		faiss/python/setup.py
+16 −9		faiss/utils/distances.cpp
+2 −0		faiss/utils/distances.h
+1 −1		faiss/utils/distances_fused/simdlib_based.cpp
+11 −26		faiss/utils/distances_simd.cpp
+0 −1		faiss/utils/hamming_distance/neon-inl.h
+2 −1		faiss/utils/partitioning.cpp
+3 −0		tests/CMakeLists.txt
+20 −0		tests/test_contrib.py
+66 −0		tests/test_fastscan_perf.cpp
+242 −0		tests/test_ivf_index.cpp
+3 −3		tests/test_ondisk_ivf.cpp
+18 −0		tests/test_search_params.py
+1 −3		tests/test_threaded_index.cpp