Merge commits from Faiss master branch (#230)

The following commits were merged: * f969d7ae3b2797a31507363e255c34cac0762a6 * 0a00d8137a386a0efd7f789e3e0912ab4eb73508 * c3b9374984208f37484fb7b86c44345729592835 * 9bb6b4be0d95042d10beba65706cacc234592128 * 0c07a114ad9edd44af6dc00af2f5ae42d6f2bfad * 6c89c8bd4e239141f9a5fad224347b80114ea585 * 6b761503ba073688e3ebeaa60545633dad83d1ba * df7280b5f6d3c85a4b7e6f845e8e042a96b5c7a4 * 9a665324827fc7819e22bbdca46c84b3feeaf909 * b109d086a2a200b1697481dd3d79faedc585a623 Signed-off-by: Alexandr Guzhva <[email protected]>
zilliztech · Nov 29, 2023 · 0c7cef9 · 0c7cef9
1 parent 4a12f0f
commit 0c7cef9
Show file tree

Hide file tree

Showing 29 changed files with 2,011 additions and 328 deletions.
diff --git a/thirdparty/faiss/.circleci/config.yml b/thirdparty/faiss/.circleci/config.yml
@@ -9,7 +9,7 @@ executors:
     environment:
       CONDA_ARCH: Linux-x86_64
     machine:
-      image: linux-cuda-11:2023.02.1
+      image: linux-cuda-11:default
     resource_class: gpu.nvidia.medium
   linux-arm64-cpu:
     environment:
@@ -91,7 +91,7 @@ jobs:
       - run:
           name: Install conda build tools
           command: |
-            conda config --set solver libmamba
+            # conda config --set solver libmamba
             # conda config --set verbosity 3
             conda update -y -q conda
             conda install -y -q conda-build
@@ -171,7 +171,7 @@ jobs:
                   sudo update-alternatives --set cuda /usr/local/cuda-<<parameters.cuda>>
                   cd conda
                   conda build faiss-gpu-raft --variants '{ "cudatoolkit": "<<parameters.cuda>>", "c_compiler_version": "<<parameters.compiler_version>>", "cxx_compiler_version": "<<parameters.compiler_version>>" }' \
-                      -c pytorch -c nvidia -c rapidsai -c conda-forge
+                      -c pytorch -c nvidia -c rapidsai-nightly -c conda-forge
       - when:
           condition:
             and:
@@ -186,7 +186,7 @@ jobs:
                   sudo update-alternatives --set cuda /usr/local/cuda-<<parameters.cuda>>
                   cd conda
                   conda build faiss-gpu-raft --variants '{ "cudatoolkit": "<<parameters.cuda>>", "c_compiler_version": "<<parameters.compiler_version>>", "cxx_compiler_version": "<<parameters.compiler_version>>" }' \
-                      --user pytorch --label <<parameters.label>> -c pytorch -c nvidia -c rapidsai -c conda-forge
+                      --user pytorch --label <<parameters.label>> -c pytorch -c nvidia -c rapidsai-nightly -c conda-forge
 
   build_cmake:
     parameters:
@@ -236,7 +236,7 @@ jobs:
             - run:
                 name: Install libraft
                 command: |
-                  conda install -y -q libraft cudatoolkit=11.4 -c rapidsai-nightly -c nvidia -c pkgs/main -c conda-forge
+                  conda install -y -q libraft cuda-version=11.4 -c rapidsai-nightly -c nvidia -c pkgs/main -c conda-forge
       - run:
           name: Build all targets
           no_output_timeout: 30m
@@ -283,7 +283,7 @@ jobs:
             - run:
                 name: Python tests (CPU + GPU)
                 command: |
-                  conda install -y -q pytorch pytorch-cuda -c pytorch -c nvidia
+                  conda install -y -q pytorch pytorch-cuda=11 -c pytorch -c nvidia
                   pytest --junitxml=test-results/pytest/results.xml tests/test_*.py
                   pytest --junitxml=test-results/pytest/results-torch.xml tests/torch_*.py
                   cp tests/common_faiss_tests.py faiss/gpu/test
@@ -350,7 +350,7 @@ workflows:
           exec: linux-x86_64-gpu
           label: main
           cuda: "11.4"
-          cuda_archs: "60;61;70;72;75;80;86"
+          cuda_archs: "60-real;61-real;62-real;70-real;72-real;75-real;80;86-real"
           compiler_version: "11.2"
           filters:
             tags:
@@ -363,7 +363,7 @@ workflows:
           label: main
           raft: "ON"
           cuda: "11.4"
-          cuda_archs: "60;61;70;72;75;80;86"
+          cuda_archs: "60-real;61-real;62-real;70-real;72-real;75-real;80;86-real"
           compiler_version: "11.2"
           filters:
             tags:
@@ -415,15 +415,15 @@ workflows:
           name: Linux x86_64 GPU nightlies (CUDA 11.4)
           exec: linux-x86_64-gpu
           cuda: "11.4"
-          cuda_archs: "60;61;70;72;75;80;86"
+          cuda_archs: "60-real;61-real;62-real;70-real;72-real;75-real;80;86-real"
           compiler_version: "11.2"
           label: nightly
       - build_conda:
           name: Linux x86_64 GPU w/ RAFT nightlies (CUDA 11.4)
           exec: linux-x86_64-gpu
           raft: "ON"
           cuda: "11.4"
-          cuda_archs: "60;61;70;72;75;80;86"
+          cuda_archs: "60-real;61-real;62-real;70-real;72-real;75-real;80;86-real"
           compiler_version: "11.2"
           label: nightly
       - build_conda: