LAGraph 1.1.4, SPEX 3.2.1, and Example 1.8.2

Author: DrTimothyAldenDavis

CMakeLists.txt

@@ -111,7 +111,7 @@ include ( SuiteSparsePolicy )
 
 if ( SUITESPARSE_USE_SYSTEM_GRAPHBLAS )
     list ( REMOVE_ITEM SUITESPARSE_ENABLE_PROJECTS "graphblas" )
-    find_package ( GraphBLAS 9.3.0 REQUIRED )
+    find_package ( GraphBLAS 9.3.1 REQUIRED )
 else ( )
     if ( "lagraph" IN_LIST SUITESPARSE_ENABLE_PROJECTS )
         # LAGraph requires GraphBLAS.
@@ -137,7 +137,7 @@ endif ( )
 
 if ( SUITESPARSE_USE_SYSTEM_UMFPACK )
     list ( REMOVE_ITEM SUITESPARSE_ENABLE_PROJECTS "umfpack" )
-    find_package ( UMFPACK 6.3.3 REQUIRED )
+    find_package ( UMFPACK 6.3.4 REQUIRED )
 else ( )
     if ( "paru" IN_LIST SUITESPARSE_ENABLE_PROJECTS )
         # ParU requires UMFPACK.
@@ -168,7 +168,7 @@ endif ( )
 
 if ( SUITESPARSE_USE_SYSTEM_AMD )
     list ( REMOVE_ITEM SUITESPARSE_ENABLE_PROJECTS "amd" )
