DrTimothyAldenDavis · DrTimothyAldenDavis · Nov 25, 2023 · Nov 6, 2023 · Nov 7, 2023 · Nov 7, 2023
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/AMD/Source/amd_order.c b/AMD/Source/amd_order.c
@@ -71,9 +71,9 @@ int AMD_order
 	return (AMD_INVALID) ;
     }
 
-    /* check if n or nz will cause size_t overflow */
-    if (((size_t) n) >= SIZE_T_MAX / sizeof (Int)
-     || ((size_t) nz) >= SIZE_T_MAX / sizeof (Int))
+    /* check if n or nz will cause integer overflow */
+    if (((size_t) n) >= Int_MAX / sizeof (Int)
+     || ((size_t) nz) >= Int_MAX / sizeof (Int))
     {
 	if (info) Info [AMD_STATUS] = AMD_OUT_OF_MEMORY ;
 	return (AMD_OUT_OF_MEMORY) ;	    /* problem too large */

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/CAMD/Source/camd_order.c b/CAMD/Source/camd_order.c
@@ -72,9 +72,9 @@ int CAMD_order
 	return (CAMD_INVALID) ;
     }
 
-    /* check if n or nz will cause size_t overflow */
-    if ((size_t) n >= SIZE_T_MAX / sizeof (Int)
-     || (size_t) nz >= SIZE_T_MAX / sizeof (Int))
+    /* check if n or nz will cause integer overflow */
+    if (((size_t) n) >= Int_MAX / sizeof (Int)
+     || ((size_t) nz) >= Int_MAX / sizeof (Int))
     {
 	if (info) Info [CAMD_STATUS] = CAMD_OUT_OF_MEMORY ;
 	return (CAMD_OUT_OF_MEMORY) ;	    /* problem too large */