CAMD 3.3.0: version update

DrTimothyAldenDavis · Nov 28, 2023 · 27d59c5 · 27d59c5
1 parent 4d84a84
commit 27d59c5
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 18 deletions.
diff --git a/CAMD/CMakeLists.txt b/CAMD/CMakeLists.txt
@@ -11,10 +11,10 @@
 
 cmake_minimum_required ( VERSION 3.20 )
 
-set ( CAMD_DATE "Nov 30, 2023" )
+set ( CAMD_DATE "Dec 30, 2023" )
 set ( CAMD_VERSION_MAJOR 3 CACHE STRING "" FORCE )
-set ( CAMD_VERSION_MINOR 2 CACHE STRING "" FORCE )
-set ( CAMD_VERSION_SUB   2 CACHE STRING "" FORCE )
+set ( CAMD_VERSION_MINOR 3 CACHE STRING "" FORCE )
+set ( CAMD_VERSION_SUB   0 CACHE STRING "" FORCE )
 
 message ( STATUS "Building CAMD version: v"
     ${CAMD_VERSION_MAJOR}.

diff --git a/CAMD/Demo/camd_demo.out b/CAMD/Demo/camd_demo.out
@@ -1,7 +1,7 @@
-CAMD version 3.2, date: Nov 30, 2023
+CAMD version 3.3, date: Dec 30, 2023
 CAMD demo, with the 24-by-24 Harwell/Boeing matrix, can_24:
 
-camd version 3.2.2, Nov 30, 2023:  approximate minimum degree ordering:
+camd 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 camd_order: 0 (should be 0)
 
-CAMD version 3.2.2, Nov 30, 2023, results:
+CAMD 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/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.2, Nov 30, 2023:  approximate minimum degree ordering:
+camd 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 camd_order:
 23:  . . . . . . X . . . . X X . . . . . . . . . . X
 return value from camd_order: 1 (should be 1)
 
-CAMD version 3.2.2, Nov 30, 2023, results:
+CAMD 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/CAMD/Demo/camd_l_demo.out b/CAMD/Demo/camd_l_demo.out
@@ -1,7 +1,7 @@
-CAMD version 3.2, date: Nov 30, 2023
+CAMD version 3.3, date: Dec 30, 2023
 CAMD demo, with the 24-by-24 Harwell/Boeing matrix, can_24:
 
-camd version 3.2.2, Nov 30, 2023:  approximate minimum degree ordering:
+camd 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 camd_l_order: 0 (should be 0)
 
-CAMD version 3.2.2, Nov 30, 2023, results:
+CAMD 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/CAMD/Doc/CAMD_UserGuide.pdf b/CAMD/Doc/CAMD_UserGuide.pdf
diff --git a/CAMD/Doc/CAMD_UserGuide.tex b/CAMD/Doc/CAMD_UserGuide.tex
@@ -47,7 +47,7 @@
 \end{abstract}
 %------------------------------------------------------------------------------
 
-CAMD, Copyright\copyright 2007-2022, Timothy A. Davis, Yanqing Chen, Patrick R.
+CAMD, Copyright\copyright 2007-2023, Timothy A. Davis, Yanqing Chen, Patrick R.
 Amestoy, and Iain S. Duff.  All Rights Reserved.
 
 SPDX-License-Identifier: BSD-3-clause

diff --git a/CAMD/Doc/ChangeLog b/CAMD/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/CAMD/Doc/camd_version.tex b/CAMD/Doc/camd_version.tex
@@ -1,2 +1,2 @@
 % version of SuiteSparse/CAMD
-\date{VERSION 3.2.2, Nov 30, 2023}
+\date{VERSION 3.3.0, Dec 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 "Nov 30, 2023"
+#define CAMD_DATE "Dec 30, 2023"
 #define CAMD_MAIN_VERSION   3
-#define CAMD_SUB_VERSION    2
-#define CAMD_SUBSUB_VERSION 2
+#define CAMD_SUB_VERSION    3
+#define CAMD_SUBSUB_VERSION 0
 
 #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/Include/camd_internal.h b/CAMD/Include/camd_internal.h
@@ -115,7 +115,6 @@
 /* integer type for CAMD: int32_t or int64_t */
 /* ------------------------------------------------------------------------- */
 
-#define SUITESPARSE_LIBRARY
 #include "camd.h"
 
 #if defined (DLONG) || defined (ZLONG)