From e777811408efb36c0075cb22d9873661b461ebd3 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Wed, 18 May 2022 17:03:47 -0700 Subject: [PATCH 1/5] Fix typos in project names. --- python/raft/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/python/raft/CMakeLists.txt b/python/raft/CMakeLists.txt index 21ca270108..962201497b 100644 --- a/python/raft/CMakeLists.txt +++ b/python/raft/CMakeLists.txt @@ -45,11 +45,11 @@ if(NOT raft_FOUND) # pull in the required languages for the C++ project even if this project # does not require those languges. include(rapids-cuda) - rapids_cuda_init_architectures(pylibraft) + rapids_cuda_init_architectures(pyraft) enable_language(CUDA) - # Since pylibraft only enables CUDA optionally we need to manually include the file that + # Since pyraft only enables CUDA optionally we need to manually include the file that # rapids_cuda_init_architectures relies on `project` including. - include("${CMAKE_PROJECT_pylibraft_INCLUDE}") + include("${CMAKE_PROJECT_pyraft_INCLUDE}") set(BUILD_TESTS OFF) set(BUILD_BENCHMARKS OFF) From 11020ae273e642b93412c97ffb1aeddc71cc0f41 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Wed, 18 May 2022 17:10:16 -0700 Subject: [PATCH 2/5] Remove now outdated comment. --- python/raft/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/python/raft/CMakeLists.txt b/python/raft/CMakeLists.txt index 962201497b..d741abf985 100644 --- a/python/raft/CMakeLists.txt +++ b/python/raft/CMakeLists.txt @@ -62,7 +62,6 @@ endif() include(rapids-cython) rapids_cython_init() -# TODO: Figure out which of ucx, nccl, cusolver, cusparse, and cublas I need to add as include directories or linked libraries for which components add_subdirectory(raft/common) add_subdirectory(raft/dask/common) add_subdirectory(raft/include_test) From d9be6a5eff6fd08325d450ade761d5b1f3f55f43 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Fri, 20 May 2022 09:28:27 -0700 Subject: [PATCH 3/5] Fix compilation of benchmarks. --- python/pylibraft/CMakeLists.txt | 2 +- python/raft/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/python/pylibraft/CMakeLists.txt b/python/pylibraft/CMakeLists.txt index 030a017087..bd49f4f983 100644 --- a/python/pylibraft/CMakeLists.txt +++ b/python/pylibraft/CMakeLists.txt @@ -55,7 +55,7 @@ if(NOT raft_FOUND) include("${CMAKE_PROJECT_pylibraft_INCLUDE}") set(BUILD_TESTS OFF) - set(BUILD_BENCHMARKS OFF) + set(BUILD_BENCH OFF) set(RAFT_COMPILE_DIST_LIBRARY ON) add_subdirectory(../../cpp raft-cpp) diff --git a/python/raft/CMakeLists.txt b/python/raft/CMakeLists.txt index d741abf985..50c218500a 100644 --- a/python/raft/CMakeLists.txt +++ b/python/raft/CMakeLists.txt @@ -52,7 +52,7 @@ if(NOT raft_FOUND) include("${CMAKE_PROJECT_pyraft_INCLUDE}") set(BUILD_TESTS OFF) - set(BUILD_BENCHMARKS OFF) + set(BUILD_BENCH OFF) set(RAFT_COMPILE_LIBRARIES OFF) set(RAFT_COMPILE_DIST_LIBRARY OFF) set(RAFT_COMPILE_NN_LIBRARY OFF) From a565fd539894ad91e4238084ecf589a2fa659a81 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Fri, 20 May 2022 11:02:52 -0700 Subject: [PATCH 4/5] Make avoiding nn library compilation explicit for pylibraft. --- python/pylibraft/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/python/pylibraft/CMakeLists.txt b/python/pylibraft/CMakeLists.txt index bd49f4f983..eed92eff78 100644 --- a/python/pylibraft/CMakeLists.txt +++ b/python/pylibraft/CMakeLists.txt @@ -56,6 +56,7 @@ if(NOT raft_FOUND) set(BUILD_TESTS OFF) set(BUILD_BENCH OFF) + set(RAFT_COMPILE_LIBRARIES OFF) set(RAFT_COMPILE_DIST_LIBRARY ON) add_subdirectory(../../cpp raft-cpp) From 794246e6b83ee2367781f9da5a431427dd4380b5 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Fri, 20 May 2022 11:38:25 -0700 Subject: [PATCH 5/5] Add comment. --- python/raft/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/python/raft/CMakeLists.txt b/python/raft/CMakeLists.txt index 50c218500a..63eb4fa22b 100644 --- a/python/raft/CMakeLists.txt +++ b/python/raft/CMakeLists.txt @@ -51,6 +51,9 @@ if(NOT raft_FOUND) # rapids_cuda_init_architectures relies on `project` including. include("${CMAKE_PROJECT_pyraft_INCLUDE}") + # pyraft doesn't actually use raft libraries, it just needs the headers, so + # we can turn off all library compilation and we don't need to install + # anything here. set(BUILD_TESTS OFF) set(BUILD_BENCH OFF) set(RAFT_COMPILE_LIBRARIES OFF)