Teach faiss about conda [hacky]

rapidsai · Oct 4, 2023 · 385b4f4 · 385b4f4
1 parent f54a757
commit 385b4f4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/cpp/bench/ann/CMakeLists.txt b/cpp/bench/ann/CMakeLists.txt
@@ -103,6 +103,12 @@ if(RAFT_ANN_BENCH_USE_GGNN)
 endif()
 
 if(RAFT_ANN_BENCH_USE_FAISS)
+  # We need to ensure that faiss has all the conda
+  # information. So we currently use the very ugly
+  # hammer of `link_libraries` to ensure that all
+  # targets in this directory and the faiss directory
+  # will have the conda includes/link dirs
+  link_libraries($<TARGET_NAME_IF_EXISTS:conda_env>)
   include(cmake/thirdparty/get_faiss.cmake)
 endif()
 

diff --git a/cpp/cmake/thirdparty/get_faiss.cmake b/cpp/cmake/thirdparty/get_faiss.cmake
@@ -55,7 +55,6 @@ function(find_and_configure_faiss)
                 "FAISS_USE_CUDA_TOOLKIT_STATIC ${CUDA_STATIC_RUNTIME}"
                 "BUILD_TESTING OFF"
                 "CMAKE_MESSAGE_LOG_LEVEL VERBOSE"
-                "CUDAToolkit_ROOT ${CUDAToolkit_LIBRARY_DIR}"
                 )
 
         if(TARGET faiss AND NOT TARGET faiss::faiss)