simplify raft build (facebookresearch#2983)

Summary: Pull Request resolved: facebookresearch#2983 Reviewed By: mdouze Differential Revision: D48063550 Pulled By: algoriddle fbshipit-source-id: c67e13cec97f4de8cc30cae47186593dbe0bdadb
blevesearch · Aug 4, 2023 · da16d9d · da16d9d
1 parent a3fbf2d
commit da16d9d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 178 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -271,7 +271,15 @@ workflows:
           exec: linux-x86_64-gpu
           gpu: "ON"
           requires:
-            - Linux x86_64 (cmake)
+            - Linux x86_64 AVX2 (cmake)
+      - build_cmake:
+          name: Linux x86_64 GPU w/ RAFT (cmake)
+          exec: linux-x86_64-gpu
+          opt_level: "avx2"
+          gpu: "ON"
+          raft: "ON"
+          requires:
+            - Linux x86_64 GPU (cmake)
       - build_conda:
           name: Linux x86_64 (conda)
           exec: linux-x86_64-cpu
@@ -378,18 +386,3 @@ workflows:
           name: Linux arm64 nightlies
           exec: linux-arm64-cpu
           label: nightly
-
-  raft_nightly:
-    triggers:
-      - schedule:
-          cron: "0 0 * * *"
-          filters:
-            branches:
-              only:
-                - main
-    jobs:
-      - build_cmake:
-          name: Linux x86_64 GPU w/ RAFT (cmake)
-          exec: linux-x86_64-gpu
-          gpu: "ON"
-          raft: "ON"
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -63,9 +63,7 @@ if(FAISS_ENABLE_GPU)
 endif()
 
 if(FAISS_ENABLE_RAFT)
-  rapids_cpm_init()
-  include(cmake/thirdparty/get_raft.cmake)
-  include(cmake/thirdparty/get_cutlass.cmake)
+  find_package(raft COMPONENTS compiled distributed)
 endif()
 
 add_subdirectory(faiss)

diff --git a/cmake/thirdparty/get_cutlass.cmake b/cmake/thirdparty/get_cutlass.cmake
diff --git a/cmake/thirdparty/get_raft.cmake b/cmake/thirdparty/get_raft.cmake