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

[REVIEW] use the CUB submodule in Thrust instead of fetching it #6155

Merged
merged 5 commits into from
Sep 8, 2020
Merged

[REVIEW] use the CUB submodule in Thrust instead of fetching it #6155

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5de1928
use the CUB submodule in Thrust instead of fetching it
rongou Sep 4, 2020
d06ccef
add to changelog
rongou Sep 4, 2020
4b204ea
Merge branch 'branch-0.16' into no-fetch-cub
rongou Sep 5, 2020
4d4ba51
CUB_INCLUDE_DIR is not needed since Thrust has a symlink
rongou Sep 5, 2020
59adc06
Merge branch 'branch-0.16' into no-fetch-cub
rongou Sep 6, 2020
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}")

Expand Down
3 changes: 1 addition & 2 deletions cpp/benchmarks/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}")

Expand Down
3 changes: 1 addition & 2 deletions cpp/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}")

Expand Down
21 changes: 1 addition & 20 deletions thirdparty/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")

Expand Down