More updates

rapidsai · Oct 2, 2023 · d539316 · d539316
1 parent 8bb273c
commit d539316
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/cpp/cmake/thirdparty/get_faiss.cmake b/cpp/cmake/thirdparty/get_faiss.cmake
@@ -87,9 +87,23 @@ function(find_and_configure_faiss)
     rapids_export_find_package_root(BUILD faiss [=[${CMAKE_CURRENT_LIST_DIR}]=] raft-ann-bench-exports)
 endfunction()
 
+if(NOT RAFT_FAISS_GIT_TAG)
+    # TODO: Remove this once faiss supports FAISS_USE_CUDA_TOOLKIT_STATIC
+    # (https://github.com/facebookresearch/faiss/pull/2446)
+    set(RAFT_FAISS_GIT_TAG fea/statically-link-ctk)
+    # set(RAFT_FAISS_GIT_TAG bde7c0027191f29c9dadafe4f6e68ca0ee31fb30)
+endif()
+
+if(NOT RAFT_FAISS_GIT_REPOSITORY)
+    # TODO: Remove this once faiss supports FAISS_USE_CUDA_TOOLKIT_STATIC
+    # (https://github.com/facebookresearch/faiss/pull/2446)
+    set(RAFT_FAISS_GIT_REPOSITORY https://github.com/cjnolet/faiss.git)
+    # set(RAFT_FAISS_GIT_REPOSITORY https://github.com/facebookresearch/faiss.git)
+endif()
+
 find_and_configure_faiss(VERSION    1.7.4
-        REPOSITORY  https://github.com/cjnolet/faiss.git
-        PINNED_TAG  fea/statically-link-ctk
+        REPOSITORY  ${RAFT_FAISS_GIT_REPOSITORY}
+        PINNED_TAG  ${RAFT_FAISS_GIT_TAG}
         BUILD_STATIC_LIBS ${RAFT_USE_FAISS_STATIC}
         EXCLUDE_FROM_ALL ${RAFT_EXCLUDE_FAISS_FROM_ALL}
         ENABLE_GPU ${RAFT_FAISS_ENABLE_GPU})