Merge pull request #528 from DrTimothyAldenDavis/singledev2

CHOLMOD 5.1.0, more updates
DrTimothyAldenDavis · Nov 25, 2023 · cd38ed0 · cd38ed0
2 parents 8852718 + c3e9f40
commit cd38ed0
Show file tree

Hide file tree

Showing 29 changed files with 216 additions and 63 deletions.
diff --git a/AMD/CMakeLists.txt b/AMD/CMakeLists.txt
@@ -2,7 +2,7 @@
 # SuiteSparse/AMD/CMakeLists.txt:  cmake for AMD
 #-------------------------------------------------------------------------------
 
-# Copyright (c) 1996-2022, Timothy A. Davis, Patrick Amestoy, Iain Duff.
+# Copyright (c) 1996-2023, Timothy A. Davis, Patrick Amestoy, Iain Duff.
 # All Rights Reserved.
 # SPDX-License-Identifier: BSD-3-clause
 
@@ -12,10 +12,10 @@
 
 cmake_minimum_required ( VERSION 3.20 )
 
-set ( AMD_DATE "Sept 18, 2023" )
+set ( AMD_DATE "Nov 30, 2023" )
 set ( AMD_VERSION_MAJOR 3 )
 set ( AMD_VERSION_MINOR 2 )
