Skip to content

Commit da16d9d

Browse files
algoriddlefacebook-github-bot
authored andcommitted
simplify raft build (facebookresearch#2983)
Summary: Pull Request resolved: facebookresearch#2983 Reviewed By: mdouze Differential Revision: D48063550 Pulled By: algoriddle fbshipit-source-id: c67e13cec97f4de8cc30cae47186593dbe0bdadb
1 parent a3fbf2d commit da16d9d

File tree

4 files changed

+10
-178
lines changed

4 files changed

+10
-178
lines changed

.circleci/config.yml

+9-16
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,15 @@ workflows:
271271
exec: linux-x86_64-gpu
272272
gpu: "ON"
273273
requires:
274-
- Linux x86_64 (cmake)
274+
- Linux x86_64 AVX2 (cmake)
275+
- build_cmake:
276+
name: Linux x86_64 GPU w/ RAFT (cmake)
277+
exec: linux-x86_64-gpu
278+
opt_level: "avx2"
279+
gpu: "ON"
280+
raft: "ON"
281+
requires:
282+
- Linux x86_64 GPU (cmake)
275283
- build_conda:
276284
name: Linux x86_64 (conda)
277285
exec: linux-x86_64-cpu
@@ -378,18 +386,3 @@ workflows:
378386
name: Linux arm64 nightlies
379387
exec: linux-arm64-cpu
380388
label: nightly
381-
382-
raft_nightly:
383-
triggers:
384-
- schedule:
385-
cron: "0 0 * * *"
386-
filters:
387-
branches:
388-
only:
389-
- main
390-
jobs:
391-
- build_cmake:
392-
name: Linux x86_64 GPU w/ RAFT (cmake)
393-
exec: linux-x86_64-gpu
394-
gpu: "ON"
395-
raft: "ON"

CMakeLists.txt

+1-3
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,7 @@ if(FAISS_ENABLE_GPU)
6363
endif()
6464

6565
if(FAISS_ENABLE_RAFT)
66-
rapids_cpm_init()
67-
include(cmake/thirdparty/get_raft.cmake)
68-
include(cmake/thirdparty/get_cutlass.cmake)
66+
find_package(raft COMPONENTS compiled distributed)
6967
endif()
7068

7169
add_subdirectory(faiss)

cmake/thirdparty/get_cutlass.cmake

-107
This file was deleted.

cmake/thirdparty/get_raft.cmake

-52
This file was deleted.

0 commit comments

Comments
 (0)