Merge Adding rocthrust through cmake

This merge uses CMake to find and add rocthrust. This fixes the spack issue reported in spack/spack#44923. Related PR: #1668
ginkgo-project · Aug 20, 2024 · 369b12a · 369b12a
2 parents 9f1c41b + fc3931f
commit 369b12a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/cmake/GinkgoConfig.cmake.in b/cmake/GinkgoConfig.cmake.in
@@ -175,6 +175,7 @@ if((NOT GINKGO_BUILD_SHARED_LIBS) AND GINKGO_BUILD_HIP)
     find_dependency(hiprand)
     find_dependency(hipsparse)
     find_dependency(rocrand)
+    find_dependency(rocthrust)
     set_and_check(ROCTRACER_PATH "@ROCTRACER_PATH@")
     find_dependency(ROCTX)
 endif()

diff --git a/cmake/hip.cmake b/cmake/hip.cmake
@@ -123,6 +123,7 @@ find_package(hiprand REQUIRED)
 find_package(hipsparse REQUIRED)
 # At the moment, for hiprand to work also rocrand is required.
 find_package(rocrand REQUIRED)
+find_package(rocthrust REQUIRED)
 find_package(ROCTX)
 
 if(GINKGO_HIP_AMD_UNSAFE_ATOMIC AND GINKGO_HIP_VERSION VERSION_GREATER_EQUAL 5)

diff --git a/hip/CMakeLists.txt b/hip/CMakeLists.txt
@@ -65,7 +65,7 @@ target_include_directories(ginkgo_hip
 target_compile_definitions(ginkgo_hip PRIVATE GKO_COMPILING_HIP GKO_DEVICE_NAMESPACE=hip)
 
 target_link_libraries(ginkgo_hip PUBLIC ginkgo_device)
-target_link_libraries(ginkgo_hip PRIVATE hip::host roc::hipblas roc::hipsparse hip::hiprand roc::rocrand)
+target_link_libraries(ginkgo_hip PRIVATE hip::host roc::hipblas roc::hipsparse hip::hiprand roc::rocrand roc::rocthrust)
 if (hipfft_FOUND)
     target_link_libraries(ginkgo_hip PRIVATE hip::hipfft)
 endif()