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

Install only the same Thrust files that Thrust itself installs #8420

Merged
merged 3 commits into from
Jun 9, 2021
Merged

Install only the same Thrust files that Thrust itself installs #8420

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
837d8ad
Install only the same Thrust files that Thrust itself installs
robertmaynard Jun 1, 2021
ba62f3d
Correct cub install location to match thrust source location
robertmaynard Jun 1, 2021
64e9223
Merge branch 'branch-21.08' into bug/make_sure_to_only_install_the_go…
robertmaynard Jun 3, 2021
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
10 changes: 0 additions & 10 deletions cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,16 +597,6 @@ install(DIRECTORY
${CUDF_GENERATED_INCLUDE_DIR}/include/libcudacxx
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libcudf)

install(DIRECTORY ${Thrust_SOURCE_DIR}/
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libcudf/Thrust
PATTERN "*.py" EXCLUDE
PATTERN "benchmark" EXCLUDE
PATTERN "build" EXCLUDE
PATTERN "doc" EXCLUDE
PATTERN "examples" EXCLUDE
PATTERN "test" EXCLUDE
PATTERN "testing" EXCLUDE)

include(CMakePackageConfigHelpers)

configure_package_config_file(cmake/cudf-config.cmake.in "${CUDF_BINARY_DIR}/cmake/cudf-config.cmake"
Expand Down
18 changes: 17 additions & 1 deletion cpp/cmake/thirdparty/CUDF_GetThrust.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,23 @@ function(find_and_configure_thrust VERSION)

thrust_create_target(cudf::Thrust FROM_OPTIONS)
set(THRUST_LIBRARY "cudf::Thrust" PARENT_SCOPE)
set(Thrust_SOURCE_DIR "${Thrust_SOURCE_DIR}" PARENT_SCOPE)

include(GNUInstallDirs)
install(DIRECTORY "${Thrust_SOURCE_DIR}/thrust"
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/libcudf/Thrust/"
FILES_MATCHING
PATTERN "*.h"
PATTERN "*.inl")
install(DIRECTORY "${Thrust_SOURCE_DIR}/dependencies/cub/cub"
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/libcudf/Thrust/dependencies/"
FILES_MATCHING
PATTERN "*.cuh")

install(DIRECTORY "${Thrust_SOURCE_DIR}/thrust/cmake"
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/libcudf/Thrust/thrust/")
install(DIRECTORY "${Thrust_SOURCE_DIR}/dependencies/cub/cub/cmake"
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/libcudf/Thrust/dependencies/cub/")

endfunction()

set(CUDF_MIN_VERSION_Thrust 1.12.0)
Expand Down