Enable use of svs runtime conda package instead of tarball (#4747)

Summary:
This PR migrates from using SVS via tarball to using a conda package

Currently the package is available at the intel channel. In future releases, it will be available from conda-forge and the channel configuration can be removed

Pull Request resolved: #4747

Reviewed By: subhadeepkaran

Differential Revision: D91484831

Pulled By: alibeklfc

fbshipit-source-id: b94dba1f03b4083ae8aa35cdd258ad71c421d30b

Author: ethanglaser

.github/actions/build_cmake/action.yml

@@ -77,6 +77,11 @@ runs:
           conda install -y -q libcuvs=25.10 'cuda-version=12.6' cuda-toolkit=12.6 gxx_linux-64=13.4.0 -c rapidsai -c rapidsai-nightly -c conda-forge
         fi
 
+        # install SVS runtime for SVS builds
+        if [ "${{ inputs.svs }}" = "ON" ]; then
+          conda install -y -q libsvs-runtime -c https://software.repos.intel.com/python/conda -c conda-forge
+        fi
+
         # install test packages
         if [ "${{ inputs.rocm }}" = "ON" ]; then
           : # skip torch install via conda, we need to install via pip to get

.github/actions/build_conda/action.yml

@@ -45,6 +45,9 @@ runs:
         conda list --show-channel-urls
         conda install -y -q "conda!=24.11.0,<=25.07"
         conda install -y -q "conda-build=25.3.1" "liblief=0.14.1"
+        # Add Intel channel with lowest priority for libsvs-runtime only
+        conda config --append channels https://software.repos.intel.com/python/conda
+        conda config --set channel_priority flexible
     - name: Enable anaconda uploads
       if: inputs.label != ''
       shell: ${{ steps.choose_shell.outputs.shell }}

conda/faiss-gpu-cuvs/build-lib.sh

@@ -25,9 +25,3 @@ make -C _build -j$(nproc) faiss faiss_avx2 faiss_avx512 faiss_c faiss_c_avx2 fai
 
 cmake --install _build --prefix $PREFIX
 cmake --install _build --prefix _libfaiss_stage/
-
-# Copy SVS runtime if it exists
-if [ -d "_build/_deps/svs-src/lib" ]; then
-    cp -P _build/_deps/svs-src/lib/libsvs_runtime.so* $PREFIX/lib/ || true
-    cp -P _build/_deps/svs-src/lib/libsvs_runtime.so* _libfaiss_stage/lib/ || true
-fi

conda/faiss-gpu-cuvs/meta.yaml

@@ -62,6 +62,7 @@ outputs:
         - openblas =0.3.30 # [not x86_64]
         - libcuvs =25.10
         - cuda-version {{ cuda_constraints }}
+        - libsvs-runtime =0.1.0  # [x86_64 and linux]
       run:
         - _openmp_mutex =4.5=2_kmp_llvm  # [x86_64]
         - mkl >=2024.2.2,<2025.0a0  # [x86_64]
@@ -71,6 +72,7 @@ outputs:
         - libcuvs =25.10
         - cuda-version {{ cuda_constraints }}
         - libnvjitlink
+        - libsvs-runtime =0.1.0  # [x86_64 and linux]
     test:
       requires:
         - conda-build

conda/faiss-gpu/build-lib.sh

@@ -31,9 +31,3 @@ make -C _build -j$(nproc) faiss faiss_avx2 faiss_avx512 faiss_c faiss_c_avx2 fai
 
 cmake --install _build --prefix $PREFIX
 cmake --install _build --prefix _libfaiss_stage/
-
-# Copy SVS runtime if it exists
-if [ -d "_build/_deps/svs-src/lib" ]; then
-    cp -P _build/_deps/svs-src/lib/libsvs_runtime.so* $PREFIX/lib/ || true
-    cp -P _build/_deps/svs-src/lib/libsvs_runtime.so* _libfaiss_stage/lib/ || true
-fi

conda/faiss-gpu/meta.yaml

@@ -53,11 +53,13 @@ outputs:
       host:
         - mkl >=2024.2.2,<2025.0a0  # [x86_64]
         - openblas =0.3.30 # [not x86_64]
+        - libsvs-runtime =0.1.0  # [x86_64 and linux]
       run:
         - mkl >=2024.2.2,<2025.0a0  # [x86_64]
         - openblas =0.3.30 # [not x86_64]
         - cuda-cudart {{ cuda_constraints }}
         - libcublas {{ libcublas_constraints }}
+        - libsvs-runtime =0.1.0  # [x86_64 and linux]
     test:
       requires:
         - conda-build

conda/faiss/build-lib.sh

@@ -23,9 +23,3 @@ make -C _build -j$(nproc) faiss faiss_avx2 faiss_avx512 faiss_c faiss_c_avx2 fai
 
 cmake --install _build --prefix $PREFIX
 cmake --install _build --prefix _libfaiss_stage/
-
-# Copy SVS runtime if it exists
-if [ -d "_build/_deps/svs-src/lib" ]; then
-    cp -P _build/_deps/svs-src/lib/libsvs_runtime.so* $PREFIX/lib/ || true
-    cp -P _build/_deps/svs-src/lib/libsvs_runtime.so* _libfaiss_stage/lib/ || true
-fi

conda/faiss/meta.yaml

@@ -56,6 +56,7 @@ outputs:
       host:
         - python {{ python }}
         - libcxx =20.1.1  # [osx and arm64]
+        - libsvs-runtime =0.1.0  # [x86_64 and linux]
         {% if PY_VER == '3.10' or PY_VER == '3.11' %}
         - mkl =2024.2.2  # [x86_64]
         - python_abi <3.12
@@ -69,6 +70,7 @@ outputs:
       run:
         - python {{ python }}
         - libcxx =20.1.1  # [osx and arm64]
+        - libsvs-runtime =0.1.0  # [x86_64 and linux]
         {% if PY_VER == '3.10' or PY_VER == '3.11' %}
         - mkl =2024.2.2  # [x86_64]
         - python_abi <3.12

faiss/CMakeLists.txt

@@ -359,16 +359,7 @@ if(NOT WIN32)
 endif()
 
 if(FAISS_ENABLE_SVS)
-  include(FetchContent)
-  set(SVS_URL "https://github.com/intel/ScalableVectorSearch/releases/download/v0.1.0/svs-cpp-runtime-bindings-0.1.0.tar.gz" CACHE STRING "URL to fetch SVS runtime library")
-  FetchContent_Declare(
-      svs
-      URL "${SVS_URL}"
-  )
-  FetchContent_MakeAvailable(svs)
-  list(APPEND CMAKE_PREFIX_PATH "${svs_SOURCE_DIR}")
   find_package(svs_runtime REQUIRED)
-  #target_compile_options(svs::svs INTERFACE "-DSVS_ENABLE_OMP=1")
 
   target_link_libraries(faiss PUBLIC svs::svs_runtime)
   target_link_libraries(faiss_avx2 PUBLIC svs::svs_runtime)