Review from cedricchevalier19

CExA-project · Oct 23, 2024 · 47ada33 · 47ada33
1 parent 41c27ad
commit 47ada33
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -145,6 +145,8 @@ jobs:
           'hip')
             export CC=hipcc
             export CXX=hipcc
+            # We extend the CMAKE_PREFIX_PATH with the content of _ROOT variables to support
+            # rocm 5.7. (likely due to a cmake_minimum_required(VERSION 3.3))
             export CMAKE_PREFIX_PATH="/opt/rocm:$benchmark_ROOT:$DDC_ROOT:$GTest_ROOT:$Kokkos_ROOT:$KokkosFFT_ROOT:$KokkosKernels_ROOT"
             EXTRA_CMAKE_FLAGS="-DKokkos_ENABLE_HIP=ON -DKokkos_ENABLE_HIP_RELOCATABLE_DEVICE_CODE=ON -DKokkos_ENABLE_ROCTHRUST=OFF -DKokkos_ARCH_AMD_GFX90A=ON"
           ;;

diff --git a/cmake/DDCConfig.cmake.in b/cmake/DDCConfig.cmake.in
@@ -11,14 +11,17 @@ set(DDC_BUILD_KERNELS_FFT @DDC_BUILD_KERNELS_FFT@)
 set(DDC_BUILD_KERNELS_SPLINES @DDC_BUILD_KERNELS_SPLINES@)
 set(DDC_BUILD_PDI_WRAPPER @DDC_BUILD_PDI_WRAPPER@)
 
-find_package(Kokkos 4.4...4.5 CONFIG)
+find_package(Kokkos 4.4...4.5)
 
 if(@DDC_BUILD_KERNELS_FFT@)
-   find_dependency(KokkosFFT 0.2.1...<1 CONFIG)
+   find_dependency(KokkosFFT 0.2.1...<1)
 endif()
 
 if(@DDC_BUILD_KERNELS_SPLINES@)
    find_dependency(Ginkgo 1.8.0 EXACT)
+   # DDC installs a FindLAPACKE.cmake file.
+   # We choose to rely on it by prepending to CMAKE_MODULE_PATH
+   # only the time of calling find_dependency.
    list(PREPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
    find_dependency(LAPACKE)
    list(POP_FRONT CMAKE_MODULE_PATH)