Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix minor errors in CMake configuration #662

Merged
merged 5 commits into from
May 20, 2022
Merged

Fix minor errors in CMake configuration #662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e777811
Fix typos in project names.
vyasr May 19, 2022
11020ae
Remove now outdated comment.
vyasr May 19, 2022
d9be6a5
Fix compilation of benchmarks.
vyasr May 20, 2022
a565fd5
Make avoiding nn library compilation explicit for pylibraft.
vyasr May 20, 2022
794246e
Add comment.
vyasr May 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion python/pylibraft/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ if(NOT raft_FOUND)
include("${CMAKE_PROJECT_pylibraft_INCLUDE}")

set(BUILD_TESTS OFF)
set(BUILD_BENCHMARKS OFF)
set(BUILD_BENCH OFF)
set(RAFT_COMPILE_LIBRARIES OFF)
set(RAFT_COMPILE_DIST_LIBRARY ON)
add_subdirectory(../../cpp raft-cpp)

Expand Down
12 changes: 7 additions & 5 deletions python/raft/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,17 @@ 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}")

# 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_BENCHMARKS OFF)
set(BUILD_BENCH OFF)
set(RAFT_COMPILE_LIBRARIES OFF)
set(RAFT_COMPILE_DIST_LIBRARY OFF)
set(RAFT_COMPILE_NN_LIBRARY OFF)
Expand All @@ -62,7 +65,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)