Merge pull request #385 from mmuetzel/spqr

SPQR: Make GPUQREngine and SuiteSparse_GPURuntime subprojects

.github/workflows/build-arch-emu.yaml

@@ -9,7 +9,7 @@ concurrency: ci-arch-emu-${{ github.ref }}
 
 env:
   # string with name of libraries to be built
-  BUILD_LIBS: "SuiteSparse_config:Mongoose:AMD:BTF:CAMD:CCOLAMD:COLAMD:CHOLMOD:CSparse:CXSparse:LDL:KLU:UMFPACK:RBio:SuiteSparse_GPURuntime:GPUQREngine:SPQR:SPEX"
+  BUILD_LIBS: "SuiteSparse_config:Mongoose:AMD:BTF:CAMD:CCOLAMD:COLAMD:CHOLMOD:CSparse:CXSparse:LDL:KLU:UMFPACK:RBio:SPQR:SPEX"
   # string with name of libraries to be checked
   CHECK_LIBS: "SuiteSparse_config:Mongoose:AMD:BTF:CAMD:CCOLAMD:COLAMD:CHOLMOD:CSparse:CXSparse:LDL:KLU:UMFPACK:RBio:SPQR:SPEX"
 

.github/workflows/build.yaml

@@ -10,7 +10,7 @@ concurrency: ci-${{ github.ref }}
 
 env:
   # string with name of libraries to be built
-  BUILD_LIBS: "SuiteSparse_config:Mongoose:AMD:BTF:CAMD:CCOLAMD:COLAMD:CHOLMOD:CSparse:CXSparse:LDL:KLU:UMFPACK:RBio:SuiteSparse_GPURuntime:GPUQREngine:SPQR:GraphBLAS:SPEX"
+  BUILD_LIBS: "SuiteSparse_config:Mongoose:AMD:BTF:CAMD:CCOLAMD:COLAMD:CHOLMOD:CSparse:CXSparse:LDL:KLU:UMFPACK:RBio:SPQR:GraphBLAS:SPEX"
   # string with name of libraries to be checked
   CHECK_LIBS: "SuiteSparse_config:Mongoose:AMD:BTF:CAMD:CCOLAMD:COLAMD:CHOLMOD:CSparse:CXSparse:LDL:KLU:UMFPACK:RBio:SPQR:GraphBLAS:SPEX"
 

Example/CMakeLists.txt

@@ -79,12 +79,6 @@ find_package ( SPEX 2.2.1 REQUIRED )
 find_package ( SPQR 4.2.1 REQUIRED )
 find_package ( UMFPACK 6.2.1 REQUIRED )
 
-if ( TARGET CUDA::nvrtc )
-    # CHOLMOD and SPQR have been compiled with CUDA enabled.
-    find_package ( SuiteSparse_GPURuntime 3.2.1 REQUIRED )
-    find_package ( GPUQREngine 3.2.1 REQUIRED )
-endif ( )
-
 # look for all external libaries:
 find_package ( OpenMP REQUIRED )
 
@@ -298,19 +292,6 @@ else ( )
     target_link_libraries ( my_cxx_static PUBLIC SuiteSparse::CXSparse )
 endif ( )
 
-# GPUQREngine:
-if ( ENABLE_CUDA )
-    target_link_libraries ( my PRIVATE SuiteSparse::GPUQREngine )
-    target_link_libraries ( my_cxx PRIVATE SuiteSparse::GPUQREngine )
-    if ( TARGET SuiteSparse::GPUQREngine_static )
-        target_link_libraries ( my_static PUBLIC SuiteSparse::GPUQREngine_static )
-        target_link_libraries ( my_cxx_static PUBLIC SuiteSparse::GPUQREngine_static )
-    else ( )
-        target_link_libraries ( my_static PUBLIC SuiteSparse::GPUQREngine )
-        target_link_libraries ( my_cxx_static PUBLIC SuiteSparse::GPUQREngine )
-    endif ( )
-endif ( )
-
 # GraphBLAS:
 if ( TARGET SuiteSparse::GraphBLAS )
     target_link_libraries ( my PRIVATE SuiteSparse::GraphBLAS )
@@ -417,19 +398,6 @@ else ( )
     target_link_libraries ( my_cxx_static PUBLIC SuiteSparse::SuiteSparseConfig )
 endif ( )
 
-# GPURuntime:
-if ( ENABLE_CUDA )
-    target_link_libraries ( my PRIVATE SuiteSparse::GPURuntime )
-    target_link_libraries ( my_cxx PRIVATE SuiteSparse::GPURuntime )
-    if ( TARGET SuiteSparse::GPURuntime_static )
-        target_link_libraries ( my_static PUBLIC SuiteSparse::GPURuntime_static )
-        target_link_libraries ( my_cxx_static PUBLIC SuiteSparse::GPURuntime_static )
-    else ( )
-        target_link_libraries ( my_static PUBLIC SuiteSparse::GPURuntime )
-        target_link_libraries ( my_cxx_static PUBLIC SuiteSparse::GPURuntime )
-    endif ( )
-endif ( )
-
 # UMFPACK:
 target_link_libraries ( my PRIVATE SuiteSparse::UMFPACK )
 target_link_libraries ( my_cxx PRIVATE SuiteSparse::UMFPACK )

Makefile

@@ -36,8 +36,6 @@ library:
 	( cd KLU && $(MAKE) )
 	( cd UMFPACK && $(MAKE) )
 	( cd RBio && $(MAKE) )
-	( cd SuiteSparse_GPURuntime && $(MAKE) )
-	( cd GPUQREngine && $(MAKE) )
 	( cd SPQR && $(MAKE) )
 	( cd GraphBLAS && $(MAKE) )
 	( cd SPEX && $(MAKE) )
@@ -58,8 +56,6 @@ local:
 	( cd KLU && $(MAKE) local )
 	( cd UMFPACK && $(MAKE) local )
 	( cd RBio && $(MAKE) local )
-	( cd SuiteSparse_GPURuntime && $(MAKE) local )
-	( cd GPUQREngine && $(MAKE) local )
 	( cd SPQR && $(MAKE) local )
 	( cd GraphBLAS && $(MAKE) local )
 	( cd SPEX && $(MAKE) local )
@@ -81,8 +77,6 @@ global:
 	( cd KLU && $(MAKE) global )
 	( cd UMFPACK && $(MAKE) global )
 	( cd RBio && $(MAKE) global )
-	( cd SuiteSparse_GPURuntime && $(MAKE) global )
-	( cd GPUQREngine && $(MAKE) global )
 	( cd SPQR && $(MAKE) global )
 	( cd GraphBLAS && $(MAKE) global )
 	( cd SPEX && $(MAKE) global )
@@ -102,8 +96,6 @@ install:
 	( cd KLU && $(MAKE) install )
 	( cd UMFPACK && $(MAKE) install )
 	( cd RBio && $(MAKE) install )
-	( cd SuiteSparse_GPURuntime && $(MAKE) install )
-	( cd GPUQREngine && $(MAKE) install )
 	( cd SPQR && $(MAKE) install )
 	( cd GraphBLAS && $(MAKE) install )
 	( cd SPEX && $(MAKE) install )
@@ -123,8 +115,6 @@ uninstall:
 	( cd CHOLMOD && $(MAKE) uninstall )
 	( cd CXSparse && $(MAKE) uninstall )
 	( cd RBio && $(MAKE) uninstall )
-	( cd SuiteSparse_GPURuntime && $(MAKE) uninstall )
-	( cd GPUQREngine && $(MAKE) uninstall )
 	( cd SPQR && $(MAKE) uninstall )
 	( cd GraphBLAS && $(MAKE) uninstall )
 	( cd SPEX && $(MAKE) uninstall )
@@ -148,8 +138,6 @@ purge:
 	- ( cd CSparse && $(MAKE) purge )
 	- ( cd CXSparse && $(MAKE) purge )
 	- ( cd RBio && $(MAKE) purge )