-set ( AMD_VERSION_SUB   1 )
+set ( AMD_VERSION_SUB   2 )
 
 message ( STATUS "Building AMD version: v"
     ${AMD_VERSION_MAJOR}.
@@ -56,10 +56,10 @@ endif ( )
 # find library dependencies
 #-------------------------------------------------------------------------------
 
-find_package ( SuiteSparse_config 7.2.0
+find_package ( SuiteSparse_config 7.4.0
     PATHS ${CMAKE_SOURCE_DIR}/../SuiteSparse_config/build NO_DEFAULT_PATH )
 if ( NOT TARGET SuiteSparse::SuiteSparseConfig )
-    find_package ( SuiteSparse_config 7.2.0 REQUIRED )
+    find_package ( SuiteSparse_config 7.4.0 REQUIRED )
 endif ( )
 
 #-------------------------------------------------------------------------------

diff --git a/AMD/Demo/amd_demo.out b/AMD/Demo/amd_demo.out
@@ -1,7 +1,7 @@
-AMD version 3.2.1, date: Sept 18, 2023
+AMD version 3.2.2, date: Nov 30, 2023
 AMD demo, with the 24-by-24 Harwell/Boeing matrix, can_24:
 
-AMD version 3.2.1, Sept 18, 2023: approximate minimum degree ordering
+AMD version 3.2.2, Nov 30, 2023: approximate minimum degree ordering
     dense row parameter: 10
     (rows with more than max (10 * sqrt (n), 16) entries are
     considered "dense", and placed last in output permutation)
@@ -115,7 +115,7 @@ Plot of input matrix pattern:
 23:  . . . . . . X . . . . X X . . . . . . . . . . X
 return value from amd_order: 0 (should be 0)
 
-AMD version 3.2.1, Sept 18, 2023, results:
+AMD version 3.2.2, Nov 30, 2023, results:
     status: OK
     n, dimension of A:                                  24
     nz, number of nonzeros in A:                        160

diff --git a/AMD/Demo/amd_demo2.out b/AMD/Demo/amd_demo2.out
@@ -1,7 +1,7 @@
 AMD demo, with a jumbled version of the 24-by-24
 Harwell/Boeing matrix, can_24:
 
-AMD version 3.2.1, Sept 18, 2023: approximate minimum degree ordering
+AMD version 3.2.2, Nov 30, 2023: approximate minimum degree ordering
     dense row parameter: 10
     (rows with more than max (10 * sqrt (n), 16) entries are
     considered "dense", and placed last in output permutation)
@@ -144,7 +144,7 @@ Plot of symmetric matrix to be ordered by amd_order:
 23:  . . . . . . X . . . . X X . . . . . . . . . . X
 return value from amd_order: 1 (should be 1)
 
-AMD version 3.2.1, Sept 18, 2023, results:
+AMD version 3.2.2, Nov 30, 2023, results:
     status: OK, but jumbled
     n, dimension of A:                                  24
     nz, number of nonzeros in A:                        102

diff --git a/AMD/Demo/amd_l_demo.out b/AMD/Demo/amd_l_demo.out
@@ -1,7 +1,7 @@
-AMD version 3.2.1, date: Sept 18, 2023
+AMD version 3.2.2, date: Nov 30, 2023
 AMD demo, with the 24-by-24 Harwell/Boeing matrix, can_24:
 
-AMD version 3.2.1, Sept 18, 2023: approximate minimum degree ordering
+AMD version 3.2.2, Nov 30, 2023: approximate minimum degree ordering
     dense row parameter: 10
     (rows with more than max (10 * sqrt (n), 16) entries are
     considered "dense", and placed last in output permutation)
@@ -115,7 +115,7 @@ Plot of input matrix pattern:
 23:  . . . . . . X . . . . X X . . . . . . . . . . X
 return value from amd_l_order: 0 (should be 0)
 
-AMD version 3.2.1, Sept 18, 2023, results:
+AMD version 3.2.2, Nov 30, 2023, results:
     status: OK
     n, dimension of A:                                  24
     nz, number of nonzeros in A:                        160

diff --git a/AMD/Doc/AMD_UserGuide.pdf b/AMD/Doc/AMD_UserGuide.pdf
diff --git a/AMD/Doc/ChangeLog b/AMD/Doc/ChangeLog
@@ -1,3 +1,7 @@
+Nov 30, 2023: version 3.2.2
+
+    * revised test for integer overflow: for CHOLMOD 5.1.0 tests
+
 Sept 18, 2023: version 3.2.1
 
     * cmake update: add "None" build type, from Antonio Rojas, for Arch Linux

diff --git a/AMD/Doc/amd_version.tex b/AMD/Doc/amd_version.tex
@@ -1,2 +1,2 @@
 % version of SuiteSparse/AMD
-\date{VERSION 3.2.1, Sept 18, 2023}
+\date{VERSION 3.2.2, Nov 30, 2023}
diff --git a/AMD/Include/amd.h b/AMD/Include/amd.h
@@ -374,10 +374,10 @@ void amd_l_info     (double Info [ ]) ;
  * Versions 1.1 and earlier of AMD do not include a #define'd version number.
  */
 
-#define AMD_DATE "Sept 18, 2023"
+#define AMD_DATE "Nov 30, 2023"
 #define AMD_MAIN_VERSION   3
 #define AMD_SUB_VERSION    2
-#define AMD_SUBSUB_VERSION 1
+#define AMD_SUBSUB_VERSION 2
 
 #define AMD_VERSION_CODE(main,sub) ((main) * 1000 + (sub))
 #define AMD_VERSION AMD_VERSION_CODE(AMD_MAIN_VERSION,AMD_SUB_VERSION)

diff --git a/CAMD/CMakeLists.txt b/CAMD/CMakeLists.txt
@@ -11,10 +11,10 @@
 
 cmake_minimum_required ( VERSION 3.20 )
 
-set ( CAMD_DATE "Sept 18, 2023" )
+set ( CAMD_DATE "Nov 30, 2023" )
 set ( CAMD_VERSION_MAJOR 3 )
 set ( CAMD_VERSION_MINOR 2 )
-set ( CAMD_VERSION_SUB   1 )
+set ( CAMD_VERSION_SUB   2 )
 
 message ( STATUS "Building CAMD version: v"
     ${CAMD_VERSION_MAJOR}.
@@ -42,10 +42,10 @@ project ( camd
 # find library dependencies
 #-------------------------------------------------------------------------------
 
-find_package ( SuiteSparse_config 7.2.0
+find_package ( SuiteSparse_config 7.4.0
     PATHS ${CMAKE_SOURCE_DIR}/../SuiteSparse_config/build NO_DEFAULT_PATH )
 if ( NOT TARGET SuiteSparse::SuiteSparseConfig )
-    find_package ( SuiteSparse_config 7.2.0 REQUIRED )
+    find_package ( SuiteSparse_config 7.4.0 REQUIRED )
 endif ( )
 
 #-------------------------------------------------------------------------------

diff --git a/CAMD/Demo/camd_demo.out b/CAMD/Demo/camd_demo.out
@@ -1,7 +1,7 @@
-CAMD version 3.2, date: Sept 18, 2023
+CAMD version 3.2, date: Nov 30, 2023
 CAMD demo, with the 24-by-24 Harwell/Boeing matrix, can_24:
 
-camd version 3.2.1, Sept 18, 2023:  approximate minimum degree ordering:
+camd version 3.2.2, Nov 30, 2023:  approximate minimum degree ordering:
     dense row parameter: 10
     (rows with more than max (10 * sqrt (n), 16) entries are
     considered "dense", and placed last in output permutation)
@@ -115,7 +115,7 @@ Plot of input matrix pattern:
 23:  . . . . . . X . . . . X X . . . . . . . . . . X
 return value from camd_order: 0 (should be 0)
 
-CAMD version 3.2.1, Sept 18, 2023, results:
+CAMD version 3.2.2, Nov 30, 2023, results:
     status: OK
     n, dimension of A:                                  24
     nz, number of nonzeros in A:                        160

diff --git a/CAMD/Demo/camd_demo2.out b/CAMD/Demo/camd_demo2.out
@@ -1,7 +1,7 @@
 CAMD demo, with a jumbled version of the 24-by-24
 Harwell/Boeing matrix, can_24:
 
-camd version 3.2.1, Sept 18, 2023:  approximate minimum degree ordering:
+camd version 3.2.2, Nov 30, 2023:  approximate minimum degree ordering:
     dense row parameter: 10
     (rows with more than max (10 * sqrt (n), 16) entries are
     considered "dense", and placed last in output permutation)
@@ -144,7 +144,7 @@ Plot of symmetric matrix to be ordered by camd_order:
 23:  . . . . . . X . . . . X X . . . . . . . . . . X
 return value from camd_order: 1 (should be 1)
 
-CAMD version 3.2.1, Sept 18, 2023, results:
+CAMD version 3.2.2, Nov 30, 2023, results:
     status: OK, but jumbled
     n, dimension of A:                                  24
     nz, number of nonzeros in A:                        102

diff --git a/CAMD/Demo/camd_l_demo.out b/CAMD/Demo/camd_l_demo.out
@@ -1,7 +1,7 @@
-CAMD version 3.2, date: Sept 18, 2023
+CAMD version 3.2, date: Nov 30, 2023
 CAMD demo, with the 24-by-24 Harwell/Boeing matrix, can_24:
 
-camd version 3.2.1, Sept 18, 2023:  approximate minimum degree ordering:
+camd version 3.2.2, Nov 30, 2023:  approximate minimum degree ordering:
     dense row parameter: 10
     (rows with more than max (10 * sqrt (n), 16) entries are
     considered "dense", and placed last in output permutation)
@@ -115,7 +115,7 @@ Plot of input matrix pattern:
 23:  . . . . . . X . . . . X X . . . . . . . . . . X
 return value from camd_l_order: 0 (should be 0)
 
-CAMD version 3.2.1, Sept 18, 2023, results:
+CAMD version 3.2.2, Nov 30, 2023, results:
     status: OK
     n, dimension of A:                                  24
     nz, number of nonzeros in A:                        160

diff --git a/CAMD/Doc/CAMD_UserGuide.pdf b/CAMD/Doc/CAMD_UserGuide.pdf
diff --git a/CAMD/Doc/ChangeLog b/CAMD/Doc/ChangeLog
@@ -1,3 +1,7 @@
+Nov 30, 2023: version 3.2.2
+
+    * revised test for integer overflow: for CHOLMOD 5.1.0 tests
+
 Sept 18, 2023: version 3.2.1
 
     * cmake update: add "None" build type, from Antonio Rojas, for Arch Linux

diff --git a/CAMD/Doc/camd_version.tex b/CAMD/Doc/camd_version.tex
@@ -1,2 +1,2 @@
 % version of SuiteSparse/CAMD
-\date{VERSION 3.2.1, Sept 18, 2023}
+\date{VERSION 3.2.2, Nov 30, 2023}
diff --git a/CAMD/Include/camd.h b/CAMD/Include/camd.h
@@ -384,10 +384,10 @@ void camd_l_info     (double Info [ ]) ;
  *      #endif
  */
 
-#define CAMD_DATE "Sept 18, 2023"
+#define CAMD_DATE "Nov 30, 2023"
 #define CAMD_MAIN_VERSION   3
 #define CAMD_SUB_VERSION    2
-#define CAMD_SUBSUB_VERSION 1
+#define CAMD_SUBSUB_VERSION 2
 
 #define CAMD_VERSION_CODE(main,sub) ((main) * 1000 + (sub))
 #define CAMD_VERSION CAMD_VERSION_CODE(CAMD_MAIN_VERSION,CAMD_SUB_VERSION)

diff --git a/CHOLMOD/CMakeLists.txt b/CHOLMOD/CMakeLists.txt
@@ -90,10 +90,10 @@ if ( NOT TARGET SuiteSparse::COLAMD )
     find_package ( COLAMD 3.2.1 REQUIRED )
 endif ( )
 
-find_package ( AMD 3.2.1
+find_package ( AMD 3.2.2
     PATHS ${CMAKE_SOURCE_DIR}/../AMD/build NO_DEFAULT_PATH )
 if ( NOT TARGET SuiteSparse::AMD )
-    find_package ( AMD 3.2.1 REQUIRED )
+    find_package ( AMD 3.2.2 REQUIRED )
 endif ( )
 
 #-------------------------------------------------------------------------------
@@ -196,10 +196,10 @@ endif ( )
 
     if ( NOT NCAMD )
         # find CAMD and CCOLAMD
-        find_package ( CAMD 3.2.1
+        find_package ( CAMD 3.2.2
             PATHS ${CMAKE_SOURCE_DIR}/../CAMD/build NO_DEFAULT_PATH )
         if ( NOT TARGET SuiteSparse::CAMD )
-            find_package ( CAMD 3.2.1 )
+            find_package ( CAMD 3.2.2 )
         endif ( )
 
         find_package ( CCOLAMD 3.2.1

diff --git a/CHOLMOD/Config/cholmod.h.in b/CHOLMOD/Config/cholmod.h.in
@@ -1609,7 +1609,7 @@ int cholmod_change_factor
                         // L->dtype remains unchanged.
     int to_ll,          // if true: convert to LL'; else to LDL'
     int to_super,       // if true: convert to supernodal; else to simplicial
-    int to_packed,      // if true: pack simplicial columns' else: do not pack
+    int to_packed,      // if true: pack simplicial columns; else: do not pack
     int to_monotonic,   // if true, put simplicial columns in order
     // input/output:
     cholmod_factor *L,  // factor to change.

diff --git a/CHOLMOD/Doc/CHOLMOD_UserGuide.pdf b/CHOLMOD/Doc/CHOLMOD_UserGuide.pdf