diff --git a/CMakeLists.txt b/CMakeLists.txt index 795969a5c..744307a06 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 -------------------------------------------------------------------------------- @@ -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) @@ -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 ----------------------------------------------------------------------------------- @@ -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 ----------------------------------------------------------------------------- @@ -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() diff --git a/cmake/thirdparty/get_libcudacxx.cmake b/cmake/thirdparty/get_cccl.cmake similarity index 75% rename from cmake/thirdparty/get_libcudacxx.cmake rename to cmake/thirdparty/get_cccl.cmake index 14b0d492f..ca6a8654e 100644 --- a/cmake/thirdparty/get_libcudacxx.cmake +++ b/cmake/thirdparty/get_cccl.cmake @@ -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() diff --git a/cmake/thirdparty/get_thrust.cmake b/cmake/thirdparty/get_thrust.cmake deleted file mode 100644 index f4125e512..000000000 --- a/cmake/thirdparty/get_thrust.cmake +++ /dev/null @@ -1,26 +0,0 @@ -# ============================================================================= -# Copyright (c) 2021, NVIDIA CORPORATION. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software distributed under the License -# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express -# or implied. See the License for the specific language governing permissions and limitations under -# the License. -# ============================================================================= - -# Use CPM to find or clone thrust -function(find_and_configure_thrust) - - include(${rapids-cmake-dir}/cpm/thrust.cmake) - rapids_cpm_thrust( - NAMESPACE rmm - BUILD_EXPORT_SET rmm-exports - INSTALL_EXPORT_SET rmm-exports) - -endfunction() - -find_and_configure_thrust() diff --git a/scripts/load-pretty-printers.in b/scripts/load-pretty-printers.in index bd59968cc..a473bc5ad 100644 --- a/scripts/load-pretty-printers.in +++ b/scripts/load-pretty-printers.in @@ -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