-	- ( cd SuiteSparse_GPURuntime && $(MAKE) purge )
-	- ( cd GPUQREngine && $(MAKE) purge )
 	- ( cd SPQR && $(MAKE) purge )
 	- $(RM) MATLAB_Tools/*/*.mex* MATLAB_Tools/*/*/*.mex*
 	- $(RM) MATLAB_Tools/*/*.o    MATLAB_Tools/*/*/*.o
@@ -224,8 +212,6 @@ debug:
 	( cd KLU && $(MAKE) debug )
 	( cd UMFPACK && $(MAKE) debug )
 	( cd RBio && $(MAKE) debug )
-	( cd SuiteSparse_GPURuntime && $(MAKE) )
-	( cd GPUQREngine && $(MAKE) )
 	( cd SPQR && $(MAKE) debug )
 	( cd GraphBLAS && $(MAKE) cdebug )
 	( cd SPEX && $(MAKE) debug )

SPQR/CMakeLists.txt

@@ -67,18 +67,6 @@ if ( NOT TARGET SuiteSparse::CHOLMOD )
 endif ( )
 
 if ( SUITESPARSE_CUDA )
-    find_package ( SuiteSparse_GPURuntime 3.2.0
-        PATHS ${CMAKE_SOURCE_DIR}/../SuiteSparse_GPURuntime/build NO_DEFAULT_PATH )
-    if ( NOT TARGET SuiteSparse::GPURuntime )
-        find_package ( SuiteSparse_GPURuntime 3.2.0 REQUIRED )
-    endif ( )
-
-    find_package ( GPUQREngine 3.2.0
-        PATHS ${CMAKE_SOURCE_DIR}/../GPUQREngine/build NO_DEFAULT_PATH )
-    if ( NOT TARGET SuiteSparse::GPUQREngine )
-        find_package ( GPUQREngine 3.2.0 REQUIRED )
-    endif ( )
-
     find_package ( CHOLMOD_CUDA 4.2.0
         PATHS ${CMAKE_SOURCE_DIR}/../CHOLMOD/build NO_DEFAULT_PATH )
     if ( NOT TARGET SuiteSparse::CHOLMOD_CUDA )
@@ -91,6 +79,8 @@ include ( SuiteSparseLAPACK )   # requires cmake 3.22
 
 if ( SUITESPARSE_CUDA )
     # with CUDA
+    add_subdirectory ( GPURuntime )
+    add_subdirectory ( GPUQREngine )
     add_subdirectory ( SPQRGPU )
 endif ( )
 
@@ -226,13 +216,8 @@ endif ( )
 
 if ( SUITESPARSE_CUDA )
     # CUDA
-    target_link_libraries ( SPQR PRIVATE SuiteSparse::CHOLMOD_CUDA SPQR_CUDA )
-    # SPQR includes files from the following targets that are not installed by
-    # them.  That looks strange and will only work before they are installed.
-    # Maybe, those two targets aren't actually standalone libraries but should
-    # be part of the SPQR project?
     target_link_libraries ( SPQR PRIVATE
-        SuiteSparse::GPUQREngine SuiteSparse::GPURuntime )
+        SuiteSparse::CHOLMOD_CUDA SPQR_CUDA GPUQREngine GPURuntime )
     target_compile_definitions ( SPQR PUBLIC "SUITESPARSE_CUDA" )
     set ( SPQR_CFLAGS "-DSUITESPARSE_CUDA" )
     if ( NOT NSTATIC )
@@ -241,19 +226,9 @@ if ( SUITESPARSE_CUDA )
         else ( )
             target_link_libraries ( SPQR_static PUBLIC SuiteSparse::CHOLMOD_CUDA )
         endif ( )
-        target_link_libraries ( SPQR_static PUBLIC SPQR_CUDA_static )
+        target_link_libraries ( SPQR_static PUBLIC
+            SPQR_CUDA_static GPUQREngine_static GPURuntime_static )
         target_compile_definitions ( SPQR_static PUBLIC "SUITESPARSE_CUDA" )
