From c6a5f5112a09d66ea82f2d7266abe02aa737548f Mon Sep 17 00:00:00 2001 From: Tarang Jain Date: Mon, 3 Feb 2025 21:05:36 -0800 Subject: [PATCH 1/2] update actions,cmake,nightly-docs --- .github/actions/build_cmake/action.yml | 2 +- INSTALL.md | 14 ++++++-------- cmake/thirdparty/fetch_rapids.cmake | 2 +- conda/faiss-gpu-cuvs/meta.yaml | 4 ++-- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/.github/actions/build_cmake/action.yml b/.github/actions/build_cmake/action.yml index a5f9372aec..c807c53d83 100644 --- a/.github/actions/build_cmake/action.yml +++ b/.github/actions/build_cmake/action.yml @@ -61,7 +61,7 @@ runs: conda install -y -q cuda-toolkit=12.4 -c "nvidia/label/cuda-12.4.0" # and CUDA from cuVS channel for cuVS builds elif [ "${{ inputs.cuvs }}" = "ON" ]; then - conda install -y -q libcuvs=24.12 'cuda-version>=12.0,<=12.5' cuda-toolkit=12.4.1 gxx_linux-64=12.4 -c rapidsai -c conda-forge + conda install -y -q libcuvs=25.02 'cuda-version>=12.0,<=12.5' cuda-toolkit=12.4.1 gxx_linux-64=12.4 -c rapidsai -c rapidsai-nightly -c conda-forge fi # install test packages diff --git a/INSTALL.md b/INSTALL.md index 6e75826a56..715c372e21 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -6,7 +6,7 @@ pre-release nightly builds. - The CPU-only faiss-cpu conda package is currently available on Linux (x86-64 and aarch64), OSX (arm64 only), and Windows (x86-64) - faiss-gpu, containing both CPU and GPU indices, is available on Linux (x86-64 only) for CUDA 11.4 and 12.1 -- faiss-gpu-raft [^1] package containing GPU indices provided by [NVIDIA RAFT](https://github.com/rapidsai/raft/) version 24.06, is available on Linux (x86-64 only) for CUDA 11.8 and 12.4. +- faiss-gpu-cuvs package containing GPU indices provided by [NVIDIA cuVS](https://github.com/rapidsai/cuvs/) version 24.12, is available on Linux (x86-64 only) for CUDA 11.8 and 12.4. To install the latest stable release: @@ -17,15 +17,15 @@ $ conda install -c pytorch faiss-cpu=1.10.0 # GPU(+CPU) version $ conda install -c pytorch -c nvidia faiss-gpu=1.10.0 -# GPU(+CPU) version with NVIDIA RAFT -$ conda install -c pytorch -c nvidia -c rapidsai -c conda-forge faiss-gpu-raft=1.10.0 +# GPU(+CPU) version with NVIDIA cuVS +$ conda install -c pytorch -c rapidsai -c conda-forge -c nvidia faiss-gpu-cuvs=1.10.0 # GPU(+CPU) version using AMD ROCm not yet available ``` For faiss-gpu, the nvidia channel is required for CUDA, which is not published in the main anaconda channel. -For faiss-gpu-raft, the rapidsai, conda-forge and nvidia channels are required. +For faiss-gpu-cuvs, the rapidsai, conda-forge and nvidia channels are required. Nightly pre-release packages can be installed as follows: @@ -37,10 +37,10 @@ $ conda install -c pytorch/label/nightly faiss-cpu $ conda install -c pytorch/label/nightly -c nvidia faiss-gpu=1.10.0 # GPU(+CPU) version with NVIDIA cuVS (package built with CUDA 12.4) -conda install -c pytorch -c rapidsai -c conda-forge -c nvidia pytorch/label/nightly::faiss-gpu-cuvs 'cuda-version>=12.0,<=12.5' +conda install -c pytorch -c rapidsai -c rapidsai-nightly -c conda-forge -c nvidia pytorch/label/nightly::faiss-gpu-cuvs 'cuda-version>=12.0,<=12.5' # GPU(+CPU) version with NVIDIA cuVS (package built with CUDA 11.8) -conda install -c pytorch -c rapidsai -c conda-forge -c nvidia pytorch/label/nightly::faiss-gpu-cuvs 'cuda-version>=11.4,<=11.8' +conda install -c pytorch -c rapidsai -c rapidsai-nightly -c conda-forge -c nvidia pytorch/label/nightly::faiss-gpu-cuvs 'cuda-version>=11.4,<=11.8' # GPU(+CPU) version using AMD ROCm not yet available ``` @@ -321,5 +321,3 @@ and you can run $ python demos/demo_auto_tune.py ``` to test the GPU code. - -[^1]: The vector search and clustering algorithms in NVIDIA RAFT have been formally migrated to [NVIDIA cuVS](https://github.com/rapidsai/cuvs). This package is being renamed to `faiss-gpu-cuvs` in the next stable release, which will use these GPU implementations from the pre-compiled `libcuvs=24.12` binary. diff --git a/cmake/thirdparty/fetch_rapids.cmake b/cmake/thirdparty/fetch_rapids.cmake index 2ed6a78cf5..b534185955 100644 --- a/cmake/thirdparty/fetch_rapids.cmake +++ b/cmake/thirdparty/fetch_rapids.cmake @@ -15,7 +15,7 @@ # or implied. See the License for the specific language governing permissions and limitations under # the License. # ============================================================================= -set(RAPIDS_VERSION "24.12") +set(RAPIDS_VERSION "25.02") if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/FAISS_RAPIDS.cmake) file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-${RAPIDS_VERSION}/RAPIDS.cmake diff --git a/conda/faiss-gpu-cuvs/meta.yaml b/conda/faiss-gpu-cuvs/meta.yaml index a8edf41e58..545de7a8eb 100644 --- a/conda/faiss-gpu-cuvs/meta.yaml +++ b/conda/faiss-gpu-cuvs/meta.yaml @@ -66,7 +66,7 @@ outputs: - _openmp_mutex =4.5=2_kmp_llvm # [x86_64] - mkl =2023 # [x86_64] - openblas =0.3 # [not x86_64] - - libcuvs =24.12 + - libcuvs =25.02 - cuda-version {{ cuda_constraints }} run: - _openmp_mutex =4.5=2_kmp_llvm # [x86_64] @@ -74,7 +74,7 @@ outputs: - openblas =0.3 # [not x86_64] - cuda-cudart {{ cuda_constraints }} - libcublas {{ libcublas_constraints }} - - libcuvs =24.12 + - libcuvs =25.02 - cuda-version {{ cuda_constraints }} test: requires: From e3c28c18d8a9dba3141c0b057be44b63d3e26403 Mon Sep 17 00:00:00 2001 From: Tarang Jain Date: Wed, 12 Feb 2025 08:49:23 -0800 Subject: [PATCH 2/2] 25.04 --- .github/actions/build_cmake/action.yml | 2 +- cmake/thirdparty/fetch_rapids.cmake | 2 +- conda/faiss-gpu-cuvs/meta.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/actions/build_cmake/action.yml b/.github/actions/build_cmake/action.yml index c807c53d83..0cd2b87c96 100644 --- a/.github/actions/build_cmake/action.yml +++ b/.github/actions/build_cmake/action.yml @@ -61,7 +61,7 @@ runs: conda install -y -q cuda-toolkit=12.4 -c "nvidia/label/cuda-12.4.0" # and CUDA from cuVS channel for cuVS builds elif [ "${{ inputs.cuvs }}" = "ON" ]; then - conda install -y -q libcuvs=25.02 'cuda-version>=12.0,<=12.5' cuda-toolkit=12.4.1 gxx_linux-64=12.4 -c rapidsai -c rapidsai-nightly -c conda-forge + conda install -y -q libcuvs=25.04 'cuda-version>=12.0,<=12.5' cuda-toolkit=12.4.1 gxx_linux-64=12.4 -c rapidsai -c rapidsai-nightly -c conda-forge fi # install test packages diff --git a/cmake/thirdparty/fetch_rapids.cmake b/cmake/thirdparty/fetch_rapids.cmake index b534185955..ba0dac02c2 100644 --- a/cmake/thirdparty/fetch_rapids.cmake +++ b/cmake/thirdparty/fetch_rapids.cmake @@ -15,7 +15,7 @@ # or implied. See the License for the specific language governing permissions and limitations under # the License. # ============================================================================= -set(RAPIDS_VERSION "25.02") +set(RAPIDS_VERSION "25.04") if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/FAISS_RAPIDS.cmake) file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-${RAPIDS_VERSION}/RAPIDS.cmake diff --git a/conda/faiss-gpu-cuvs/meta.yaml b/conda/faiss-gpu-cuvs/meta.yaml index 517c72a725..27600c47ca 100644 --- a/conda/faiss-gpu-cuvs/meta.yaml +++ b/conda/faiss-gpu-cuvs/meta.yaml @@ -66,7 +66,7 @@ outputs: - _openmp_mutex =4.5=2_kmp_llvm # [x86_64] - mkl =2023 # [x86_64] - openblas =0.3 # [not x86_64] - - libcuvs =25.02 + - libcuvs =25.04 - cuda-version {{ cuda_constraints }} run: - _openmp_mutex =4.5=2_kmp_llvm # [x86_64] @@ -74,7 +74,7 @@ outputs: - openblas =0.3 # [not x86_64] - cuda-cudart {{ cuda_constraints }} - libcublas {{ libcublas_constraints }} - - libcuvs =25.02 + - libcuvs =25.04 - cuda-version {{ cuda_constraints }} - libnvjitlink test: