From c45b72d8c458b8989c89db144437c78a397cbb93 Mon Sep 17 00:00:00 2001 From: Tim Davis Date: Thu, 19 Dec 2024 19:34:04 -0600 Subject: [PATCH] SuiteSparse_config 7.9.0 and Example 1.8.4 --- ChangeLog | 26 ++++++++++ Example/CMakeLists.txt | 8 ++-- Example/Demo/mydemo.out | 64 ++++++++++++------------- Example/Include/my.h | 4 +- Example/Include/my_internal.h | 7 +++ README.md | 2 +- SuiteSparse_config/CMakeLists.txt | 6 +-- SuiteSparse_config/SuiteSparse_config.h | 10 ++-- 8 files changed, 80 insertions(+), 47 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6b7eac4c96..ef5d435b31 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,29 @@ +Dec 20, 2024: version 7.9.0 + + * GraphBLAS v9.4.2: Added the GxB_IndexBinaryOp. Added new JIT kernels. + Disabled more FactoryKernels to reduce compiled library size. + * Package versions in this release: (* denotes a new version) + SuiteSparse_config 7.9.0 * + 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.4 * + GraphBLAS 9.4.2 * + KLU 2.3.5 + LDL 3.3.2 + LAGraph 1.1.4 + SuiteSparse_Mongoose 3.3.4 + ParU 1.0.0 + RBio 4.3.4 + SPEX 3.2.1 + SPQR 4.3.4 + UMFPACK 6.3.5 + Oct 10, 2024: version 7.8.3 * ParU 1.0.0: first stable release. No change since last version diff --git a/Example/CMakeLists.txt b/Example/CMakeLists.txt index 7fbf3396a4..1633150d1d 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 "Oct 10, 2024" ) +set ( MY_DATE "Dec 20, 2024" ) set ( MY_VERSION_MAJOR 1 ) set ( MY_VERSION_MINOR 8 ) -set ( MY_VERSION_PATCH 3 ) +set ( MY_VERSION_PATCH 4 ) 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.3 REQUIRED ) +find_package ( SuiteSparse_config 7.9.0 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.1 ) +find_package ( GraphBLAS 9.4.2 ) find_package ( KLU 2.3.5 REQUIRED ) find_package ( KLU_CHOLMOD 2.3.5 REQUIRED ) find_package ( LDL 3.3.2 REQUIRED ) diff --git a/Example/Demo/mydemo.out b/Example/Demo/mydemo.out index 4271b30d1e..752865113a 100644 --- a/Example/Demo/mydemo.out +++ b/Example/Demo/mydemo.out @@ -1,19 +1,19 @@ My demo -Date from #include 'my.h': Aug 2, 2024 -Date from compiled library: Aug 2, 2024 -version from #include 'my.h.': 1.8.0 -version from compiled library: 1.8.0 +Date from #include 'my.h': Dec 20, 2024 +Date from compiled library: Dec 20, 2024 +version from #include 'my.h.': 1.8.4 +version from compiled library: 1.8.4 ------------------------------------------------------------ -MY: v1.8.0 (Aug 2, 2024) -MY: v1.8.0 (in library) -MY version code: 1008000 -MY date: Aug 2, 2024 +MY: v1.8.4 (Dec 20, 2024) +MY: v1.8.4 (in library) +MY version code: 1008004 +MY date: Dec 20, 2024 ------------------------------------------------------------ -SuiteSparse_config: v7.8.0 (Aug 2, 2024) -SuiteSparse_config: v7.8.0 (in library) -SuiteSparse_config version code: 7008000 +SuiteSparse_config: v7.9.0 (Dec 20, 2024) +SuiteSparse_config: v7.9.0 (in library) +SuiteSparse_config version code: 7009000 ------------------------------------------------------------ CXSparse: v4.4.1 (June 20, 2024) @@ -72,19 +72,19 @@ CHOLMOD: v5.3.0 (in library) CHOLMOD version code: 5003000 ------------------------------------------------------------ -GraphBLAS: v9.3.0 (Aug 2, 2024) -GraphBLAS: v9.3.0 (in library) -GraphBLAS version code: 9003000 +GraphBLAS: v9.4.2 (Nov 18, 2024) +GraphBLAS: v9.4.2 (in library) +GraphBLAS version code: 9004002 ------------------------------------------------------------ -LAGraph: v1.1.3 (Mar 22, 2024) -LAGraph: v1.1.3 (in library) -LAGraph version code: 1001003 +LAGraph: v1.1.4 (Aug 20, 2024) +LAGraph: v1.1.4 (in library) +LAGraph version code: 1001004 ------------------------------------------------------------ -KLU: v2.3.4 (June 20, 2024) -KLU: v2.3.4 (in library) -KLU version code: 2003004 +KLU: v2.3.5 (Oct 10, 2024) +KLU: v2.3.5 (in library) +KLU version code: 2003005 x [0] = 36.4 x [1] = -32.7 error: 7.10543e-14 @@ -98,9 +98,9 @@ x2 [1] = -32.7 error: 0 ------------------------------------------------------------ -RBio: v4.3.3 (June 20, 2024) -RBio: v4.3.3 (in library) -RBio version code: 4003003 +RBio: v4.3.4 (Oct 10, 2024) +RBio: v4.3.4 (in library) +RBio version code: 4003004 njumbled 0, nzeros 0 result 0 mtype: iua @@ -113,9 +113,9 @@ iua 2 2 4 0 11 21 12 22 ------------------------------------------------------------ -SPEX: v3.2.0 (July 2, 2024) -SPEX: v3.2.0 (in library) -SPEX version code: 3002000 +SPEX: v3.2.1 (Aug 20, 2024) +SPEX: v3.2.1 (in library) +SPEX version code: 3002001 ------------------------------------------------------------ SuiteSparseQR: v4.3.4 (June 20, 2024) @@ -131,10 +131,10 @@ CHOLMOD dense: X from QR: 2-by-1, ------------------------------------------------------------ -UMFPACK: v6.3.4 (June 20, 2024) -UMFPACK: v6.3.4 (in library) -UMFPACK version code: 6003004 -UMFPACK V6.3.4 (June 20, 2024) +UMFPACK: v6.3.5 (Sept 23, 2024) +UMFPACK: v6.3.5 (in library) +UMFPACK version code: 6003005 +UMFPACK V6.3.5 (Sept 23, 2024) UMFPACK: Copyright (c) 2005-2024 by Timothy A. Davis. All Rights Reserved. UMFPACK License: SPDX-License-Identifier: GPL-2.0+ @@ -155,9 +155,9 @@ UMFPACK License: SPDX-License-Identifier: GPL-2.0+ Availability: http://www.suitesparse.com -UMFPACK V6.3.4 (June 20, 2024): OK +UMFPACK V6.3.5 (Sept 23, 2024): OK -UMFPACK V6.3.4 (June 20, 2024), Info: +UMFPACK V6.3.5 (Sept 23, 2024), Info: matrix entry defined as: double Int (generic integer) defined as: int64_t BLAS library used: Intel MKL 64lp BLAS (32-bit integers). size of BLAS integer: 4 diff --git a/Example/Include/my.h b/Example/Include/my.h index ff1a4c792e..3431c77307 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 "Oct 10, 2024" +#define MY_DATE "Dec 20, 2024" #define MY_MAJOR_VERSION 1 #define MY_MINOR_VERSION 8 -#define MY_PATCH_VERSION 3 +#define MY_PATCH_VERSION 4 #ifdef __cplusplus extern "C" { diff --git a/Example/Include/my_internal.h b/Example/Include/my_internal.h index 63bf8ffadb..e2e8cccf36 100644 --- a/Example/Include/my_internal.h +++ b/Example/Include/my_internal.h @@ -54,7 +54,14 @@ #endif #if ! defined (NO_GRAPHBLAS) + #if defined ( __cplusplus ) + extern "C" + { + #endif #include "GraphBLAS.h" + #if defined ( __cplusplus ) + } + #endif #if !defined ( GxB_SUITESPARSE_GRAPHBLAS ) || \ GxB_IMPLEMENTATION < GxB_VERSION (9,3,1) #error "This library requires SuiteSparse:GraphBLAS 9.3.1 or later" diff --git a/README.md b/README.md index 488799b2dd..6eae738e80 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ SuiteSparse: A Suite of Sparse matrix packages at http://suitesparse.com ----------------------------------------------------------------------------- -Oct 10, 2024, SuiteSparse VERSION 7.8.3 +Dec 20, 2024, SuiteSparse VERSION 7.9.0 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 9cc5c67ab7..fa80afea56 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 "Oct 10, 2024" ) +set ( SUITESPARSE_DATE "Dec 20, 2024" ) set ( SUITESPARSE_VERSION_MAJOR 7 ) -set ( SUITESPARSE_VERSION_MINOR 8 ) -set ( SUITESPARSE_VERSION_SUB 3 ) +set ( SUITESPARSE_VERSION_MINOR 9 ) +set ( SUITESPARSE_VERSION_SUB 0 ) 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 d3edfd89ff..571a8cbe7c 100644 --- a/SuiteSparse_config/SuiteSparse_config.h +++ b/SuiteSparse_config/SuiteSparse_config.h @@ -434,19 +434,19 @@ int SuiteSparse_version // returns SUITESPARSE_VERSION #define SUITESPARSE_HAS_VERSION_FUNCTION -#define SUITESPARSE_DATE "Oct 10, 2024" +#define SUITESPARSE_DATE "Dec 20, 2024" #define SUITESPARSE_MAIN_VERSION 7 -#define SUITESPARSE_SUB_VERSION 8 -#define SUITESPARSE_SUBSUB_VERSION 3 +#define SUITESPARSE_SUB_VERSION 9 +#define SUITESPARSE_SUBSUB_VERSION 0 // version format x.y #define SUITESPARSE_VER_CODE(main,sub) ((main) * 1000 + (sub)) -#define SUITESPARSE_VERSION SUITESPARSE_VER_CODE(7, 8) +#define SUITESPARSE_VERSION SUITESPARSE_VER_CODE(7, 9) // version format x.y.z #define SUITESPARSE__VERCODE(main,sub,patch) \ (((main)*1000ULL + (sub))*1000ULL + (patch)) -#define SUITESPARSE__VERSION SUITESPARSE__VERCODE(7,8,3) +#define SUITESPARSE__VERSION SUITESPARSE__VERCODE(7,9,0) //============================================================================== // SuiteSparse interface to the BLAS and LAPACK libraries