From 5de1928de4f7b7821d5878469d60ca98a5b7c014 Mon Sep 17 00:00:00 2001 From: Rong Ou Date: Thu, 3 Sep 2020 17:08:00 -0700 Subject: [PATCH 1/3] use the CUB submodule in Thrust instead of fetching it --- thirdparty/CMakeLists.txt | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt index b7a57a557ff..9ff50cc591c 100644 --- a/thirdparty/CMakeLists.txt +++ b/thirdparty/CMakeLists.txt @@ -1,26 +1,7 @@ include(FetchContent) ################################################################################################### -# - cub ------------------------------------------------------------------------------------------- - -message("Fetching CUB") - -FetchContent_Declare( - cub - GIT_REPOSITORY https://github.com/thrust/cub.git - # August 28, 2020 - GIT_TAG 2442f44532ffcc53298c7e3a298feb5134563860 -) - -FetchContent_GetProperties(cub) -if(NOT cub_POPULATED) - FetchContent_Populate(cub) - # We are not using the cub CMake targets, so no need to call `add_subdirectory()`. -endif() -set(CUB_INCLUDE_DIR "${cub_SOURCE_DIR}" PARENT_SCOPE) - -################################################################################################### -# - thrust ---------------------------------------------------------------------------------------- +# - thrust/cub ------------------------------------------------------------------------------------ message("Fetching Thrust") @@ -37,6 +18,7 @@ if(NOT thrust_POPULATED) # We are not using the thrust CMake targets, so no need to call `add_subdirectory()`. endif() set(THRUST_INCLUDE_DIR "${thrust_SOURCE_DIR}" PARENT_SCOPE) +set(CUB_INCLUDE_DIR "${thrust_SOURCE_DIR}/dependencies/cub" PARENT_SCOPE) ################################################################################################### # - jitify ---------------------------------------------------------------------------------------- From d06ccef3fee1a111542ba7d98dc9874bbee899ef Mon Sep 17 00:00:00 2001 From: Rong Ou Date: Thu, 3 Sep 2020 17:09:53 -0700 Subject: [PATCH 2/3] add to changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1875bc6f635..dad39bb51e7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ - PR #6015 Upgrade CUB/Thrust to the latest commit - PR #5971 Add cuStreamz README for basic installation and use - PR #6024 Expose selecting multiple ORC stripes to read from Python +- PR #6155 Use the CUB submodule in Thrust instead of fetching CUB separately - PR #6002 Add Java bindings for md5 - PR #6067 Added compute codes for aarch64 devices - PR #6083 Small cleanup From 4d4ba517368aa6b63a0b14dc66b47925e7d831c2 Mon Sep 17 00:00:00 2001 From: Rong Ou Date: Fri, 4 Sep 2020 18:06:10 -0700 Subject: [PATCH 3/3] CUB_INCLUDE_DIR is not needed since Thrust has a symlink --- cpp/CMakeLists.txt | 3 +-- cpp/benchmarks/CMakeLists.txt | 3 +-- cpp/tests/CMakeLists.txt | 3 +-- thirdparty/CMakeLists.txt | 1 - 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index a7799bdfa26..210bb477ae5 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -376,8 +376,7 @@ message(STATUS "BENCHMARK_LIST set to: ${BENCHMARK_LIST}") ################################################################################################### # - include paths --------------------------------------------------------------------------------- -include_directories("${CUB_INCLUDE_DIR}" - "${THRUST_INCLUDE_DIR}" +include_directories("${THRUST_INCLUDE_DIR}" "${JITIFY_INCLUDE_DIR}" "${LIBCUDACXX_INCLUDE_DIR}") diff --git a/cpp/benchmarks/CMakeLists.txt b/cpp/benchmarks/CMakeLists.txt index 502cf3b782d..07d2f60fe9c 100644 --- a/cpp/benchmarks/CMakeLists.txt +++ b/cpp/benchmarks/CMakeLists.txt @@ -22,8 +22,7 @@ endfunction(ConfigureBench) ################################################################################################### # - include paths --------------------------------------------------------------------------------- -include_directories("${CUB_INCLUDE_DIR}" - "${THRUST_INCLUDE_DIR}" +include_directories("${THRUST_INCLUDE_DIR}" "${JITIFY_INCLUDE_DIR}" "${LIBCUDACXX_INCLUDE_DIR}") diff --git a/cpp/tests/CMakeLists.txt b/cpp/tests/CMakeLists.txt index 498d3d3bf2c..4493aa4e379 100644 --- a/cpp/tests/CMakeLists.txt +++ b/cpp/tests/CMakeLists.txt @@ -58,8 +58,7 @@ endfunction(ConfigureTest) ################################################################################################### # - include paths --------------------------------------------------------------------------------- -include_directories("${CUB_INCLUDE_DIR}" - "${THRUST_INCLUDE_DIR}" +include_directories("${THRUST_INCLUDE_DIR}" "${JITIFY_INCLUDE_DIR}" "${LIBCUDACXX_INCLUDE_DIR}") diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt index 9ff50cc591c..f8f3457e84f 100644 --- a/thirdparty/CMakeLists.txt +++ b/thirdparty/CMakeLists.txt @@ -18,7 +18,6 @@ if(NOT thrust_POPULATED) # We are not using the thrust CMake targets, so no need to call `add_subdirectory()`. endif() set(THRUST_INCLUDE_DIR "${thrust_SOURCE_DIR}" PARENT_SCOPE) -set(CUB_INCLUDE_DIR "${thrust_SOURCE_DIR}/dependencies/cub" PARENT_SCOPE) ################################################################################################### # - jitify ----------------------------------------------------------------------------------------