diff --git a/ChangeLog b/ChangeLog index 8a90a6766f..8ac73d6169 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,30 @@ +Aug 12, 2024: version 7.8.1 + + * GraphBLAS 9.3.1: bug fix in creation of JIT package + * SuiteSparse_config, Example: modified to reflect the release of + GraphBLAS 9.3.1 + * Package versions in this release: (* denotes a new version) + SuiteSparse_config 7.8.1 * + 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.1 * + GraphBLAS 9.3.1 * + KLU 2.3.4 + LDL 3.3.2 + LAGraph 1.1.3 + SuiteSparse_Mongoose 3.3.4 + ParU 0.2.0 + RBio 4.3.3 + SPEX 3.2.0 + SPQR 4.3.4 + UMFPACK 6.3.4 + Aug 2, 2024: version 7.8.0 * ParU 0.2.0: many changes; nearing a stable release. diff --git a/Example/CMakeLists.txt b/Example/CMakeLists.txt index b1bbab357b..5114449843 100644 --- a/Example/CMakeLists.txt +++ b/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 2, 2024" ) +set ( MY_DATE "Aug 12, 2024" ) set ( MY_VERSION_MAJOR 1 ) set ( MY_VERSION_MINOR 8 ) -set ( MY_VERSION_PATCH 0 ) +set ( MY_VERSION_PATCH 1 ) 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.0 REQUIRED ) +find_package ( SuiteSparse_config 7.8.1 REQUIRED ) find_package ( AMD 3.3.3 REQUIRED ) find_package ( BTF 2.3.2 REQUIRED ) find_package ( CAMD 3.3.3 REQUIRED ) @@ -95,7 +95,7 @@ find_package ( CCOLAMD 3.3.4 REQUIRED ) find_package ( CHOLMOD 5.3.0 REQUIRED ) find_package ( COLAMD 3.3.4 REQUIRED ) find_package ( CXSparse 4.4.1 REQUIRED ) -find_package ( GraphBLAS 9.3.0 ) +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 ) diff --git a/Example/Include/my.h b/Example/Include/my.h index 7889add2a0..50def62c35 100644 --- a/Example/Include/my.h +++ b/Example/Include/my.h @@ -11,10 +11,10 @@ // file, since it is constructed from Config/my.h.in by cmake. // version and date for example user library -#define MY_DATE "Aug 2, 2024" +#define MY_DATE "Aug 12, 2024" #define MY_MAJOR_VERSION 1 #define MY_MINOR_VERSION 8 -#define MY_PATCH_VERSION 0 +#define MY_PATCH_VERSION 1 #ifdef __cplusplus extern "C" { diff --git a/Example/Include/my_internal.h b/Example/Include/my_internal.h index 6387588838..6a9f1fee4f 100644 --- a/Example/Include/my_internal.h +++ b/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,0) -#error "This library requires SuiteSparse_config 7.8.0 or later" +#if !defined (SUITESPARSE__VERSION) || SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,8,1) +#error "This library requires SuiteSparse_config 7.8.1 or later" #endif #include "amd.h" @@ -56,8 +56,8 @@ #if ! defined (NO_GRAPHBLAS) #include "GraphBLAS.h" #if !defined ( GxB_SUITESPARSE_GRAPHBLAS ) || \ - GxB_IMPLEMENTATION < GxB_VERSION (9,3,0) - #error "This library requires SuiteSparse:GraphBLAS 9.3.0 or later" + GxB_IMPLEMENTATION < GxB_VERSION (9,3,1) + #error "This library requires SuiteSparse:GraphBLAS 9.3.1 or later" #endif #endif diff --git a/GraphBLAS/Doc/ChangeLog b/GraphBLAS/Doc/ChangeLog index 67d7cac6cf..a3bcae2af7 100644 --- a/GraphBLAS/Doc/ChangeLog +++ b/GraphBLAS/Doc/ChangeLog @@ -1,3 +1,8 @@ +Aug 12, 2024: version 9.3.1 + + * (56) bug fix: wrong type for fgetc return value in JITpackage; leads + to infinite loop on some systems when building GraphBLAS. + Aug 2, 2024: version 9.3.0 * code restructuring: Source folder split into many subfolders, and diff --git a/GraphBLAS/Doc/GraphBLAS_UserGuide.pdf b/GraphBLAS/Doc/GraphBLAS_UserGuide.pdf index 4871289bbd..e7f89b8387 100644 Binary files a/GraphBLAS/Doc/GraphBLAS_UserGuide.pdf and b/GraphBLAS/Doc/GraphBLAS_UserGuide.pdf differ diff --git a/GraphBLAS/Doc/GraphBLAS_UserGuide.tex b/GraphBLAS/Doc/GraphBLAS_UserGuide.tex index 4128a5e82a..fa915948b6 100644 --- a/GraphBLAS/Doc/GraphBLAS_UserGuide.tex +++ b/GraphBLAS/Doc/GraphBLAS_UserGuide.tex @@ -14492,6 +14492,13 @@ \section{Release Notes} \begin{itemize} +\item Aug 12, 2024: version 9.3.1 + + \begin{itemize} + \item (56) bug fix: wrong type for fgetc return value in JITpackage; leads + to infinite loop on some systems when building GraphBLAS. + \end{itemize} + \item Aug 2, 2024: version 9.3.0 \begin{itemize} diff --git a/GraphBLAS/Doc/GraphBLAS_version.tex b/GraphBLAS/Doc/GraphBLAS_version.tex index a0cfac3bf4..43025c5439 100644 --- a/GraphBLAS/Doc/GraphBLAS_version.tex +++ b/GraphBLAS/Doc/GraphBLAS_version.tex @@ -1,5 +1,5 @@ % version of SuiteSparse:GraphBLAS \date{VERSION -9.3.0, -Aug 2, 2024} +9.3.1, +Aug 12, 2024} diff --git a/GraphBLAS/Include/GraphBLAS.h b/GraphBLAS/Include/GraphBLAS.h index 6803295e54..c15defdec9 100644 --- a/GraphBLAS/Include/GraphBLAS.h +++ b/GraphBLAS/Include/GraphBLAS.h @@ -1,4 +1,4 @@ -// SuiteSparse:GraphBLAS 9.3.0 +// SuiteSparse:GraphBLAS 9.3.1 //------------------------------------------------------------------------------ // GraphBLAS.h: definitions for the GraphBLAS package //------------------------------------------------------------------------------ @@ -275,10 +275,10 @@ // The version of this implementation, and the GraphBLAS API version: #define GxB_IMPLEMENTATION_NAME "SuiteSparse:GraphBLAS" -#define GxB_IMPLEMENTATION_DATE "Aug 2, 2024" +#define GxB_IMPLEMENTATION_DATE "Aug 12, 2024" #define GxB_IMPLEMENTATION_MAJOR 9 #define GxB_IMPLEMENTATION_MINOR 3 -#define GxB_IMPLEMENTATION_SUB 0 +#define GxB_IMPLEMENTATION_SUB 1 #define GxB_SPEC_DATE "Dec 22, 2023" #define GxB_SPEC_MAJOR 2 #define GxB_SPEC_MINOR 1 diff --git a/GraphBLAS/JITpackage/Source/grb_jitpackage.c b/GraphBLAS/JITpackage/Source/grb_jitpackage.c index 82ea371c83..b8304998b9 100644 --- a/GraphBLAS/JITpackage/Source/grb_jitpackage.c +++ b/GraphBLAS/JITpackage/Source/grb_jitpackage.c @@ -142,12 +142,14 @@ int main (int argc, char **argv) OK (fr != NULL) ; // get number of lines in file - char ch; + int ch; do { ch = fgetc (fr); if (ch == '\n') + { nfiles++; + } } while (ch != EOF); // read file list from response file diff --git a/GraphBLAS/README.md b/GraphBLAS/README.md index 13aa3fe882..1be913fb8e 100644 --- a/GraphBLAS/README.md +++ b/GraphBLAS/README.md @@ -4,7 +4,7 @@ SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved. SPDX-License-Identifier: Apache-2.0 -VERSION 9.3.0, Aug 2, 2024 +VERSION 9.3.1, Aug 12, 2024 SuiteSparse:GraphBLAS is a complete implementation of the GraphBLAS standard, which defines a set of sparse matrix operations on an extended algebra of diff --git a/GraphBLAS/cmake_modules/GraphBLAS_version.cmake b/GraphBLAS/cmake_modules/GraphBLAS_version.cmake index 580c5221e8..a9a468e332 100644 --- a/GraphBLAS/cmake_modules/GraphBLAS_version.cmake +++ b/GraphBLAS/cmake_modules/GraphBLAS_version.cmake @@ -8,10 +8,10 @@ #------------------------------------------------------------------------------- # version of SuiteSparse:GraphBLAS -set ( GraphBLAS_DATE "Aug 2, 2024" ) +set ( GraphBLAS_DATE "Aug 12, 2024" ) set ( GraphBLAS_VERSION_MAJOR 9 CACHE STRING "" FORCE ) set ( GraphBLAS_VERSION_MINOR 3 CACHE STRING "" FORCE ) -set ( GraphBLAS_VERSION_SUB 0 CACHE STRING "" FORCE ) +set ( GraphBLAS_VERSION_SUB 1 CACHE STRING "" FORCE ) # GraphBLAS C API Specification version, at graphblas.org set ( GraphBLAS_API_DATE "Dec 22, 2023" ) diff --git a/README.md b/README.md index 26862e0208..4401c34ca4 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ SuiteSparse: A Suite of Sparse matrix packages at http://suitesparse.com ----------------------------------------------------------------------------- -Aug 2, 2024, SuiteSparse VERSION 7.8.0 +Aug 12, 2024, SuiteSparse VERSION 7.8.1 SuiteSparse is a set of sparse-matrix-related packages written or co-authored by Tim Davis, available at https://github.com/DrTimothyAldenDavis/SuiteSparse . diff --git a/SuiteSparse_config/CMakeLists.txt b/SuiteSparse_config/CMakeLists.txt index fcdcd3b431..55a627fee2 100644 --- a/SuiteSparse_config/CMakeLists.txt +++ b/SuiteSparse_config/CMakeLists.txt @@ -15,10 +15,10 @@ cmake_minimum_required ( VERSION 3.22 ) # version of both SuiteSparse and SuiteSparse_config -set ( SUITESPARSE_DATE "Aug 2, 2024" ) +set ( SUITESPARSE_DATE "Aug 12, 2024" ) set ( SUITESPARSE_VERSION_MAJOR 7 ) set ( SUITESPARSE_VERSION_MINOR 8 ) -set ( SUITESPARSE_VERSION_SUB 0 ) +set ( SUITESPARSE_VERSION_SUB 1 ) 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 ) diff --git a/SuiteSparse_config/SuiteSparse_config.h b/SuiteSparse_config/SuiteSparse_config.h index 18961a388a..dec7019cc8 100644 --- a/SuiteSparse_config/SuiteSparse_config.h +++ b/SuiteSparse_config/SuiteSparse_config.h @@ -434,10 +434,10 @@ int SuiteSparse_version // returns SUITESPARSE_VERSION #define SUITESPARSE_HAS_VERSION_FUNCTION -#define SUITESPARSE_DATE "Aug 2, 2024" +#define SUITESPARSE_DATE "Aug 12, 2024" #define SUITESPARSE_MAIN_VERSION 7 #define SUITESPARSE_SUB_VERSION 8 -#define SUITESPARSE_SUBSUB_VERSION 0 +#define SUITESPARSE_SUBSUB_VERSION 1 // version format x.y #define SUITESPARSE_VER_CODE(main,sub) ((main) * 1000 + (sub)) @@ -446,7 +446,7 @@ int SuiteSparse_version // returns SUITESPARSE_VERSION // version format x.y.z #define SUITESPARSE__VERCODE(main,sub,patch) \ (((main)*1000ULL + (sub))*1000ULL + (patch)) -#define SUITESPARSE__VERSION SUITESPARSE__VERCODE(7,8,0) +#define SUITESPARSE__VERSION SUITESPARSE__VERCODE(7,8,1) //============================================================================== // SuiteSparse interface to the BLAS and LAPACK libraries