Merge pull request #747 from DrTimothyAldenDavis/dev2

SuiteSparse 7.6.0.beta2
DrTimothyAldenDavis · Jan 24, 2024 · 9706d50 · 9706d50
2 parents 86d4718 + f670118
commit 9706d50
Show file tree

Hide file tree

Showing 40 changed files with 130 additions and 125 deletions.
diff --git a/CCOLAMD/CMakeLists.txt b/CCOLAMD/CMakeLists.txt
@@ -11,10 +11,10 @@
 
 cmake_minimum_required ( VERSION 3.22 )
 
-set ( CCOLAMD_DATE "Jan 10, 2024" )
+set ( CCOLAMD_DATE "Jan 20, 2024" )
 set ( CCOLAMD_VERSION_MAJOR 3 CACHE STRING "" FORCE )
 set ( CCOLAMD_VERSION_MINOR 3 CACHE STRING "" FORCE )
-set ( CCOLAMD_VERSION_SUB   1 CACHE STRING "" FORCE )
+set ( CCOLAMD_VERSION_SUB   2 CACHE STRING "" FORCE )
 
 message ( STATUS "Building CCOLAMD version: v"
     ${CCOLAMD_VERSION_MAJOR}.
@@ -43,10 +43,10 @@ include ( SuiteSparsePolicy )
 #-------------------------------------------------------------------------------
 
 if ( NOT SUITESPARSE_ROOT_CMAKELISTS )
-    find_package ( SuiteSparse_config 7.5.0
+    find_package ( SuiteSparse_config 7.6.0
         PATHS ${CMAKE_SOURCE_DIR}/../SuiteSparse_config/build NO_DEFAULT_PATH )
     if ( NOT TARGET SuiteSparse::SuiteSparseConfig )
-        find_package ( SuiteSparse_config 7.5.0 REQUIRED )
+        find_package ( SuiteSparse_config 7.6.0 REQUIRED )
     endif ( )
 endif ( )
 

diff --git a/CCOLAMD/Config/ccolamd.h.in b/CCOLAMD/Config/ccolamd.h.in
@@ -46,8 +46,8 @@
 
 #define CCOLAMD__VERSION SUITESPARSE__VERCODE(@CCOLAMD_VERSION_MAJOR@,@CCOLAMD_VERSION_MINOR@,@CCOLAMD_VERSION_SUB@)
 #if !defined (SUITESPARSE__VERSION) || \
-    (SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,5,0))
-#error "CCOLAMD @CCOLAMD_VERSION_MAJOR@.@CCOLAMD_VERSION_MINOR@.@CCOLAMD_VERSION_SUB@ requires SuiteSparse_config 7.5.0 or later"
+    (SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,6,0))
+#error "CCOLAMD @CCOLAMD_VERSION_MAJOR@.@CCOLAMD_VERSION_MINOR@.@CCOLAMD_VERSION_SUB@ requires SuiteSparse_config 7.6.0 or later"
 #endif
 
 /* ========================================================================== */

diff --git a/CCOLAMD/Doc/ChangeLog b/CCOLAMD/Doc/ChangeLog
@@ -1,3 +1,7 @@
+Jan 20, 2024: version 3.3.2
+
+    * minor updates to build system
+
 Jan 10, 2024: version 3.3.1
 
     * minor updates to build system

diff --git a/CCOLAMD/Include/ccolamd.h b/CCOLAMD/Include/ccolamd.h
@@ -36,18 +36,18 @@
  *	#endif
  */
 
-#define CCOLAMD_DATE "Jan 10, 2024"
+#define CCOLAMD_DATE "Jan 20, 2024"
 #define CCOLAMD_MAIN_VERSION   3
 #define CCOLAMD_SUB_VERSION    3
-#define CCOLAMD_SUBSUB_VERSION 1
+#define CCOLAMD_SUBSUB_VERSION 2
 
 #define CCOLAMD_VERSION_CODE(main,sub) SUITESPARSE_VER_CODE(main,sub)
 #define CCOLAMD_VERSION CCOLAMD_VERSION_CODE(3,3)
 
-#define CCOLAMD__VERSION SUITESPARSE__VERCODE(3,3,1)
+#define CCOLAMD__VERSION SUITESPARSE__VERCODE(3,3,2)
 #if !defined (SUITESPARSE__VERSION) || \
