Skip to content

Commit f823d30

Browse files
bdicerobertmaynard
andauthored
Update to CCCL 2.2.0. (#404)
This updates cuCollections to use CCCL 2.2.0. --------- Co-authored-by: Robert Maynard <[email protected]>
1 parent fc29feb commit f823d30

File tree

3 files changed

+10
-48
lines changed

3 files changed

+10
-48
lines changed

CMakeLists.txt

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
cmake_minimum_required(VERSION 3.23.1 FATAL_ERROR)
1717

1818
if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/CUCO_RAPIDS.cmake)
19-
file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-23.12/RAPIDS.cmake
19+
file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-24.02/RAPIDS.cmake
2020
${CMAKE_CURRENT_BINARY_DIR}/CUCO_RAPIDS.cmake)
2121
endif()
2222
include(${CMAKE_CURRENT_BINARY_DIR}/CUCO_RAPIDS.cmake)
@@ -74,8 +74,7 @@ rapids_find_package(
7474

7575
rapids_cpm_init()
7676

77-
include(cmake/thirdparty/get_thrust.cmake)
78-
include(cmake/thirdparty/get_libcudacxx.cmake)
77+
include(cmake/thirdparty/get_cccl.cmake)
7978

8079
###################################################################################################
8180
# - cuco target ---------------------------------------------------------------------------------
@@ -84,7 +83,7 @@ add_library(cuco::cuco ALIAS cuco)
8483
target_include_directories(cuco INTERFACE
8584
INTERFACE $<BUILD_INTERFACE:${CUCO_SOURCE_DIR}/include>
8685
$<INSTALL_INTERFACE:include>)
87-
target_link_libraries(cuco INTERFACE libcudacxx::libcudacxx CUDA::toolkit $<BUILD_INTERFACE:cuco::Thrust>)
86+
target_link_libraries(cuco INTERFACE CCCL::CCCL CUDA::toolkit)
8887
target_compile_features(cuco INTERFACE cxx_std_17 cuda_std_17)
8988

9089
###################################################################################################
@@ -128,21 +127,13 @@ structures tailored for efficient use with GPUs.
128127
129128
]=])
130129

131-
set(code_string
132-
[=[
133-
if(NOT TARGET cuco::Thrust)
134-
thrust_create_target(cuco::Thrust FROM_OPTIONS)
135-
endif()
136-
]=])
137-
138130
# build directory cuco-config generation
139131
rapids_export(
140132
BUILD cuco
141133
EXPORT_SET cuco-exports
142134
GLOBAL_TARGETS cuco
143135
NAMESPACE cuco::
144-
DOCUMENTATION doc_string
145-
FINAL_CODE_BLOCK code_string)
136+
DOCUMENTATION doc_string)
146137

147138
if(INSTALL_CUCO)
148139
install(DIRECTORY include/cuco/ DESTINATION include/cuco)
Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# =============================================================================
2-
# Copyright (c) 2021-2022, NVIDIA CORPORATION.
2+
# Copyright (c) 2021-2023, NVIDIA CORPORATION.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
55
# in compliance with the License. You may obtain a copy of the License at
@@ -12,11 +12,10 @@
1212
# the License.
1313
# =============================================================================
1414

15-
# Use CPM to find or clone thrust
16-
function(find_and_configure_thrust)
17-
include(${rapids-cmake-dir}/cpm/thrust.cmake)
18-
rapids_cpm_thrust(NAMESPACE cuco
19-
BUILD_EXPORT_SET cuco-exports)
15+
# Use CPM to find or clone CCCL
16+
function(find_and_configure_cccl)
17+
include(${rapids-cmake-dir}/cpm/cccl.cmake)
18+
rapids_cpm_cccl(INSTALL_EXPORT_SET cuco-exports BUILD_EXPORT_SET cuco-exports)
2019
endfunction()
2120

22-
find_and_configure_thrust()
21+
find_and_configure_cccl()

cmake/thirdparty/get_libcudacxx.cmake

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)