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

Update to CCCL 2.2.0. #1404

Merged
merged 16 commits into from
Dec 19, 2023
Merged

Update to CCCL 2.2.0. #1404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
090ef76
Build with CCCL 2.2.0.
bdice Dec 1, 2023
2a3f87b
Build with CCCL 2.2.0.
bdice Dec 1, 2023
19e22cc
Remove namespace.
bdice Dec 5, 2023
7a8d656
Remove testing changes.
bdice Dec 7, 2023
bb5782a
Fix cmake-format.
bdice Dec 11, 2023
310d02e
Update leftover CMake references to Thrust.
bdice Dec 11, 2023
c75120b
Fix name.
bdice Dec 11, 2023
716e5b9
Update target_link_libraries.
bdice Dec 11, 2023
7786788
Try CCCL_TOPLEVEL_PROJECT.
bdice Dec 12, 2023
536fd99
Test manual component install
vyasr Dec 13, 2023
0c7be89
Revert testing changes.
bdice Dec 14, 2023
4cf6a53
Merge remote-tracking branch 'upstream/branch-24.02' into cccl-2.2.0
bdice Dec 15, 2023
0b57078
Merge branch 'branch-24.02' into cccl-2.2.0
bdice Dec 19, 2023
6e5757a
Use cuCollections built with CCCL 2.2.0.
bdice Dec 19, 2023
6ec68df
Merge branch 'cccl-2.2.0' of github.com:bdice/rmm into cccl-2.2.0
bdice Dec 19, 2023
a878022
Revert testing changes.
bdice Dec 19, 2023
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
21 changes: 5 additions & 16 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,7 @@ rapids_cpm_init()

include(cmake/thirdparty/get_fmt.cmake)
include(cmake/thirdparty/get_spdlog.cmake)
include(cmake/thirdparty/get_libcudacxx.cmake)
include(cmake/thirdparty/get_thrust.cmake)
include(cmake/thirdparty/get_cccl.cmake)

# ##################################################################################################
# * library targets --------------------------------------------------------------------------------
Expand All @@ -90,8 +89,7 @@ else()
target_link_libraries(rmm INTERFACE CUDA::cudart)
endif()

target_link_libraries(rmm INTERFACE libcudacxx::libcudacxx)
target_link_libraries(rmm INTERFACE rmm::Thrust)
target_link_libraries(rmm INTERFACE CCCL::CCCL)
target_link_libraries(rmm INTERFACE fmt::fmt-header-only)
target_link_libraries(rmm INTERFACE spdlog::spdlog_header_only)
target_link_libraries(rmm INTERFACE dl)
Expand Down Expand Up @@ -152,20 +150,12 @@ The goal of the [RMM](https://github.com/rapidsai/rmm) is to provide:
A collection of data structures that use the interface for memory allocation
]=])

set(code_string
[=[
if(NOT TARGET rmm::Thrust)
thrust_create_target(rmm::Thrust FROM_OPTIONS)
endif()
]=])

rapids_export(
INSTALL rmm
EXPORT_SET rmm-exports
GLOBAL_TARGETS rmm
NAMESPACE rmm::
DOCUMENTATION doc_string
FINAL_CODE_BLOCK code_string)
DOCUMENTATION doc_string)

# ##################################################################################################
# * build export -----------------------------------------------------------------------------------
Expand All @@ -175,8 +165,7 @@ rapids_export(
EXPORT_SET rmm-exports
GLOBAL_TARGETS rmm
NAMESPACE rmm::
DOCUMENTATION doc_string
FINAL_CODE_BLOCK code_string)
DOCUMENTATION doc_string)

# ##################################################################################################
# * make documentation -----------------------------------------------------------------------------
Expand All @@ -197,6 +186,6 @@ add_custom_target(
# * make gdb helper scripts ------------------------------------------------------------------------

# optionally assemble Thrust pretty-printers
if(Thrust_SOURCE_DIR)
if(CCCL_SOURCE_DIR)
configure_file(scripts/load-pretty-printers.in load-pretty-printers @ONLY)
endif()
10 changes: 5 additions & 5 deletions cmake/thirdparty/get_libcudacxx.cmake → cmake/thirdparty/get_cccl.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
# the License.
# =============================================================================

# Use CPM to find or clone libcudacxx
function(find_and_configure_libcudacxx)
# Use CPM to find or clone CCCL
function(find_and_configure_cccl)

include(${rapids-cmake-dir}/cpm/libcudacxx.cmake)
rapids_cpm_libcudacxx(BUILD_EXPORT_SET rmm-exports INSTALL_EXPORT_SET rmm-exports)
include(${rapids-cmake-dir}/cpm/cccl.cmake)
rapids_cpm_cccl(BUILD_EXPORT_SET rmm-exports INSTALL_EXPORT_SET rmm-exports)

endfunction()

find_and_configure_libcudacxx()
find_and_configure_cccl()
26 changes: 0 additions & 26 deletions cmake/thirdparty/get_thrust.cmake
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion scripts/load-pretty-printers.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
source @Thrust_SOURCE_DIR@/scripts/gdb-pretty-printers.py
source @CCCL_SOURCE_DIR@/thrust/scripts/gdb-pretty-printers.py
source @PROJECT_SOURCE_DIR@/scripts/gdb-pretty-printers.py