[rocm-libraries] ROCm/rocm-libraries#1308 (commit 7f16ceb)

Add build and install rpath for hipfft-test and rocfft-test
 for finding libomp.so (#1308)

## Motivation

Cherry-pick ~~#995~~ #1004 and #1164 to 7.0, to fix RHEL10/OL10.

## Technical Details

Test executables have absolute rpaths, which are not allowed in RHEL10
and OL10.

## Test Plan

Regular regression tests are now runnable via packages on these OSes.

Author: evetsso

clients/tests/CMakeLists.txt

@@ -186,9 +186,34 @@ set( rocfft-test_include_dirs
   )
 
 set( rocfft-test_link_libs
-  ${FFTW_LIBRARIES} OpenMP::OpenMP_CXX
+  ${FFTW_LIBRARIES}
   )
 
+option( BUILD_CLIENTS_TESTS_OPENMP "Build tests with OpenMP" ON )
+if( BUILD_CLIENTS_TESTS_OPENMP )
+  # Attempt to find a config version, which provides openmp_LIB_DIR.
+  #find_package( OpenMP CONFIG PATHS "${HIP_CLANG_ROOT}/lib/cmake" )
+  if( NOT OPENMP_FOUND OR NOT DEFINED ${openmp_LIB_DIR} )
+     # Fall-back to module mode.
+     find_package( OpenMP REQUIRED )
+     set( BUILD_RPATH "${HIP_CLANG_ROOT}/lib" )
+     set( INSTALL_RPATH "$ORIGIN/../llvm/lib" )
+  else()
+     set( BUILD_RPATH "${HIP_CLANG_ROOT}/${openmp_LIB_DIR}" )
+     set( INSTALL_RPATH "$ORIGIN/../llvm/${openmp_LIB_DIR}" )
+  endif()
+  list( APPEND rocfft-test_link_libs OpenMP::OpenMP_CXX )	
+
+  set_target_properties( rocfft-test PROPERTIES
+     BUILD_RPATH "{$BUILD_RPATH}"
+  )
+  set_target_properties( rocfft-test PROPERTIES
+    INSTALL_RPATH "${INSTALL_RPATH}"
+  )
+endif()
+
+
+
 include( ../cmake/build-gtest.cmake )
 
 if( BUILD_GTEST OR NOT GTEST_FOUND )
@@ -262,28 +287,16 @@ if( USE_CUDA )
     )
   target_compile_definitions( rocfft-test PRIVATE __HIP_PLATFORM_NVCC__ )
 endif( )
-target_link_libraries( rocfft-test PRIVATE ${ROCFFT_CLIENTS_HOST_LINK_LIBS} ${ROCFFT_CLIENTS_DEVICE_LINK_LIBS} )
+target_link_libraries( rocfft-test PRIVATE
+   ${ROCFFT_CLIENTS_HOST_LINK_LIBS}
+   ${ROCFFT_CLIENTS_DEVICE_LINK_LIBS} )
 
 include( ../../cmake/sqlite.cmake )
 target_link_libraries( rocfft-test PUBLIC ${ROCFFT_SQLITE_LIB} )
 target_include_directories( rocfft-test PRIVATE ${sqlite_local_SOURCE_DIR} )
 
 set_property( TARGET rocfft-test APPEND PROPERTY LINK_LIBRARIES ${ROCFFT_SQLITE_LIB} )
 
-option( BUILD_CLIENTS_TESTS_OPENMP "Build tests with OpenMP" ON )
-
-if( BUILD_CLIENTS_TESTS_OPENMP )
-  find_package(OpenMP REQUIRED)
-  if( CMAKE_CXX_COMPILER MATCHES ".*/hipcc$" )
-    target_link_libraries( rocfft-test PRIVATE OpenMP::OpenMP_CXX -L${HIP_CLANG_ROOT}/lib -Wl,-rpath=${HIP_CLANG_ROOT}/lib )
-    target_include_directories( rocfft-test PRIVATE ${HIP_CLANG_ROOT}/include )
-  else()
-    if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-      target_link_libraries( rocfft-test PRIVATE OpenMP::OpenMP_CXX )
-    endif()
-  endif()
-endif()
-
 if(FFTW_MULTITHREAD)
   target_compile_options( rocfft-test PRIVATE -DFFTW_MULTITHREAD )
 endif( )
@@ -335,7 +348,16 @@ if( ROCFFT_MPI_ENABLE )
   # normal and dynamic-loading MPI worker processes
   foreach(worker rocfft_mpi_worker dyna_rocfft_mpi_worker)
     add_executable( ${worker} rocfft_mpi_worker.cpp )
-    if( BUILD_FFTW )
+
+    if( BUILD_CLIENTS_TESTS_OPENMP )
+      set_target_properties( ${worker} PROPERTIES
+         BUILD_RPATH "${BUILD_RPATH}"
+      )
+      set_target_properties( ${worker} PROPERTIES
+        INSTALL_RPATH "${INSTALL_RPATH}"
+      )
+    endif()
+    if( BUILD_FFTW  OR NOT FFTW_FOUND )
       add_dependencies( ${worker} fftw_double fftw_single )
     endif()
     target_include_directories( ${worker}
@@ -390,7 +412,7 @@ if( ROCFFT_MPI_ENABLE )
 
 endif()
 
-set(COVERAGE_TEST_OPTIONS "--smoketest" CACHE STRING "Command line arguments for rocfft-test when generating a code coverage report")
+set(COVERAGE_TEST_OPTIONS "--smoketest;--gtest_filter=-*call*" CACHE STRING "Command line arguments for rocfft-test when generating a code coverage report")
 
 if(BUILD_CODE_COVERAGE)
   # Coverage won't work in a standalone build of the tests, as we can't

shared/fft_params.h

@@ -614,7 +614,10 @@ class fft_params
             }
         }
 
-        assert(selected_grid[0] * selected_grid[1] * selected_grid[2] == mp_ranks);
+        if(selected_grid[0] * selected_grid[1] * selected_grid[2] != mp_ranks)
+        {
+            throw std::runtime_error("Grid dimensions do not multiply to mp_ranks.");
+        }
 
         fft_grid = {selected_grid[0], selected_grid[1], selected_grid[2]};
     }
@@ -653,7 +656,10 @@ class fft_params
             }
         }
 
-        assert(selected_grid[0] * selected_grid[1] == mp_ranks);
+        if(selected_grid[0] * selected_grid[1] != mp_ranks)
+        {
+            throw std::runtime_error("Grid dimensions do not multiply to mp_ranks.");
+        }
 
         fft_grid = {selected_grid[0], selected_grid[1]};
     }