Merge pull request #441 from DrTimothyAldenDavis/dev2

revert KLU, SPQR, UMFPACK, GPUQREngine; update Example
DrTimothyAldenDavis · Oct 16, 2023 · f98e0f5 · f98e0f5
2 parents 0ee99a7 + 29f46e4
commit f98e0f5
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 19 deletions.
diff --git a/Example/CMakeLists.txt b/Example/CMakeLists.txt
@@ -12,10 +12,10 @@
 cmake_minimum_required ( VERSION 3.20 )
 
 # cmake inserts the date and version number into Include/my.h:
-set ( MY_DATE "Sept 18, 2023" )
+set ( MY_DATE "Oct 16, 2023" )
 set ( MY_VERSION_MAJOR 1 )
 set ( MY_VERSION_MINOR 4 )
-set ( MY_VERSION_PATCH 1 )
+set ( MY_VERSION_PATCH 2 )
 
 message ( STATUS "Building MY library version: v"
     ${MY_VERSION_MAJOR}.
@@ -61,7 +61,7 @@ project ( my
 #-------------------------------------------------------------------------------
 
 # look for all SuiteSparse packages:
-find_package ( SuiteSparse_config 7.2.1 REQUIRED )
+find_package ( SuiteSparse_config 7.2.2 REQUIRED )
 find_package ( AMD 3.2.1 REQUIRED )
 find_package ( BTF 2.2.1 REQUIRED )
 find_package ( CAMD 3.2.1 REQUIRED )
@@ -81,10 +81,8 @@ find_package ( UMFPACK 6.2.1 REQUIRED )
 
 if ( TARGET CUDA::nvrtc )
     # CHOLMOD and SPQR have been compiled with CUDA enabled.
-#   find_package ( CHOLMOD_CUDA 4.2.2 REQUIRED )
-#   find_package ( SPQR_CUDA 4.2.0 REQUIRED )
-    find_package ( SuiteSparse_GPURuntime 3.2.0 REQUIRED )
-    find_package ( GPUQREngine 3.2.0 REQUIRED )
+    find_package ( SuiteSparse_GPURuntime 3.2.1 REQUIRED )
+    find_package ( GPUQREngine 3.2.1 REQUIRED )
 endif ( )
 
 # look for all external libaries:

diff --git a/GPUQREngine/CMakeLists.txt b/GPUQREngine/CMakeLists.txt
@@ -97,16 +97,16 @@ if ( DEMO AND DEMO_OK )
         find_package ( CCOLAMD 3.2.0 )
     endif ( )
 
-    find_package ( CHOLMOD 4.2.2
+    find_package ( CHOLMOD 4.2.0
         PATHS ${CMAKE_SOURCE_DIR}/../CHOLMOD/build NO_DEFAULT_PATH )
     if ( NOT TARGET SuiteSparse::CHOLMOD )
-        find_package ( CHOLMOD 4.2.2 )
+        find_package ( CHOLMOD 4.2.0 )
     endif ( )
 
-    find_package ( CHOLMOD_CUDA 4.2.2
+    find_package ( CHOLMOD_CUDA 4.2.0
         PATHS ${CMAKE_SOURCE_DIR}/../CHOLMOD/build NO_DEFAULT_PATH )
     if ( NOT TARGET SuiteSparse::CHOLMOD_CUDA )
-        find_package ( CHOLMOD_CUDA 4.2.2 )
+        find_package ( CHOLMOD_CUDA 4.2.0 )
     endif ( )
 endif ( )
 

diff --git a/KLU/CMakeLists.txt b/KLU/CMakeLists.txt
@@ -80,10 +80,10 @@ option ( NCHOLMOD "ON: do not use CHOLMOD.  OFF (default): use CHOLMOD" off )
 
 if ( NOT NCHOLMOD )
     # look for CHOLMOD (optional fill-reducing orderings)
-    find_package ( CHOLMOD 4.2.2
+    find_package ( CHOLMOD 4.2.0
         PATHS ${CMAKE_SOURCE_DIR}/../CHOLMOD/build NO_DEFAULT_PATH )
     if ( NOT TARGET SuiteSparse::CHOLMOD )
-        find_package ( CHOLMOD 4.2.2 )
+        find_package ( CHOLMOD 4.2.0 )
     endif ( )
 
     # look for CHOLMOD's dependencies: AMD and COLAMD are required.  CAMD and

diff --git a/SPQR/CMakeLists.txt b/SPQR/CMakeLists.txt
@@ -74,10 +74,10 @@ endif ( )
 
 # It would be nice if just checking for CHOLMOD would automatically pull in
 # the targets for its dependencies.
-find_package ( CHOLMOD 4.2.2
+find_package ( CHOLMOD 4.2.0
     PATHS ${CMAKE_SOURCE_DIR}/../CHOLMOD/build NO_DEFAULT_PATH )
 if ( NOT TARGET SuiteSparse::CHOLMOD )
-    find_package ( CHOLMOD 4.2.2 REQUIRED )
+    find_package ( CHOLMOD 4.2.0 REQUIRED )
 endif ( )
 
 # look for CHOLMOD's dependencies: AMD and COLAMD are required.  CAMD and
@@ -107,10 +107,10 @@ if ( SUITESPARSE_CUDA )
         find_package ( GPUQREngine 3.2.0 REQUIRED )
     endif ( )
 
-    find_package ( CHOLMOD_CUDA 4.2.2
+    find_package ( CHOLMOD_CUDA 4.2.0
         PATHS ${CMAKE_SOURCE_DIR}/../CHOLMOD/build NO_DEFAULT_PATH )
     if ( NOT TARGET SuiteSparse::CHOLMOD_CUDA )
-        find_package ( CHOLMOD_CUDA 4.2.2 REQUIRED )
+        find_package ( CHOLMOD_CUDA 4.2.0 REQUIRED )
     endif ( )
 endif ( )
 

diff --git a/UMFPACK/CMakeLists.txt b/UMFPACK/CMakeLists.txt
@@ -77,10 +77,10 @@ option ( NCHOLMOD "ON: do not use CHOLMOD.  OFF (default): use CHOLMOD" off )
 
 if ( NOT NCHOLMOD )
     # look for CHOLMOD (optional fill-reducing orderings)
-    find_package ( CHOLMOD 4.2.2
+    find_package ( CHOLMOD 4.2.0
         PATHS ${CMAKE_SOURCE_DIR}/../CHOLMOD/build NO_DEFAULT_PATH )
     if ( NOT TARGET SuiteSparse::CHOLMOD )
-        find_package ( CHOLMOD 4.2.2 )
+        find_package ( CHOLMOD 4.2.0 )
     endif ( )
 
     # look for CHOLMOD's dependencies: AMD and COLAMD are required.  CAMD and