-    find_package ( AMD 3.3.2 REQUIRED )
+    find_package ( AMD 3.3.3 REQUIRED )
 else ( )
     if ( "cholmod" IN_LIST SUITESPARSE_ENABLE_PROJECTS
             OR "ldl" IN_LIST SUITESPARSE_ENABLE_PROJECTS
@@ -184,7 +184,7 @@ endif ( )
 
 if ( SUITESPARSE_USE_SYSTEM_COLAMD )
     list ( REMOVE_ITEM SUITESPARSE_ENABLE_PROJECTS "colamd" )
-    find_package ( COLAMD 3.3.3 REQUIRED )
+    find_package ( COLAMD 3.3.4 REQUIRED )
 else ( )
     if ( "cholmod" IN_LIST SUITESPARSE_ENABLE_PROJECTS
             OR "spex" IN_LIST SUITESPARSE_ENABLE_PROJECTS )
@@ -198,7 +198,7 @@ endif ( )
 
 if ( SUITESPARSE_USE_SYSTEM_CAMD )
     list ( REMOVE_ITEM SUITESPARSE_ENABLE_PROJECTS "camd" )
-    find_package ( CAMD 3.3.2 REQUIRED )
+    find_package ( CAMD 3.3.3 REQUIRED )
 else ( )
     if ( CHOLMOD_CAMD AND "cholmod" IN_LIST SUITESPARSE_ENABLE_PROJECTS )
         # CHOLMOD can optionally use CAMD.
@@ -211,7 +211,7 @@ endif ( )
 
 if ( SUITESPARSE_USE_SYSTEM_CCOLAMD )
     list ( REMOVE_ITEM SUITESPARSE_ENABLE_PROJECTS "ccolamd" )
-    find_package ( CCOLAMD 3.3.3 REQUIRED )
+    find_package ( CCOLAMD 3.3.4 REQUIRED )
 else ( )
     if ( CHOLMOD_CAMD AND "cholmod" IN_LIST SUITESPARSE_ENABLE_PROJECTS )
         # CHOLMOD can optionally use CCOLAMD.
@@ -224,7 +224,7 @@ endif ( )
 
 if ( SUITESPARSE_USE_SYSTEM_SUITESPARSE_CONFIG )
     list ( REMOVE_ITEM SUITESPARSE_ENABLE_PROJECTS "suitesparse_config" )
-    find_package ( SuiteSparse_config 7.8.0 REQUIRED )
+    find_package ( SuiteSparse_config 7.8.2 REQUIRED )
 else ( )
     if ( "mongoose" IN_LIST SUITESPARSE_ENABLE_PROJECTS
             OR "amd" IN_LIST SUITESPARSE_ENABLE_PROJECTS

ChangeLog

@@ -1,3 +1,31 @@
+Aug 20, 2024: version 7.8.2
+
+    * LAGraph 1.1.4: bug fix for LAGraph_MMWrite when matrix is dense
+    * SPEX 3.2.1: release date revised, sync with primary SPEX repo
+    * SuiteSparse_config, Example: modified to reflect the release of
+        LAGraph 1.1.4 and SPEX 3.2.1
+    * Package versions in this release: (* denotes a new version)
+        SuiteSparse_config 7.8.2    *
+        AMD 3.3.3
+        BTF 2.3.2
+        CAMD 3.3.3
+        CCOLAMD 3.3.4
+        CHOLMOD 5.3.0
+        COLAMD 3.3.4
+        CSparse 4.3.2
+        CXSparse 4.4.1
+        Example 1.8.2               *
+        GraphBLAS 9.3.1
+        KLU 2.3.4
+        LDL 3.3.2
+        LAGraph 1.1.4               *
+        SuiteSparse_Mongoose 3.3.4
+        ParU 0.2.0
+        RBio 4.3.3
+        SPEX 3.2.1                  *
+        SPQR 4.3.4
+        UMFPACK 6.3.4
+
 Aug 12, 2024: version 7.8.1
 
     * GraphBLAS 9.3.1: bug fix in creation of JIT package

Example/CMakeLists.txt

@@ -53,10 +53,10 @@ message ( STATUS "MY prefix path:    ${CMAKE_PREFIX_PATH}" )
 #-------------------------------------------------------------------------------
 
 # cmake inserts the date and version number into Include/my.h:
-set ( MY_DATE "Aug 12, 2024" )
+set ( MY_DATE "Aug 20, 2024" )
 set ( MY_VERSION_MAJOR 1 )
 set ( MY_VERSION_MINOR 8 )
-set ( MY_VERSION_PATCH 1 )
+set ( MY_VERSION_PATCH 2 )
 
 message ( STATUS "Building MY library version: v"
     ${MY_VERSION_MAJOR}.
@@ -87,7 +87,7 @@ project ( my
 #-------------------------------------------------------------------------------
 
 # look for all SuiteSparse packages:
-find_package ( SuiteSparse_config 7.8.1 REQUIRED )
+find_package ( SuiteSparse_config 7.8.2 REQUIRED )
 find_package ( AMD 3.3.3 REQUIRED )
 find_package ( BTF 2.3.2 REQUIRED )
 find_package ( CAMD 3.3.3 REQUIRED )
@@ -99,11 +99,11 @@ find_package ( GraphBLAS 9.3.1 )
 find_package ( KLU 2.3.4 REQUIRED )
 find_package ( KLU_CHOLMOD 2.3.4 REQUIRED )
 find_package ( LDL 3.3.2 REQUIRED )
-find_package ( LAGraph 1.1.3 )
+find_package ( LAGraph 1.1.4 )
 find_package ( SuiteSparse_Mongoose 3.3.4 REQUIRED )
 find_package ( ParU 0.2.0 REQUIRED )
 find_package ( RBio 4.3.3 REQUIRED )
-find_package ( SPEX 3.2.0 REQUIRED )    # requires GMP and MPFR
+find_package ( SPEX 3.2.1 REQUIRED )    # requires GMP and MPFR
 find_package ( SPQR 4.3.4 REQUIRED )
 find_package ( UMFPACK 6.3.4 REQUIRED )
 

Example/Include/my_internal.h

@@ -14,8 +14,8 @@
 
 // SuiteSparse include files for C/C++:
 #include "SuiteSparse_config.h"
-#if !defined (SUITESPARSE__VERSION) || SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,8,1)
-#error "This library requires SuiteSparse_config 7.8.1 or later"
+#if !defined (SUITESPARSE__VERSION) || SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,8,2)
+#error "This library requires SuiteSparse_config 7.8.2 or later"
 #endif
 
 #include "amd.h"
@@ -63,8 +63,8 @@
 
 #if ! defined (NO_LAGRAPH)
     #include "LAGraph.h"
-    #if SUITESPARSE__VERCODE(LAGRAPH_VERSION_MAJOR,LAGRAPH_VERSION_MINOR,LAGRAPH_VERSION_UPDATE) < SUITESPARSE__VERCODE(1,1,3)
-    #error "This library requires LAGraph 1.1.3 or later"
+    #if SUITESPARSE__VERCODE(LAGRAPH_VERSION_MAJOR,LAGRAPH_VERSION_MINOR,LAGRAPH_VERSION_UPDATE) < SUITESPARSE__VERCODE(1,1,4)
+    #error "This library requires LAGraph 1.1.4 or later"
     #endif
 #endif
 
@@ -84,8 +84,8 @@
 #endif
 
 #include "SPEX.h"
-#if !defined (SPEX__VERSION) || SPEX__VERSION < SUITESPARSE__VERCODE(3,2,0)
-#error "This library requires SPEX 3.2.0 or later"
+#if !defined (SPEX__VERSION) || SPEX__VERSION < SUITESPARSE__VERCODE(3,2,1)
+#error "This library requires SPEX 3.2.1 or later"
 #endif
 
 #include "SuiteSparseQR_C.h"

LAGraph/CMakeLists.txt

@@ -39,10 +39,10 @@
 cmake_minimum_required ( VERSION 3.20 ) # LAGraph can be built stand-alone
 
 # version of LAGraph
-set ( LAGraph_DATE "Mar 22, 2024" )
+set ( LAGraph_DATE "Aug 20, 2024" )
 set ( LAGraph_VERSION_MAJOR 1 CACHE STRING "" FORCE )
 set ( LAGraph_VERSION_MINOR 1 CACHE STRING "" FORCE )
-set ( LAGraph_VERSION_SUB   3 CACHE STRING "" FORCE )
+set ( LAGraph_VERSION_SUB   4 CACHE STRING "" FORCE )
 
 message ( STATUS "Building LAGraph version: v"
     ${LAGraph_VERSION_MAJOR}.

LAGraph/ChangeLog

@@ -1,3 +1,7 @@
+Aug 20, 2024: version 1.1.4
+
+    * fix MMWrite when matrix is dense
+
 Mar 22, 2024: version 1.1.3
 
     * minor updates to build system

LAGraph/data/comments_full.mtx

@@ -2,7 +2,7 @@
 %%GraphBLAS type double
 % comments for full.mtx
 % this file was created by test_MMRead.c
-3 3 9
+3 3
 .646
 .709
 .754

LAGraph/github_workflows/workflows/build.yml

@@ -13,9 +13,7 @@ jobs:
     strategy:
       matrix:
         config:
-         - {grb_version: 7.1.0, conda_grb_package_hash: h27087fc, conda_extension: tar.bz2}
-         - {grb_version: 7.3.0, conda_grb_package_hash: h27087fc, conda_extension: tar.bz2}
-         - {grb_version: 7.4.1, conda_grb_package_hash: hcb278e6, conda_extension: conda}
+         - {grb_version: 9.1.0, conda_grb_package_hash: hd29ac08, conda_extension: conda}
     steps:
     - name: Checkout
       uses: actions/checkout@v2.0.0
@@ -36,15 +34,15 @@ jobs:
         cd ..
     - name: Build project
       run: |
-        export GRAPHBLAS_INCLUDE_DIR=`pwd`/graphblas-binaries/include
+        export GRAPHBLAS_INCLUDE_DIR=`pwd`/graphblas-binaries/include/suitesparse
         export GRAPHBLAS_LIBRARY=`pwd`/graphblas-binaries/lib/libgraphblas.so
         cd build
         cmake .. -DCOVERAGE=1 -DGRAPHBLAS_INCLUDE_DIR=${GRAPHBLAS_INCLUDE_DIR} -DGRAPHBLAS_LIBRARY=${GRAPHBLAS_LIBRARY}
         JOBS=2 make
         make test_coverage
     - name: Deploy
       uses: JamesIves/github-pages-deploy-action@4.1.1
-      if: matrix.config.grb_version == '7.4.1' && github.event_name == 'push' && github.ref == 'refs/heads/stable'
+      if: matrix.config.grb_version == '9.1.0' && github.event_name == 'push' && github.ref == 'refs/heads/stable'
       with:
         branch: gh-pages
         folder: build/test_coverage/
@@ -59,9 +57,7 @@ jobs:
     strategy:
       matrix:
         config:
-         - {grb_version: 7.1.0, conda_grb_package_hash: h7881ed4, conda_extension: tar.bz2}
-         - {grb_version: 7.3.0, conda_grb_package_hash: ha894c9a, conda_extension: tar.bz2}
-         - {grb_version: 7.4.1, conda_grb_package_hash: ha894c9a, conda_extension: conda}
+         - {grb_version: 9.1.0, conda_grb_package_hash: heb48c95, conda_extension: conda}
     steps:
     - name: Checkout
       uses: actions/checkout@v2.0.0
@@ -84,7 +80,7 @@ jobs:
         cd ..
     - name: Build project
       run: |
-        export GRAPHBLAS_INCLUDE_DIR=`pwd`/graphblas-binaries/include
+        export GRAPHBLAS_INCLUDE_DIR=`pwd`/graphblas-binaries/include/suitesparse
         export GRAPHBLAS_LIBRARY=`pwd`/graphblas-binaries/lib/libgraphblas.dylib
         # adding an extra line to the CMakeLists.txt file to locate the libomp instance installed by brew
         echo 'include_directories("/usr/local/opt/libomp/include")' | cat - CMakeLists.txt

LAGraph/include/LAGraph.h

@@ -37,10 +37,10 @@
 // See also the LAGraph_Version utility method, which returns these values.
 // These definitions are derived from LAGraph/CMakeLists.txt.
 
-#define LAGRAPH_DATE "Mar 22, 2024"
+#define LAGRAPH_DATE "Aug 20, 2024"
 #define LAGRAPH_VERSION_MAJOR  1
 #define LAGRAPH_VERSION_MINOR  1
-#define LAGRAPH_VERSION_UPDATE 3
+#define LAGRAPH_VERSION_UPDATE 4
 
 //==============================================================================
 // include files and helper macros

LAGraph/src/utility/LAGraph_MMWrite.c

@@ -459,8 +459,18 @@ int LAGraph_MMWrite
         nvals_to_print = nself_edges + (nvals - nself_edges) / 2 ;
     }
 
-    FPRINTF (f, "%" PRIu64 " %" PRIu64 " %" PRIu64 "\n",
-        nrows, ncols, nvals_to_print) ;
+    if (MM_fmt == MM_array)
+    {
+        // write `nrows ncols` if the array format is used
+        FPRINTF (f, "%" PRIu64 " %" PRIu64 "\n",
+            nrows, ncols) ;
+    }
+    else
+    {
+        // otherwise write `nrows ncols nvals` for the coordinate format
+        FPRINTF (f, "%" PRIu64 " %" PRIu64 " %" PRIu64 "\n",
+            nrows, ncols, nvals_to_print) ;
+    }
 
     if (nvals_to_print == 0)
     {

README.md

@@ -2,7 +2,7 @@
 SuiteSparse:  A Suite of Sparse matrix packages at http://suitesparse.com
 -----------------------------------------------------------------------------
 
-Aug 12, 2024, SuiteSparse VERSION 7.8.1
+Aug 20, 2024, SuiteSparse VERSION 7.8.2
 
 SuiteSparse is a set of sparse-matrix-related packages written or co-authored
 by Tim Davis, available at https://github.com/DrTimothyAldenDavis/SuiteSparse .

SPEX/CMakeLists.txt

@@ -13,10 +13,10 @@
 
 cmake_minimum_required ( VERSION 3.22 )
 
-set ( SPEX_DATE "July 2, 2024" )
+set ( SPEX_DATE "Aug 20, 2024" )
 set ( SPEX_VERSION_MAJOR 3 CACHE STRING "" FORCE )
 set ( SPEX_VERSION_MINOR 2 CACHE STRING "" FORCE )
-set ( SPEX_VERSION_SUB   0 CACHE STRING "" FORCE )
+set ( SPEX_VERSION_SUB   1 CACHE STRING "" FORCE )
 
 message ( STATUS "Building SPEX version: v"
     ${SPEX_VERSION_MAJOR}.
@@ -74,22 +74,22 @@ endif ( )
 #-------------------------------------------------------------------------------
 
 if ( NOT SUITESPARSE_ROOT_CMAKELISTS )
-    find_package ( SuiteSparse_config 7.8.0
+    find_package ( SuiteSparse_config 7.8.2
         PATHS ${CMAKE_SOURCE_DIR}/../SuiteSparse_config/build NO_DEFAULT_PATH )
     if ( NOT TARGET SuiteSparse::SuiteSparseConfig )
-        find_package ( SuiteSparse_config 7.8.0 REQUIRED )
+        find_package ( SuiteSparse_config 7.8.2 REQUIRED )
     endif ( )
 
-    find_package ( AMD 3.3.2
+    find_package ( AMD 3.3.3
         PATHS ${CMAKE_SOURCE_DIR}/../AMD/build NO_DEFAULT_PATH )
     if ( NOT TARGET SuiteSparse::AMD )
-        find_package ( AMD 3.3.2 REQUIRED )
+        find_package ( AMD 3.3.3 REQUIRED )
     endif ( )
 
-    find_package ( COLAMD 3.3.3
+    find_package ( COLAMD 3.3.4
         PATHS ${CMAKE_SOURCE_DIR}/../COLAMD/build NO_DEFAULT_PATH )
     if ( NOT TARGET SuiteSparse::COLAMD )
-        find_package ( COLAMD 3.3.3 REQUIRED )
+        find_package ( COLAMD 3.3.4 REQUIRED )
     endif ( )
 endif ( )
 

SPEX/Config/SPEX.h.in

@@ -121,8 +121,8 @@
 
 #define SPEX__VERSION SUITESPARSE__VERCODE(@SPEX_VERSION_MAJOR@,@SPEX_VERSION_MINOR@,@SPEX_VERSION_SUB@)
 #if !defined (SUITESPARSE__VERSION) || \
-    (SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,8,0))
-#error "SPEX @SPEX_VERSION_MAJOR@.@SPEX_VERSION_MINOR@.@SPEX_VERSION_SUB@ requires SuiteSparse_config 7.8.0 or later"
+    (SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,8,2))
+#error "SPEX @SPEX_VERSION_MAJOR@.@SPEX_VERSION_MINOR@.@SPEX_VERSION_SUB@ requires SuiteSparse_config 7.8.2 or later"
 #endif
 
 #if defined ( __cplusplus )

SPEX/Doc/ChangeLog

@@ -1,4 +1,8 @@
-June 20, 2024: version 3.2.0
+Aug 20, 2024: version 3.2.1
+
+    * Python interface: bug fix for string length, and Python Inf
+
+July 2, 2024: version 3.2.0
 
     * added SPEX_ldl_* methods: allowing D to have negative diagonal entries;
         SPEX_cholesky_* methods revised to require D to have positive entries.

SPEX/Doc/SPEX_UserGuide.pdf

@@ -1,2 +1,2 @@
 % version of SuiteSparse/SPEX
-VERSION 3.2.0, July 2, 2024
+VERSION 3.2.1, Aug 20, 2024

SPEX/Doc/SPEX_version.tex

@@ -106,11 +106,11 @@
 //------------------------------------------------------------------------------
 
 // Current version of the code
-#define SPEX_DATE "July 2, 2024"
-#define SPEX_VERSION_STRING "3.2.0"
+#define SPEX_DATE "Aug 20, 2024"
+#define SPEX_VERSION_STRING "3.2.1"
 #define SPEX_VERSION_MAJOR 3
 #define SPEX_VERSION_MINOR 2
-#define SPEX_VERSION_SUB   0
+#define SPEX_VERSION_SUB   1
 
 #define SPEX_VERSION_NUMBER(major,minor,sub) \
     (((major)*1000ULL + (minor))*1000ULL + (sub))
@@ -119,10 +119,10 @@
                          SPEX_VERSION_MINOR, \
                          SPEX_VERSION_SUB)
 
-#define SPEX__VERSION SUITESPARSE__VERCODE(3,2,0)
+#define SPEX__VERSION SUITESPARSE__VERCODE(3,2,1)
 #if !defined (SUITESPARSE__VERSION) || \
-    (SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,8,0))
-#error "SPEX 3.2.0 requires SuiteSparse_config 7.8.0 or later"
+    (SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,8,2))
+#error "SPEX 3.2.1 requires SuiteSparse_config 7.8.2 or later"
 #endif
 
 #if defined ( __cplusplus )

SPEX/Include/SPEX.h

@@ -15,10 +15,10 @@
 cmake_minimum_required ( VERSION 3.22 )
 
 # version of both SuiteSparse and SuiteSparse_config
-set ( SUITESPARSE_DATE "Aug 12, 2024" )
+set ( SUITESPARSE_DATE "Aug 20, 2024" )
 set ( SUITESPARSE_VERSION_MAJOR 7 )
 set ( SUITESPARSE_VERSION_MINOR 8 )
-set ( SUITESPARSE_VERSION_SUB   1 )
+set ( SUITESPARSE_VERSION_SUB   2 )
 set ( SUITESPARSE_CONFIG_VERSION_MAJOR ${SUITESPARSE_VERSION_MAJOR} CACHE STRING "" FORCE )
 set ( SUITESPARSE_CONFIG_VERSION_MINOR ${SUITESPARSE_VERSION_MINOR} CACHE STRING "" FORCE )
 set ( SUITESPARSE_CONFIG_VERSION_PATCH ${SUITESPARSE_VERSION_SUB} CACHE STRING "" FORCE )