AMD 3.3.0: version update

DrTimothyAldenDavis · Nov 28, 2023 · 4d84a84 · 4d84a84
1 parent 9982abf
commit 4d84a84
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 91 deletions.
diff --git a/AMD/CMakeLists.txt b/AMD/CMakeLists.txt
@@ -12,10 +12,10 @@
 
 cmake_minimum_required ( VERSION 3.20 )
 
-set ( AMD_DATE "Nov 30, 2023" )
+set ( AMD_DATE "Dec 30, 2023" )
 set ( AMD_VERSION_MAJOR 3 CACHE STRING "" FORCE )
-set ( AMD_VERSION_MINOR 2 CACHE STRING "" FORCE )
-set ( AMD_VERSION_SUB   2 CACHE STRING "" FORCE )
+set ( AMD_VERSION_MINOR 3 CACHE STRING "" FORCE )
+set ( AMD_VERSION_SUB   0 CACHE STRING "" FORCE )
 
 message ( STATUS "Building AMD version: v"
     ${AMD_VERSION_MAJOR}.

diff --git a/AMD/Demo/amd_demo.out b/AMD/Demo/amd_demo.out
@@ -1,7 +1,7 @@
-AMD version 3.2.2, date: Nov 30, 2023
+AMD version 3.3.0, date: Dec 30, 2023
 AMD demo, with the 24-by-24 Harwell/Boeing matrix, can_24:
 
-AMD version 3.2.2, Nov 30, 2023: approximate minimum degree ordering
+AMD version 3.3.0, Dec 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.2, Nov 30, 2023, results:
+AMD version 3.3.0, Dec 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.2, Nov 30, 2023: approximate minimum degree ordering
+AMD version 3.3.0, Dec 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.2, Nov 30, 2023, results:
+AMD version 3.3.0, Dec 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.2, date: Nov 30, 2023
+AMD version 3.3.0, date: Dec 30, 2023
 AMD demo, with the 24-by-24 Harwell/Boeing matrix, can_24:
 
-AMD version 3.2.2, Nov 30, 2023: approximate minimum degree ordering
+AMD version 3.3.0, Dec 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.2, Nov 30, 2023, results:
+AMD version 3.3.0, Dec 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/AMD_UserGuide.tex b/AMD/Doc/AMD_UserGuide.tex
@@ -46,7 +46,7 @@
 \end{abstract}
 %------------------------------------------------------------------------------
 
-AMD Copyright\copyright 1996-2022 by Timothy A.
+AMD Copyright\copyright 1996-2023 by Timothy A.
 Davis, Patrick R. Amestoy, and Iain S. Duff.  All Rights Reserved.
 AMD is available under alternate licences; contact T. Davis for details.
 

diff --git a/AMD/Doc/ChangeLog b/AMD/Doc/ChangeLog
@@ -1,5 +1,6 @@
-Nov 30, 2023: version 3.2.2
+Dec 30, 2023: version 3.3.0
 
+    * major change to build system: by Markus Mützel
     * revised test for integer overflow: for CHOLMOD 5.1.0 tests
 
 Sept 18, 2023: version 3.2.1

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.2, Nov 30, 2023}
+\date{VERSION 3.3.0, Dec 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 "Nov 30, 2023"
+#define AMD_DATE "Dec 30, 2023"
 #define AMD_MAIN_VERSION   3
-#define AMD_SUB_VERSION    2
-#define AMD_SUBSUB_VERSION 2
+#define AMD_SUB_VERSION    3
+#define AMD_SUBSUB_VERSION 0
 
 #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/Include/amd_internal.h b/AMD/Include/amd_internal.h
@@ -37,12 +37,9 @@
 #define NDEBUG
 #endif
 
-/*
-    To enable debugging, uncomment the following line:
-#undef NDEBUG
-*/
+// To enable debugging, uncomment the following line:
+// #undef NDEBUG
 
-#define SUITESPARSE_LIBRARY
 #include "amd.h"
 
 /* ------------------------------------------------------------------------- */

diff --git a/GraphBLAS/GraphBLAS/Config/GB_config.h b/GraphBLAS/GraphBLAS/Config/GB_config.h