-    (SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,5,0))
-#error "CCOLAMD 3.3.1 requires SuiteSparse_config 7.5.0 or later"
+    (SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,6,0))
+#error "CCOLAMD 3.3.2 requires SuiteSparse_config 7.6.0 or later"
 #endif
 
 /* ========================================================================== */

diff --git a/CCOLAMD/Makefile b/CCOLAMD/Makefile
@@ -64,7 +64,7 @@ remake:
 
 # just run cmake to set things up
 setup:
-	( cd build ; cmake $(CMAKE_OPTIONS) .. )
+	( cd build && cmake $(CMAKE_OPTIONS) .. )
 
 install:
 	( cd build && cmake --install . )

diff --git a/CHOLMOD/CMakeLists.txt b/CHOLMOD/CMakeLists.txt
@@ -124,10 +124,10 @@ if ( NOT SUITESPARSE_ROOT_CMAKELISTS )
         find_package ( AMD 3.3.1 REQUIRED )
     endif ( )
 
-    find_package ( COLAMD 3.3.1
+    find_package ( COLAMD 3.3.2
         PATHS ${CMAKE_SOURCE_DIR}/../COLAMD/build NO_DEFAULT_PATH )
     if ( NOT TARGET SuiteSparse::COLAMD )
-        find_package ( COLAMD 3.3.1 REQUIRED )
+        find_package ( COLAMD 3.3.2 REQUIRED )
     endif ( )
 endif ( )
 
@@ -237,10 +237,10 @@ endif ( )
             find_package ( CAMD 3.3.1 )
         endif ( )
 
-        find_package ( CCOLAMD 3.3.1
+        find_package ( CCOLAMD 3.3.2
             PATHS ${CMAKE_SOURCE_DIR}/../CCOLAMD/build NO_DEFAULT_PATH )
         if ( NOT TARGET SuiteSparse::CCOLAMD )
-            find_package ( CCOLAMD 3.3.1 )
+            find_package ( CCOLAMD 3.3.2 )
         endif ( )
 
         if ( NOT CAMD_FOUND OR NOT CCOLAMD_FOUND )

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -170,7 +170,7 @@ endif ( )
 
 if ( SUITESPARSE_USE_SYSTEM_COLAMD )
     list ( REMOVE_ITEM SUITESPARSE_ENABLE_PROJECTS "colamd" )
-    find_package ( COLAMD 3.3.1 REQUIRED )
+    find_package ( COLAMD 3.3.2 REQUIRED )
 else ( )
     if ( "cholmod" IN_LIST SUITESPARSE_ENABLE_PROJECTS
             OR "spex" IN_LIST SUITESPARSE_ENABLE_PROJECTS )
@@ -197,7 +197,7 @@ endif ( )
 
 if ( SUITESPARSE_USE_SYSTEM_CCOLAMD )
     list ( REMOVE_ITEM SUITESPARSE_ENABLE_PROJECTS "ccolamd" )
-    find_package ( CCOLAMD 3.3.1 REQUIRED )
+    find_package ( CCOLAMD 3.3.2 REQUIRED )
 else ( )
     if ( CHOLMOD_CAMD AND "cholmod" IN_LIST SUITESPARSE_ENABLE_PROJECTS )
         # CHOLMOD can optionally use CCOLAMD.

diff --git a/COLAMD/CMakeLists.txt b/COLAMD/CMakeLists.txt
@@ -11,10 +11,10 @@
 
 cmake_minimum_required ( VERSION 3.22 )
 
-set ( COLAMD_DATE "Jan 10, 2024" )
+set ( COLAMD_DATE "Jan 20, 2024" )
 set ( COLAMD_VERSION_MAJOR 3 CACHE STRING "" FORCE )
 set ( COLAMD_VERSION_MINOR 3 CACHE STRING "" FORCE )
-set ( COLAMD_VERSION_SUB   1 CACHE STRING "" FORCE )
+set ( COLAMD_VERSION_SUB   2 CACHE STRING "" FORCE )
 
 message ( STATUS "Building COLAMD version: v"
     ${COLAMD_VERSION_MAJOR}.
@@ -43,10 +43,10 @@ include ( SuiteSparsePolicy )
 #-------------------------------------------------------------------------------
 
 if ( NOT SUITESPARSE_ROOT_CMAKELISTS )
-    find_package ( SuiteSparse_config 7.5.0
+    find_package ( SuiteSparse_config 7.6.0
         PATHS ${CMAKE_SOURCE_DIR}/../SuiteSparse_config/build NO_DEFAULT_PATH )
     if ( NOT TARGET SuiteSparse::SuiteSparseConfig )
-        find_package ( SuiteSparse_config 7.5.0 REQUIRED )
+        find_package ( SuiteSparse_config 7.6.0 REQUIRED )
     endif ( )
 endif ( )
 

diff --git a/COLAMD/Config/colamd.h.in b/COLAMD/Config/colamd.h.in
@@ -75,8 +75,8 @@
 
 #define COLAMD__VERSION SUITESPARSE__VERCODE(@COLAMD_VERSION_MAJOR@,@COLAMD_VERSION_MINOR@,@COLAMD_VERSION_SUB@)
 #if !defined (SUITESPARSE__VERSION) || \
-    (SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,5,0))
-#error "COLAMD @COLAMD_VERSION_MAJOR@.@COLAMD_VERSION_MINOR@.@COLAMD_VERSION_SUB@ requires SuiteSparse_config 7.5.0 or later"
+    (SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,6,0))
+#error "COLAMD @COLAMD_VERSION_MAJOR@.@COLAMD_VERSION_MINOR@.@COLAMD_VERSION_SUB@ requires SuiteSparse_config 7.6.0 or later"
 #endif
 
 /* ========================================================================== */

diff --git a/COLAMD/Doc/ChangeLog b/COLAMD/Doc/ChangeLog
@@ -1,3 +1,7 @@
+Jan 20, 2024: version 3.3.2
+
+    * minor updates to build system
+
 Jan 10, 2024: version 3.3.1
 
     * minor updates to build system

diff --git a/COLAMD/Include/colamd.h b/COLAMD/Include/colamd.h
@@ -65,18 +65,18 @@
  * Versions 2.3 and earlier of COLAMD do not include a #define'd version number.
  */
 
-#define COLAMD_DATE "Jan 10, 2024"
+#define COLAMD_DATE "Jan 20, 2024"
 #define COLAMD_MAIN_VERSION   3
 #define COLAMD_SUB_VERSION    3
-#define COLAMD_SUBSUB_VERSION 1
+#define COLAMD_SUBSUB_VERSION 2
 
 #define COLAMD_VERSION_CODE(main,sub) SUITESPARSE_VER_CODE(main,sub)
 #define COLAMD_VERSION COLAMD_VERSION_CODE(3,3)
 
-#define COLAMD__VERSION SUITESPARSE__VERCODE(3,3,1)
+#define COLAMD__VERSION SUITESPARSE__VERCODE(3,3,2)
 #if !defined (SUITESPARSE__VERSION) || \
-    (SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,5,0))
-#error "COLAMD 3.3.1 requires SuiteSparse_config 7.5.0 or later"
+    (SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,6,0))
+#error "COLAMD 3.3.2 requires SuiteSparse_config 7.6.0 or later"
 #endif
 
 /* ========================================================================== */

