Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ Full documentation for rocPRIM is available at [https://rocm.docs.amd.com/projec

* Removed HIP-CPU support. HIP-CPU support was experimental and broken.
* Changed the C++ version from 14 to 17. C++14 will be deprecated in the next major release.
* You can use CMake HIP language support with CMake 3.18 and later. To use HIP language support, run `cmake` with `-DUSE_HIPCXX=ON` instead of setting the `CXX` variable to the path to a HIP-aware compiler.

### Resolved issues

Expand Down
8 changes: 5 additions & 3 deletions benchmark/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,12 @@ function(add_rocprim_benchmark BENCHMARK_SOURCE)
benchmark::benchmark
)

target_link_libraries(${BENCHMARK_TARGET}
PRIVATE
if(USE_HIPCXX)
target_link_libraries(${BENCHMARK_TARGET}
PRIVATE
$<IF:$<LINK_LANGUAGE:HIP>,hip::host,hip::device>
)
)
endif()

target_compile_options(${BENCHMARK_TARGET}
PRIVATE
Expand Down
8 changes: 5 additions & 3 deletions example/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,12 @@ function(add_rocprim_example EXAMPLE_SOURCE)
PRIVATE
rocprim
)
target_link_libraries(${EXAMPLE_TARGET}
PRIVATE
if(USE_HIPCXX)
target_link_libraries(${EXAMPLE_TARGET}
PRIVATE
$<IF:$<LINK_LANGUAGE:HIP>,hip::host,hip::device>
)
)
endif()
set_target_properties(${EXAMPLE_TARGET}
PROPERTIES
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/example"
Expand Down
8 changes: 5 additions & 3 deletions test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,12 @@ function(add_hip_test TEST_NAME TEST_SOURCES)
PRIVATE
rocprim
)
target_link_libraries(${TEST_TARGET}
PRIVATE
if(USE_HIPCXX)
target_link_libraries(${TEST_TARGET}
PRIVATE
$<IF:$<LINK_LANGUAGE:HIP>,hip::host,hip::device>
)
)
endif()

target_compile_options(${TEST_TARGET}
PRIVATE
Expand Down
8 changes: 5 additions & 3 deletions test/rocprim/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,12 @@ function(add_rocprim_test_internal TEST_NAME TEST_SOURCES TEST_TARGET)
GTest::Main
)

target_link_libraries(${TEST_TARGET}
PRIVATE
if(USE_HIPCXX)
target_link_libraries(${TEST_TARGET}
PRIVATE
$<IF:$<LINK_LANGUAGE:HIP>,hip::host,hip::device>
)
)
endif()

target_compile_options(${TEST_TARGET}
PRIVATE
Expand Down