Merge pull request #442 from DrTimothyAldenDavis/dev

v7.2.2
DrTimothyAldenDavis · Oct 16, 2023 · 0bdc2fa · 0bdc2fa
2 parents d6c84f7 + f98e0f5
commit 0bdc2fa
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 28 deletions.
diff --git a/CHOLMOD/CMakeLists.txt b/CHOLMOD/CMakeLists.txt
@@ -12,10 +12,10 @@
 # cmake 3.22 is required to find the BLAS/LAPACK
 cmake_minimum_required ( VERSION 3.22 )
 
-set ( CHOLMOD_DATE "Sept 18, 2023" )
+set ( CHOLMOD_DATE "Oct 15, 2023" )
 set ( CHOLMOD_VERSION_MAJOR 4 )
 set ( CHOLMOD_VERSION_MINOR 2 )
-set ( CHOLMOD_VERSION_SUB   1 )
+set ( CHOLMOD_VERSION_SUB   2 )
 
 message ( STATUS "Building CHOLMOD version: v"
     ${CHOLMOD_VERSION_MAJOR}.

diff --git a/CHOLMOD/Doc/CHOLMOD_UserGuide.pdf b/CHOLMOD/Doc/CHOLMOD_UserGuide.pdf
diff --git a/CHOLMOD/Doc/ChangeLog b/CHOLMOD/Doc/ChangeLog
@@ -1,3 +1,7 @@
+Oct 16, 2023: version 4.2.2
+
+    * bug fix: incorrect computation of work for nthreads in CHOLMOD/Supernodal
+
 Sept 18, 2023: version 4.2.1
 
     * cmake update: add "None" build type, from Antonio Rojas, for Arch Linux

diff --git a/CHOLMOD/Doc/cholmod_version.tex b/CHOLMOD/Doc/cholmod_version.tex
@@ -1,2 +1,2 @@
 % version of SuiteSparse/CHOLMOD
-\date{VERSION 4.2.1, Sept 18, 2023}
+\date{VERSION 4.2.2, Oct 15, 2023}
diff --git a/CHOLMOD/Include/cholmod.h b/CHOLMOD/Include/cholmod.h
@@ -97,10 +97,10 @@
 #ifndef CHOLMOD_H
 #define CHOLMOD_H
 
-#define CHOLMOD_DATE "Sept 18, 2023"
+#define CHOLMOD_DATE "Oct 15, 2023"
 #define CHOLMOD_MAIN_VERSION   4
 #define CHOLMOD_SUB_VERSION    2
-#define CHOLMOD_SUBSUB_VERSION 1
+#define CHOLMOD_SUBSUB_VERSION 2
 
 /* ========================================================================== */
 /* === Include/cholmod_io64 ================================================= */

diff --git a/CHOLMOD/Supernodal/t_cholmod_super_numeric.c b/CHOLMOD/Supernodal/t_cholmod_super_numeric.c
@@ -372,13 +372,13 @@ static int TEMPLATE (cholmod_super_numeric)
         if (stype != 0)
         {
             Int pfirst = Ap [k1] ;
-            Int plast = (Apacked) ? (Ap [k2+1]) : (pfirst + Anz [k2]) ;
+            Int plast = (Apacked) ? (Ap [k2]) : (pfirst + Anz [k2-1]) ;
             work = (double) (plast - pfirst) ;
         }
         else
         {
             Int pfirst = Fp [k1] ;
-            Int plast  = (Fpacked) ? (Fp [k2+1]) : (pfirst + Fnz [k2]) ;
+            Int plast  = (Fpacked) ? (Fp [k2]) : (pfirst + Fnz [k2-1]) ;
             work = (double) (plast - pfirst) ;
         }
         nthreads = cholmod_nthreads (work, Common) ;

diff --git a/Example/CMakeLists.txt b/Example/CMakeLists.txt
@@ -12,10 +12,10 @@
 cmake_minimum_required ( VERSION 3.20 )
 
 # cmake inserts the date and version number into Include/my.h:
-set ( MY_DATE "Sept 18, 2023" )
+set ( MY_DATE "Oct 16, 2023" )
 set ( MY_VERSION_MAJOR 1 )
 set ( MY_VERSION_MINOR 4 )
-set ( MY_VERSION_PATCH 1 )
+set ( MY_VERSION_PATCH 2 )
 
 message ( STATUS "Building MY library version: v"
     ${MY_VERSION_MAJOR}.
@@ -61,13 +61,13 @@ project ( my
 #-------------------------------------------------------------------------------
 
 # look for all SuiteSparse packages:
-find_package ( SuiteSparse_config 7.2.1 REQUIRED )
+find_package ( SuiteSparse_config 7.2.2 REQUIRED )
 find_package ( AMD 3.2.1 REQUIRED )
 find_package ( BTF 2.2.1 REQUIRED )
 find_package ( CAMD 3.2.1 REQUIRED )
 find_package ( CCOLAMD 3.2.1 REQUIRED )
 find_package ( COLAMD 3.2.1 REQUIRED )
-find_package ( CHOLMOD 4.2.1 REQUIRED )
+find_package ( CHOLMOD 4.2.2 REQUIRED )
 find_package ( CXSparse 4.2.1 REQUIRED )
 find_package ( GraphBLAS 8.2.1 )
 find_package ( KLU 2.2.1 REQUIRED )
@@ -81,10 +81,8 @@ find_package ( UMFPACK 6.2.1 REQUIRED )
 
 if ( TARGET CUDA::nvrtc )
     # CHOLMOD and SPQR have been compiled with CUDA enabled.
-#   find_package ( CHOLMOD_CUDA 4.2.0 REQUIRED )
-#   find_package ( SPQR_CUDA 4.2.0 REQUIRED )
-    find_package ( SuiteSparse_GPURuntime 3.2.0 REQUIRED )
-    find_package ( GPUQREngine 3.2.0 REQUIRED )
+    find_package ( SuiteSparse_GPURuntime 3.2.1 REQUIRED )
+    find_package ( GPUQREngine 3.2.1 REQUIRED )
 endif ( )
 
 # look for all external libaries:

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 SuiteSparse:  A Suite of Sparse matrix packages at http://suitesparse.com
 -----------------------------------------------------------------------------
 
-Oct 7, 2023, SuiteSparse VERSION 7.2.1
+Oct 15, 2023, SuiteSparse VERSION 7.2.2
 
 SuiteSparse is a set of sparse-matrix-related packages written or co-authored
 by Tim Davis, available at https://github.com/DrTimothyAldenDavis/SuiteSparse .
@@ -81,10 +81,9 @@ papers in ACM TOMS, for each package.
 
     * for GraphBLAS, and `C=A*B` in MATLAB (sparse-times-sparse):
 
-        T. Davis, Algorithm 10xx: SuiteSparse:GraphBLAS: parallel graph
-        algorithms in the language of sparse linear algebra, ACM Trans on
-        Mathematical Software, just accepted, 2023.  See the pdf in
-        https://github.com/DrTimothyAldenDavis/GraphBLAS/tree/stable/Doc .
+        T. A. Davis. Algorithm 1037: SuiteSparse:GraphBLAS: Parallel Graph
+        Algorithms in the Language of Sparse Linear Algebra. ACM Trans. Math.
+        Softw. 49, 3, Article 28 (September 2023), 30 pages.
         https://doi.org/10.1145/3577195
 
         T. Davis, Algorithm 1000: SuiteSparse:GraphBLAS: graph algorithms in

diff --git a/SuiteSparse_config/CMakeLists.txt b/SuiteSparse_config/CMakeLists.txt
@@ -14,10 +14,10 @@
 cmake_minimum_required ( VERSION 3.22 )
 
 # version of both SuiteSparse and SuiteSparse_config
-set ( SUITESPARSE_DATE "Oct 7, 2023" )
+set ( SUITESPARSE_DATE "Oct 15, 2023" )
 set ( SUITESPARSE_VERSION_MAJOR 7 )
 set ( SUITESPARSE_VERSION_MINOR 2 )
-set ( SUITESPARSE_VERSION_SUB   1 )
+set ( SUITESPARSE_VERSION_SUB   2 )
 
 message ( STATUS "Building SuiteSparse_config version: v"
     ${SUITESPARSE_VERSION_MAJOR}.

diff --git a/SuiteSparse_config/Config/README.md.in b/SuiteSparse_config/Config/README.md.in
@@ -81,10 +81,9 @@ papers in ACM TOMS, for each package.
 
     * for GraphBLAS, and `C=A*B` in MATLAB (sparse-times-sparse):
 
-        T. Davis, Algorithm 10xx: SuiteSparse:GraphBLAS: parallel graph
-        algorithms in the language of sparse linear algebra, ACM Trans on
-        Mathematical Software, just accepted, 2023.  See the pdf in
-        https://github.com/DrTimothyAldenDavis/GraphBLAS/tree/stable/Doc .
+        T. A. Davis. Algorithm 1037: SuiteSparse:GraphBLAS: Parallel Graph
+        Algorithms in the Language of Sparse Linear Algebra. ACM Trans. Math.
+        Softw. 49, 3, Article 28 (September 2023), 30 pages.
         https://doi.org/10.1145/3577195
 
         T. Davis, Algorithm 1000: SuiteSparse:GraphBLAS: graph algorithms in

diff --git a/SuiteSparse_config/SuiteSparse_config.h b/SuiteSparse_config/SuiteSparse_config.h
@@ -409,10 +409,10 @@ int SuiteSparse_version     // returns SUITESPARSE_VERSION
 
 #define SUITESPARSE_HAS_VERSION_FUNCTION
 
-#define SUITESPARSE_DATE "Oct 7, 2023"
+#define SUITESPARSE_DATE "Oct 15, 2023"
 #define SUITESPARSE_MAIN_VERSION    7
 #define SUITESPARSE_SUB_VERSION     2
-#define SUITESPARSE_SUBSUB_VERSION  1
+#define SUITESPARSE_SUBSUB_VERSION  2
 
 #define SUITESPARSE_VER_CODE(main,sub) ((main) * 1000 + (sub))
 #define SUITESPARSE_VERSION \