Skip to content

Revert install location to thrust #228

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

Merged
stanleytsang-amd merged 2 commits into from
Mar 28, 2022
Merged

Revert install location to thrust #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee56193
Revert install location
lawruble13 Mar 28, 2022
3a4fb06
correct whitespace
lawruble13 Mar 28, 2022
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
16 changes: 7 additions & 9 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,15 +174,13 @@ endif()
#Create header wrapper for backward compatibility
if(BUILD_FILE_REORG_BACKWARD_COMPATIBILITY)
rocm_wrap_header_dir(
${CMAKE_SOURCE_DIR}/thrust
PATTERNS "*.h"
PATTERNS "*.inl"
PATTERN "*.cuh"
PATTERN "*.hpp"
GUARDS SYMLINK WRAPPER
WRAPPER_LOCATIONS rocthrust/include/thrust
OUTPUT_LOCATIONS rocthrust/wrapper/include/thrust
)
${CMAKE_SOURCE_DIR}/thrust
PATTERNS "*.h" "*.inl" "*.cuh" "*.hpp"
HEADER_LOCATION include/thrust
GUARDS SYMLINK WRAPPER
WRAPPER_LOCATIONS rocthrust/include/thrust
OUTPUT_LOCATIONS rocthrust/wrapper/include/thrust
)
endif( )

set(THRUST_OPTIONS_DEBUG ${THRUST_OPTIONS_WARNINGS})
Expand Down
3 changes: 2 additions & 1 deletion thrust/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ configure_file(
if(BUILD_FILE_REORG_BACKWARD_COMPATIBILITY)
rocm_wrap_header_file(
"rocthrust_version.hpp"
HEADER_LOCATION include/thrust
WRAPPER_LOCATIONS rocthrust/include/thrust
OUTPUT_LOCATIONS rocthrust/wrapper/include/thrust
)
Expand Down Expand Up @@ -54,7 +55,7 @@ rocm_install(
DIRECTORY
"./"
"${PROJECT_BINARY_DIR}/thrust/include/"
DESTINATION include/rocthrust
DESTINATION include/thrust
FILES_MATCHING
PATTERN "*.h"
PATTERN "*.cuh"
Expand Down