-
-        if ( TARGET SuiteSparse::GPUQREngine_static )
-            target_link_libraries ( SPQR_static PUBLIC SuiteSparse::GPUQREngine_static )
-        else ( )
-            target_link_libraries ( SPQR_static PUBLIC SuiteSparse::GPUQREngine )
-        endif ( )
-        if ( TARGET SuiteSparse::GPURuntime_static )
-            target_link_libraries ( SPQR_static PUBLIC SuiteSparse::GPURuntime_static )
-        else ( )
-            target_link_libraries ( SPQR_static PUBLIC SuiteSparse::GPURuntime )
-        endif ( )
     endif ( )
 endif ( )
 

SPQR/Config/SPQRConfig.cmake.in

@@ -42,20 +42,48 @@ set ( _dependencies_found ON )
 if ( @SUITESPARSE_CUDA@ )
     # Look for imported targets of additional dependency if SPQR was built with CUDA
 
-    if ( NOT SPQR_CUDA_FOUND )
-        if ( @SUITESPARSE_IN_BUILD_TREE@ )
+    if ( @SUITESPARSE_IN_BUILD_TREE@ )
+        if ( NOT SuiteSparse_GPURuntime_FOUND )
+            # First check in a common build tree
+            find_dependency ( SuiteSparse_GPURuntime @SUITESPARSE_GPURUNTIME_VERSION_MAJOR@.@GPUQRENGINE_VERSION_MINOR@
+                PATHS ${CMAKE_SOURCE_DIR}/../SPQR/build/GPURuntime NO_DEFAULT_PATH )
+            # Then, check in the currently active CMAKE_MODULE_PATH
+            if ( NOT SuiteSparse_GPURuntime_FOUND )
+                find_dependency ( SuiteSparse_GPURuntime @SUITESPARSE_GPURUNTIME_VERSION_MAJOR@.@GPUQRENGINE_VERSION_MINOR@ )
+            endif ( )
+        endif ( )
+
+        if ( NOT GPUQREngine_FOUND )
+            # First check in a common build tree
+            find_dependency ( GPUQREngine @GPUQRENGINE_VERSION_MAJOR@.@GPUQRENGINE_VERSION_MINOR@
+                PATHS ${CMAKE_SOURCE_DIR}/../SPQR/build/GPUQREngine NO_DEFAULT_PATH )
+            # Then, check in the currently active CMAKE_MODULE_PATH
+            if ( NOT GPUQREngine_FOUND )
+                find_dependency ( GPUQREngine @GPUQRENGINE_VERSION_MAJOR@.@GPUQRENGINE_VERSION_MINOR@ )
+            endif ( )
+        endif ( )
+
+        if ( NOT SPQR_CUDA_FOUND )
             # First check in a common build tree
             find_dependency ( SPQR_CUDA ${SPQR_VERSION}
                 PATHS ${CMAKE_SOURCE_DIR}/../SPQR/build NO_DEFAULT_PATH )
             # Then, check in the currently active CMAKE_MODULE_PATH
             if ( NOT SPQR_CUDA_FOUND )
                 find_dependency ( SPQR_CUDA ${SPQR_VERSION} )
             endif ( )
-        else ( )
+        endif ( )
+    else ( )
+        if ( NOT SuiteSparse_GPURuntime_FOUND )
+            find_dependency ( SuiteSparse_GPURuntime @SUITESPARSE_GPURUNTIME_VERSION_MAJOR@.@GPUQRENGINE_VERSION_MINOR@ )
+        endif ( )
+        if ( NOT GPUQREngine_FOUND )
+            find_dependency ( GPUQREngine @GPUQRENGINE_VERSION_MAJOR@.@GPUQRENGINE_VERSION_MINOR@ )
+        endif ( )
+        if ( NOT SPQR_CUDA_FOUND )
             find_dependency ( SPQR_CUDA ${SPQR_VERSION} )
         endif ( )
     endif ( )
-    if ( NOT SPQR_CUDA_FOUND )
+    if ( NOT SuiteSparse_GPURuntime_FOUND OR NOT GPUQREngine_FOUND OR NOT SPQR_CUDA_FOUND )
         set ( _dependencies_found OFF )
     endif ( )
 endif ( )