Skip to content

Commit

Permalink
Update to rapids_cpm_cccl.
Browse files Browse the repository at this point in the history
  • Loading branch information
bdice committed Dec 5, 2023
1 parent e4d443b commit 6b291ee
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 12 deletions.
10 changes: 5 additions & 5 deletions cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,8 @@ include(cmake/modules/ConfigureCUDA.cmake)
rapids_cpm_init()

if(NOT BUILD_CPU_ONLY)
# thrust before rmm/cuco so we get the right version of thrust/cub
include(cmake/thirdparty/get_thrust.cmake)
# CCCL before rmm/cuco so we get the right version of CCCL
include(cmake/thirdparty/get_cccl.cmake)
include(cmake/thirdparty/get_rmm.cmake)
include(cmake/thirdparty/get_cutlass.cmake)

Expand Down Expand Up @@ -206,7 +206,7 @@ target_include_directories(

if(NOT BUILD_CPU_ONLY)
# Keep RAFT as lightweight as possible. Only CUDA libs and rmm should be used in global target.
target_link_libraries(raft INTERFACE rmm::rmm cuco::cuco nvidia::cutlass::cutlass raft::Thrust)
target_link_libraries(raft INTERFACE rmm::rmm cuco::cuco nvidia::cutlass::cutlass CCCL::Thrust)
endif()

target_compile_features(raft INTERFACE cxx_std_17 $<BUILD_INTERFACE:cuda_std_17>)
Expand Down Expand Up @@ -632,8 +632,8 @@ string(
APPEND
code_string
[=[
if(NOT TARGET raft::Thrust)
thrust_create_target(raft::Thrust FROM_OPTIONS)
if(NOT TARGET CCCL::Thrust)
thrust_create_target(CCCL::Thrust FROM_OPTIONS)
endif()
]=]
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,12 @@
# the License.
# =============================================================================

# Use CPM to find or clone thrust
function(find_and_configure_thrust)
include(${rapids-cmake-dir}/cpm/thrust.cmake)
# Use CPM to find or clone CCCL
function(find_and_configure_cccl)
include(${rapids-cmake-dir}/cpm/cccl.cmake)

rapids_cpm_thrust( NAMESPACE raft
BUILD_EXPORT_SET raft-exports
INSTALL_EXPORT_SET raft-exports)
rapids_cpm_cccl( BUILD_EXPORT_SET raft-exports
INSTALL_EXPORT_SET raft-exports)
endfunction()

find_and_configure_thrust()
find_and_configure_cccl()

0 comments on commit 6b291ee

Please sign in to comment.