Merge pull request ERGO-Code#2240 from ERGO-Code/cuda-test

Added optional FindCUDAConf for running on GPU cluster

Author: galabovaa

CMakeLists.txt

@@ -114,13 +114,17 @@ set(DEBUG_MEMORY "Off" CACHE STRING "Sanitizers")
 # emscripten
 option(EMSCRIPTEN_HTML "Emscripten HTML output" OFF)
 
-# option(CUPDLP_GPU "Build pdlp with CPU" ON)
-# message(STATUS "Build pdlp with CPU: ${CUPDLP_CPU}")
 
 option(CUPDLP_GPU "Build pdlp with GPU" OFF)
-
 message(STATUS "Build pdlp with GPU: ${CUPDLP_GPU}")
 
+option(CUPDLP_FIND_CUDA "Build pdlp with GPU" OFF)
+message(STATUS "Use FindCUDAConf: ${CUPDLP_FIND_CUDA}")
+
+if(CUPDLP_GPU AND CMAKE_VERSION VERSION_LESS "3.25.0") 
+    message("CUPDLP FindCUDAConf requires CMake version minumum 3.24. Please use a higher version of CMake.")
+endif()
+
 # if (NOT LINUX)
   # set (CUPDLP_GPU OFF)
   # message(STATUS "CUPLDP with Nvidia is only supported on Linux at the moment. Using CPU version.")
@@ -132,20 +136,21 @@ if (CUPDLP_GPU)
   endif()
 
   set (CUPDLP_CPU OFF)
+  message(NOTICE "Set build cuPDLP with CUDA")
 
-  # With FindCUDAConf.cmake
-  # default cuda_home on linux
-  # set(CUDA_HOME "/usr/local/cuda" CACHE STRING "Cuda path to install")
-  # message(NOTICE "Set build cuPDLP with CUDA")
-  # list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR})
-  # include(FindCUDAConf.cmake)
-
-  # With deleted FindCUDAConf.cmake
-  find_package(CUDAToolkit REQUIRED)
-  set(CUDA_LIBRARY-NOTFOUND, OFF)
-  set(CUDA_LIBRARY CUDA::cudart CUDA::cublas CUDA::cusparse)
+  if (CUPDLP_FIND_CUDA)
+    # With FindCUDAConf.cmake
+    # Need to have the CUDA_HOME environment variable set.
+    include(FindCUDAConf)
+  else() 
+    # Without FindCUDAConf.cmake
+    enable_language(CUDA)
+    find_package(CUDAToolkit REQUIRED)
+    
+    set(CUDA_LIBRARY-NOTFOUND, OFF)
+    set(CUDA_LIBRARY CUDA::cudart CUDA::cublas CUDA::cusparse)
+  endif()
 
-  message(NOTICE "Set build cuPDLP with CUDA")
 else()
   set (CUPDLP_CPU ON)
     set(CUDA_LIBRARY-NOTFOUND true)

cmake/FindCUDAConf.cmake

@@ -0,0 +1,31 @@
+set(CUDA_LIBRARY-NOTFOUND, OFF)
+message(NOTICE "Finding CUDA environment")
+message(NOTICE "    - CUDA Home detected at $ENV{CUDA_HOME}")
+set(CMAKE_CUDA_ARCHITECTURES "all")
+set(CMAKE_CUDA_PATH "$ENV{CUDA_HOME}")
+set(CMAKE_CUDA_COMPILER "${CMAKE_CUDA_PATH}/bin/nvcc")
+
+enable_language(CUDA)
+
+find_library(CUDA_LIBRARY_ART
+        NAMES cudart
+        HINTS "${CMAKE_CUDA_PATH}/lib64/"
+        REQUIRED
+)
+find_library(CUDA_LIBRARY_SPS
+        NAMES cusparse
+        HINTS "${CMAKE_CUDA_PATH}/lib64/"
+        REQUIRED
+)
+find_library(CUDA_LIBRARY_BLS
+        NAMES cublas
+        HINTS "${CMAKE_CUDA_PATH}/lib64/"
+        REQUIRED
+)
+if (${CUDA_LIBRARY-NOTFOUND})
+    message(WARNING "    - CUDA Libraries not detected at $ENV{CUDA_HOME}")
+else ()
+    message(NOTICE "    - CUDA Libraries detected at $ENV{CUDA_HOME}")
+    set(CUDA_LIBRARY ${CUDA_LIBRARY_ART} ${CUDA_LIBRARY_SPS} ${CUDA_LIBRARY_BLS})
+    message(NOTICE "    -   :${CUDA_LIBRARY}")
+endif ()

src/pdlp/cupdlp/cuda/CMakeLists.txt

@@ -8,7 +8,7 @@ add_library(cudalin SHARED
 )
 set_target_properties(cudalin PROPERTIES CUDA_SEPARABLE_COMPILATION ON)
 
-set_target_properties(cudalin PROPERTIES CUDA_ARCHITECTURES native)
+# set_target_properties(cudalin PROPERTIES CUDA_ARCHITECTURES native)
 
 target_include_directories(cudalin PUBLIC "${CMAKE_CUDA_PATH}/include")