Impl #78: Replace deprecated FindCUDA

Author: BerndDoser

.devcontainer/devcontainer.json

@@ -18,7 +18,7 @@
 				"ms-vscode.cpptools-extension-pack",
 				"ms-python.python",
 				"ms-toolsai.jupyter",
-				"tamasfe.even-better-toml",
+				"tamasfe.even-better-toml"
 			]
 		}
 	},

CMakeLists.txt

@@ -1,5 +1,16 @@
+include(CheckLanguage)
+
 cmake_minimum_required(VERSION 3.18)
-project(Pink VERSION 2.5 LANGUAGES CUDA CXX)
+project(Pink VERSION 2.5)
+enable_language(CXX)
+
+check_language(CUDA)
+if(CMAKE_CUDA_COMPILER)
+  message(STATUS "CUDA support")
+  enable_language(CUDA)
+else()
+  message(STATUS "No CUDA support")
+endif()
 
 message(STATUS "${PROJECT_NAME} version ${PROJECT_VERSION}")
 
@@ -119,25 +130,21 @@ if("${isSystemDir}" STREQUAL "-1")
     set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
 endif()
 
-option(USE_CUDA "Use CUDA" ON)
-if (USE_CUDA)
-    find_package(CUDA)
-    if(CUDA_FOUND)
-        set(PINK_USE_CUDA true)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DPINK_USE_CUDA")
-
-        if(NOT DEFINED CMAKE_CUDA_ARCHITECTURES)
-            set(CMAKE_CUDA_ARCHITECTURES 75)
-        endif()
-
-        # Set flags for CUDA compiler
-        list(APPEND CUDA_NVCC_FLAGS "
-        -std=c++17
-        --expt-extended-lambda
-        --expt-relaxed-constexpr
-        --default-stream per-thread
-        ")
+if(CMAKE_CUDA_COMPILER)
+    set(PINK_USE_CUDA true)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DPINK_USE_CUDA")
+
+    if(NOT DEFINED CMAKE_CUDA_ARCHITECTURES)
+        set(CMAKE_CUDA_ARCHITECTURES 75)
     endif()
+
+    # Set flags for CUDA compiler
+    list(APPEND CUDA_NVCC_FLAGS "
+    -std=c++17
+    --expt-extended-lambda
+    --expt-relaxed-constexpr
+    --default-stream per-thread
+    ")
 endif()
 
 set(PYBIND11_PYTHON_VERSION 3)

src/CMakeLists.txt

@@ -4,7 +4,7 @@ endif()
 
 add_subdirectory(UtilitiesLib)
 
-if(CUDA_FOUND)
+if(CMAKE_CUDA_COMPILER)
     add_subdirectory(CudaLib)
 endif()
 

src/CudaLib/CMakeLists.txt

@@ -6,7 +6,7 @@ include_directories(SYSTEM
     ${CUDA_INCLUDE_DIRS}
 )
 
-cuda_add_library(
+add_library(
     CudaLib
     SHARED
     CudaLib.cu

src/pink/CMakeLists.txt

@@ -12,40 +12,19 @@ include_directories(SYSTEM
     ${PYTHON_INCLUDE_DIRS}
 )
 
-if(PINK_USE_CUDA)
-    include_directories(
-        ${CUDA_INCLUDE_DIRS}
-    )
-
-    cuda_add_library(
-        PythonBindingLib
-        SHARED
-        DynamicData.cpp
-        DynamicMapper.cpp
-        DynamicSOM.cpp
-        DynamicTrainer.cpp
-    )
-
-    target_link_libraries(
-        PythonBindingLib
-        CudaLib
-        UtilitiesLib
-    )
-else()
-    add_library(
-        PythonBindingLib
-        SHARED
-        DynamicData.cpp
-        DynamicMapper.cpp
-        DynamicSOM.cpp
-        DynamicTrainer.cpp
-    )
-
-    target_link_libraries(
-        PythonBindingLib PRIVATE
-        UtilitiesLib
-    )
-endif()
+add_library(
+    PythonBindingLib
+    SHARED
+    DynamicData.cpp
+    DynamicMapper.cpp
+    DynamicSOM.cpp
+    DynamicTrainer.cpp
+)
+
+target_link_libraries(
+    PythonBindingLib PRIVATE
+    UtilitiesLib
+)
 
 pybind11_add_module(
     _pink MODULE

test/CMakeLists.txt

@@ -2,7 +2,7 @@ add_subdirectory(ImageProcessingTest)
 add_subdirectory(SelfOrganizingMapTest)
 add_subdirectory(UtilitiesTest)
 
-if(CUDA_FOUND)
+if(CMAKE_CUDA_COMPILER)
     add_subdirectory(CudaTest)
 endif()
 

test/CudaTest/CMakeLists.txt

@@ -2,11 +2,7 @@ include_directories(
     ${PROJECT_SOURCE_DIR}/src
 )
 
-include_directories(SYSTEM
-    ${CUDA_INCLUDE_DIRS}
-)
-
-cuda_add_executable(
+add_executable(
     CudaTest
     circular_ed.cu
     compare_trainer_3d_cpu.cu