diff --git a/COLAMD/Makefile b/COLAMD/Makefile
@@ -64,7 +64,7 @@ remake:
 
 # just run cmake to set things up
 setup:
-	( cd build ; cmake $(CMAKE_OPTIONS) .. )
+	( cd build && cmake $(CMAKE_OPTIONS) .. )
 
 install:
 	( cd build && cmake --install . )

diff --git a/ChangeLog b/ChangeLog
@@ -2,31 +2,33 @@ Jan 20, 2024: version 7.6.0
 
     * CHOLMOD 5.2.0: bug fix (restore ABI compatibility with 5.0.x, i.e., 5.2.0
         is ABI incompatible to 5.1.x)
-    * SuiteSparse_config 7.6.0: no change except version number
+    * SuiteSparse_config 7.6.0, Mongoose 3.3.2, COLAMD 3.3.2, CCOLAMD 3.3.2:
+        port Makefile to Windows
     * SPQR 4.3.2: remove unused parameters
     * LAGraph 1.1.2, CSparse 4.3.1, ParU 0.1.2, GraphBLAS 9.0.1:
         minor updates to build system
-    * Example 1.6.2, UMFPACK 6.3.2, KLU 2.3.2: revise version numbers of
-        dependent packages
+    * Example 1.6.2, UMFPACK 6.3.2, KLU 2.3.2, SuiteSparse_Mongoose 3.3.2,
+        SPEX 2.3.2: revise version numbers of dependent packages
+    * AMD, BTF, CAMD, CXSparse, LDL, RBio: unchanged
     * Package versions in this release:
         SuiteSparse_config 7.6.0
         AMD 3.3.1
         BTF 2.3.1
         CAMD 3.3.1
