Skip to content

Add rpath for hipfft-test to help find libomp. #173

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

Closed
malcolmroberts wants to merge 5 commits into from
Closed

Add rpath for hipfft-test to help find libomp. #173

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f41cd65
Add rpath for hipfft-test to help find libomp.
malcolmroberts Jul 22, 2025
6df6ab6
Define static class member of hipfft_params for hipfft_mpi_worker
regan-amd Jul 23, 2025
2fdaaba
Use INSTALL_RPATH_USE_LINK_PATH for linking test executables.
malcolmroberts Jul 23, 2025
d1c8157
openmp_LIB_DIR style rpath for tests when OpenMP CONFIG works.
malcolmroberts Jul 28, 2025
0dac5f5
Make clients/tests find hipfft only of not in hipfft build scope
malcolmroberts Jul 30, 2025
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
23 changes: 9 additions & 14 deletions clients/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,15 @@ endif()
string( CONCAT TESTS_OUT_DIR "${PROJECT_BINARY_DIR}" ${TESTS_OUT_DIR} )

option( BUILD_CLIENTS_TESTS_OPENMP "Build tests with OpenMP" ON )
if( BUILD_CLIENTS_TESTS_OPENMP )

@regan-amd regan-amd Jul 31, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggestion: maybe we could add AND BUILD_WITH_LIB NOT STREQUAL "CUDA" above, to avoid a fatal build error if building with cuda (openMP is ignored thereafter in that case, anyways)?

find_package(OpenMP REQUIRED)
if( BUILD_WITH_LIB STREQUAL "CUDA" )
message( STATUS "OpenMP is not supported on CUDA, building tests without it" )
else()
target_link_libraries( hipfft-test PRIVATE OpenMP::OpenMP_CXX
-L${HIP_CLANG_ROOT}/lib -Wl,-rpath=${HIP_CLANG_ROOT}/lib )
Comment thread
regan-amd marked this conversation as resolved.
Outdated
endif()
endif()
Comment thread
regan-amd marked this conversation as resolved.

foreach( target ${TEST_TARGETS} )
set_target_properties( ${target} PROPERTIES
Expand Down Expand Up @@ -140,20 +149,6 @@ foreach( target ${TEST_TARGETS} )
target_compile_definitions( ${target} PUBLIC _CUFFT_BACKEND )
endif()

if( BUILD_CLIENTS_TESTS_OPENMP )
find_package(OpenMP REQUIRED)
if( BUILD_WITH_LIB STREQUAL "CUDA" )
message( STATUS "OpenMP is not supported on CUDA, building tests without it" )
else()
target_compile_options( ${target} PRIVATE -DBUILD_CLIENTS_TESTS_OPENMP )
if(NOT (CMAKE_CXX_COMPILER MATCHES ".*hipcc$" OR CMAKE_CXX_COMPILER MATCHES ".*clang\\+\\+"))
target_link_libraries( ${target} PRIVATE OpenMP::OpenMP_CXX )
target_include_directories( ${target} PRIVATE ${HIP_CLANG_ROOT}/include )
else()
target_link_libraries( ${target} PRIVATE OpenMP::OpenMP_CXX )
endif()
endif()
endif()

target_include_directories( ${target}
PRIVATE
Expand Down