Merged in fix_cuda_libs (pull request #211)

switch to cmake native find-cuda-libraries
icl-utk-edu · Oct 21, 2022 · abb8f0d · abb8f0d
2 parents 5ea5bf8 + 3697350
commit abb8f0d
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 12 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -122,15 +122,27 @@ endif()
 
 # build CPU libheffte, the CUDA test comes first to use cuda_add_library() vs add_library()
 if (Heffte_ENABLE_CUDA)
-    find_package(CUDA REQUIRED)
-
-    list(APPEND CUDA_NVCC_FLAGS "-std=c++11")
-    cuda_add_library(Heffte ${Heffte_common_sources}
-                            include/heffte_backend_cuda.h
-                            src/heffte_backend_cuda.cu)
-
-    cuda_add_cufft_to_target(Heffte)
-    target_include_directories(Heffte PUBLIC $<INSTALL_INTERFACE:${CUDA_INCLUDE_DIRS}>)
+    if (CMAKE_VERSION VERSION_LESS 3.17)
+        find_package(CUDA REQUIRED)
+
+        list(APPEND CUDA_NVCC_FLAGS "-std=c++11")
+        cuda_add_library(Heffte ${Heffte_common_sources}
+                                include/heffte_backend_cuda.h
+                                src/heffte_backend_cuda.cu)
+
+        cuda_add_cufft_to_target(Heffte)
+        target_include_directories(Heffte PUBLIC $<INSTALL_INTERFACE:${CUDA_INCLUDE_DIRS}>)
+    else()
+        enable_language(CUDA)
+        find_package(CUDAToolkit REQUIRED)
+        list(APPEND Heffte_common_sources
+             include/heffte_backend_cuda.h
+             src/heffte_backend_cuda.cu
+            )
+        set_source_files_properties(include/heffte_backend_cuda.h src/heffte_backend_cuda.cu PROPERTIES LANGUAGE CUDA)
+        add_library(Heffte ${Heffte_common_sources})
+        target_link_libraries(Heffte CUDA::cufft CUDA::cudart)
+    endif()
 else()
     add_library(Heffte ${Heffte_common_sources})
 endif()

diff --git a/cmake/HeffteConfig.cmake b/cmake/HeffteConfig.cmake
@@ -33,10 +33,16 @@ if (@Heffte_ENABLE_ONEAPI@ AND NOT TARGET Heffte::OneMKL)
 endif()
 
 if (@Heffte_ENABLE_CUDA@)
-    if (NOT CUDA_TOOLKIT_ROOT_DIR AND NOT "@CUDA_TOOLKIT_ROOT_DIR@" STREQUAL "")
-        set(CUDA_TOOLKIT_ROOT_DIR @CUDA_TOOLKIT_ROOT_DIR@)
+    if (CMAKE_VERSION VERSION_LESS 3.17)
+        if (NOT CUDA_TOOLKIT_ROOT_DIR AND NOT "@CUDA_TOOLKIT_ROOT_DIR@" STREQUAL "")
+            set(CUDA_TOOLKIT_ROOT_DIR @CUDA_TOOLKIT_ROOT_DIR@)
+        endif()
+        find_package(CUDA REQUIRED)
+    else()
+        if (NOT TARGET CUDA::cufft)
+            find_package(CUDAToolkit REQUIRED)
+        endif()
     endif()
-    find_package(CUDA REQUIRED)
 endif()
 
 if (@Heffte_ENABLE_MAGMA@ AND NOT TARGET Heffte::MAGMA)