-        CCOLAMD 3.3.1
+        CCOLAMD 3.3.2
         CHOLMOD 5.2.0
-        COLAMD 3.3.1
+        COLAMD 3.3.2
         CSparse 4.3.1
         CXSparse 4.3.1
         Example 1.6.2
         GraphBLAS 9.0.1
         KLU 2.3.2
         LDL 3.3.1
         LAGraph 1.1.2
-        SuiteSparse_Mongoose 3.3.1
+        SuiteSparse_Mongoose 3.3.2
         ParU 0.1.2
         RBio 4.3.1
-        SPEX 2.3.1
+        SPEX 2.3.2
         SPQR 4.3.2
         UMFPACK 6.3.2
 

diff --git a/Example/CMakeLists.txt b/Example/CMakeLists.txt
@@ -91,19 +91,19 @@ find_package ( SuiteSparse_config 7.6.0 REQUIRED )
 find_package ( AMD 3.3.1 REQUIRED )
 find_package ( BTF 2.3.1 REQUIRED )
 find_package ( CAMD 3.3.1 REQUIRED )
-find_package ( CCOLAMD 3.3.1 REQUIRED )
+find_package ( CCOLAMD 3.3.2 REQUIRED )
 find_package ( CHOLMOD 5.2.0 REQUIRED )
-find_package ( COLAMD 3.3.1 REQUIRED )
+find_package ( COLAMD 3.3.2 REQUIRED )
 find_package ( CXSparse 4.3.1 REQUIRED )
 find_package ( GraphBLAS 9.0.1 )
 find_package ( KLU 2.3.2 REQUIRED )
 find_package ( KLU_CHOLMOD 2.3.2 REQUIRED )
 find_package ( LDL 3.3.1 REQUIRED )
 find_package ( LAGraph 1.1.2 )
-find_package ( SuiteSparse_Mongoose 3.3.1 REQUIRED )
+find_package ( SuiteSparse_Mongoose 3.3.2 REQUIRED )
 find_package ( ParU 0.1.2 REQUIRED )
 find_package ( RBio 4.3.1 REQUIRED )
-find_package ( SPEX 2.3.1 REQUIRED )    # requires GMP and MPFR
+find_package ( SPEX 2.3.2 REQUIRED )    # requires GMP and MPFR
 find_package ( SPQR 4.3.2 REQUIRED )
 find_package ( UMFPACK 6.3.2 REQUIRED )
 

diff --git a/Example/Include/my_internal.h b/Example/Include/my_internal.h
@@ -34,8 +34,8 @@
 #endif
 
 #include "ccolamd.h"
-#if !defined (CCOLAMD__VERSION) || CCOLAMD__VERSION < SUITESPARSE__VERCODE(3,3,1)
-#error "This library requires CCOLAMD 3.3.1 or later"
+#if !defined (CCOLAMD__VERSION) || CCOLAMD__VERSION < SUITESPARSE__VERCODE(3,3,2)
+#error "This library requires CCOLAMD 3.3.2 or later"
 #endif
 
 #include "cholmod.h"
@@ -44,8 +44,8 @@
 #endif
 
 #include "colamd.h"
-#if !defined (COLAMD__VERSION) || COLAMD__VERSION < SUITESPARSE__VERCODE(3,3,1)
-#error "This library requires COLAMD 3.3.1 or later"
+#if !defined (COLAMD__VERSION) || COLAMD__VERSION < SUITESPARSE__VERCODE(3,3,2)
+#error "This library requires COLAMD 3.3.2 or later"
 #endif
 
 #include "cs.h"
@@ -103,8 +103,8 @@
     #include "SuiteSparseQR.hpp"
 
     #include "Mongoose.hpp"
-    #if !defined (Mongoose__VERSION) || Mongoose__VERSION < SUITESPARSE__VERCODE(3,3,1)
-    #error "This library requires Mongoose 3.3.1 or later"
+    #if !defined (Mongoose__VERSION) || Mongoose__VERSION < SUITESPARSE__VERCODE(3,3,2)
+    #error "This library requires Mongoose 3.3.2 or later"
     #endif
 
 #endif

diff --git a/GraphBLAS/GraphBLAS/Makefile b/GraphBLAS/GraphBLAS/Makefile
@@ -44,7 +44,7 @@ remake:
 
 # just run cmake; do not compile
 setup:
-	( cd build ; cmake $(CMAKE_OPTIONS) .. ; )
+	( cd build && cmake $(CMAKE_OPTIONS) .. ; )
 
 # installs GraphBLAS to the install location defined by cmake, usually
 # /usr/local/lib and /usr/local/include

diff --git a/GraphBLAS/cpu_features/Makefile b/GraphBLAS/cpu_features/Makefile
@@ -9,7 +9,7 @@ go:
 distclean: purge
 
 install:
-	( cd build ; make install )
+	( cd build && make install )
 
 purge:
 	- rm -rf ./build/*
diff --git a/KLU/CMakeLists.txt b/KLU/CMakeLists.txt
@@ -55,16 +55,16 @@ if ( NOT SUITESPARSE_ROOT_CMAKELISTS )
         find_package ( AMD 3.3.1 REQUIRED )
     endif ( )
 
-    find_package ( COLAMD 3.3.1
+    find_package ( COLAMD 3.3.2
         PATHS ${CMAKE_SOURCE_DIR}/../COLAMD/build NO_DEFAULT_PATH )
     if ( NOT TARGET SuiteSparse::COLAMD )
-        find_package ( COLAMD 3.3.1 REQUIRED )
+        find_package ( COLAMD 3.3.2 REQUIRED )
     endif ( )
 
-    find_package ( BTF 2.3.0
+    find_package ( BTF 2.3.1
         PATHS ${CMAKE_SOURCE_DIR}/../BTF/build NO_DEFAULT_PATH )
     if ( NOT TARGET SuiteSparse::BTF )
-        find_package ( BTF 2.3.0 REQUIRED )
+        find_package ( BTF 2.3.1 REQUIRED )
     endif ( )
 endif ( )
 

diff --git a/KLU/Config/klu.h.in b/KLU/Config/klu.h.in
@@ -843,8 +843,8 @@ void klu_version (int version [3]) ;
 #endif
 
 #if !defined (COLAMD__VERSION) || \
-    (COLAMD__VERSION < SUITESPARSE__VERCODE(3,3,1))
-#error "KLU @KLU_VERSION_MAJOR@.@KLU_VERSION_MINOR@.@KLU_VERSION_SUB@ requires COLAMD 3.3.1 or later"
+    (COLAMD__VERSION < SUITESPARSE__VERCODE(3,3,2))
+#error "KLU @KLU_VERSION_MAJOR@.@KLU_VERSION_MINOR@.@KLU_VERSION_SUB@ requires COLAMD 3.3.2 or later"
 #endif
 
 #if !defined (BTF__VERSION) || \

diff --git a/KLU/Include/klu.h b/KLU/Include/klu.h
@@ -843,8 +843,8 @@ void klu_version (int version [3]) ;
 #endif
 
 #if !defined (COLAMD__VERSION) || \
-    (COLAMD__VERSION < SUITESPARSE__VERCODE(3,3,1))
-#error "KLU 2.3.2 requires COLAMD 3.3.1 or later"
+    (COLAMD__VERSION < SUITESPARSE__VERCODE(3,3,2))
+#error "KLU 2.3.2 requires COLAMD 3.3.2 or later"
 #endif
 
 #if !defined (BTF__VERSION) || \

diff --git a/LAGraph/Makefile b/LAGraph/Makefile
@@ -85,10 +85,10 @@ remake:
 
 # just run cmake to set things up
 setup:
-	( cd build ; cmake $(CMAKE_OPTIONS) .. )
+	( cd build && cmake $(CMAKE_OPTIONS) .. )
 
 install:
-	( cd build ; cmake --install . )
+	( cd build && cmake --install . )
 
 # remove any installed libraries and #include files
 uninstall: