Skip to content

Commit

Permalink
ParU 1.0.0 for SuiteSparse 7.8.3
Browse files Browse the repository at this point in the history
  • Loading branch information
DrTimothyAldenDavis committed Sep 5, 2024
1 parent 6d7c50c commit 644e5c7
Show file tree
Hide file tree
Showing 11 changed files with 53 additions and 26 deletions.
27 changes: 27 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,30 @@
Sept 5, 2024: version 7.8.3

* ParU 1.0.0: first stable release. No change since last version
v0.3.0, except for date and version.
* SuiteSparse_config and Example: revised to reflect ParU 1.0.0.
* Package versions in this release: (* denotes a new version)
SuiteSparse_config 7.8.3 *
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.3 *
GraphBLAS 9.3.1
KLU 2.3.4
LDL 3.3.2
LAGraph 1.1.4
SuiteSparse_Mongoose 3.3.4
ParU 1.0.0 *
RBio 4.3.3
SPEX 3.2.1
SPQR 4.3.4
UMFPACK 6.3.4

Aug 20, 2024: version 7.8.2

* LAGraph 1.1.4: bug fix for LAGraph_MMWrite when matrix is dense
Expand Down
8 changes: 4 additions & 4 deletions Example/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 20, 2024" )
set ( MY_DATE "Sept 5, 2024" )
set ( MY_VERSION_MAJOR 1 )
set ( MY_VERSION_MINOR 8 )
set ( MY_VERSION_PATCH 2 )
set ( MY_VERSION_PATCH 3 )

message ( STATUS "Building MY library version: v"
${MY_VERSION_MAJOR}.
Expand Down Expand Up @@ -87,7 +87,7 @@ project ( my
#-------------------------------------------------------------------------------

# look for all SuiteSparse packages:
find_package ( SuiteSparse_config 7.8.2 REQUIRED )
find_package ( SuiteSparse_config 7.8.3 REQUIRED )
find_package ( AMD 3.3.3 REQUIRED )
find_package ( BTF 2.3.2 REQUIRED )
find_package ( CAMD 3.3.3 REQUIRED )
Expand All @@ -101,7 +101,7 @@ find_package ( KLU_CHOLMOD 2.3.4 REQUIRED )
find_package ( LDL 3.3.2 REQUIRED )
find_package ( LAGraph 1.1.4 )
find_package ( SuiteSparse_Mongoose 3.3.4 REQUIRED )
find_package ( ParU 0.3.0 REQUIRED )
find_package ( ParU 1.0.0 REQUIRED )
find_package ( RBio 4.3.3 REQUIRED )
find_package ( SPEX 3.2.1 REQUIRED ) # requires GMP and MPFR
find_package ( SPQR 4.3.4 REQUIRED )
Expand Down
4 changes: 2 additions & 2 deletions Example/Include/my.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 20, 2024"
#define MY_DATE "Sept 5, 2024"
#define MY_MAJOR_VERSION 1
#define MY_MINOR_VERSION 8
#define MY_PATCH_VERSION 2
#define MY_PATCH_VERSION 3

#ifdef __cplusplus
extern "C" {
Expand Down
6 changes: 3 additions & 3 deletions ParU/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
# cmake 3.22 is required to find the BLAS in SuiteSparse_config
cmake_minimum_required ( VERSION 3.22 )

set ( PARU_DATE "Aug 20, 2024" )
set ( PARU_VERSION_MAJOR 0 CACHE STRING "" FORCE )
set ( PARU_VERSION_MINOR 3 CACHE STRING "" FORCE )
set ( PARU_DATE "Sept 5, 2024" )
set ( PARU_VERSION_MAJOR 1 CACHE STRING "" FORCE )
set ( PARU_VERSION_MINOR 0 CACHE STRING "" FORCE )
set ( PARU_VERSION_UPDATE 0 CACHE STRING "" FORCE )

message ( STATUS "Building PARU version: v"
Expand Down
4 changes: 2 additions & 2 deletions ParU/Config/ParU.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ typedef enum ParU_Info

#define PARU__VERSION SUITESPARSE__VERCODE(@PARU_VERSION_MAJOR@,@PARU_VERSION_MINOR@,@PARU_VERSION_UPDATE@)
#if !defined (SUITESPARSE__VERSION) || \
(SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,8,0))
#error "ParU @PARU_VERSION_MAJOR@.@PARU_VERSION_MINOR@.@PARU_VERSION_UPDATE@ requires SuiteSparse_config 7.8.0 or later"
(SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,8,3))
#error "ParU @PARU_VERSION_MAJOR@.@PARU_VERSION_MINOR@.@PARU_VERSION_UPDATE@ requires SuiteSparse_config 7.8.3 or later"
#endif

#if !defined (UMFPACK__VERSION) || \
Expand Down
Binary file modified ParU/Doc/paru_user_guide.pdf
Binary file not shown.
2 changes: 1 addition & 1 deletion ParU/Doc/paru_version.tex
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
% version of SuiteSparse/ParU
\date{VERSION 0.3.0, Aug 20, 2024}
\date{VERSION 1.0.0, Sept 5, 2024}
16 changes: 8 additions & 8 deletions ParU/Include/ParU.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,25 +53,25 @@ typedef enum ParU_Info
PARU_TOO_LARGE = -4 // problem too large for the BLAS
} ParU_Info ;

#define PARU_DATE "Aug 20, 2024"
#define PARU_VERSION_MAJOR 0
#define PARU_VERSION_MINOR 3
#define PARU_DATE "Sept 5, 2024"
#define PARU_VERSION_MAJOR 1
#define PARU_VERSION_MINOR 0
#define PARU_VERSION_UPDATE 0

#define PARU__VERSION SUITESPARSE__VERCODE(0,3,0)
#define PARU__VERSION SUITESPARSE__VERCODE(1,0,0)
#if !defined (SUITESPARSE__VERSION) || \
(SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,8,0))
#error "ParU 0.3.0 requires SuiteSparse_config 7.8.0 or later"
(SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,8,3))
#error "ParU 1.0.0 requires SuiteSparse_config 7.8.3 or later"
#endif

#if !defined (UMFPACK__VERSION) || \
(UMFPACK__VERSION < SUITESPARSE__VERCODE(6,3,4))
#error "ParU 0.3.0 requires UMFPACK 6.3.4 or later"
#error "ParU 1.0.0 requires UMFPACK 6.3.4 or later"
#endif

#if !defined (CHOLMOD__VERSION) || \
(CHOLMOD__VERSION < SUITESPARSE__VERCODE(5,3,0))
#error "ParU 0.3.0 requires CHOLMOD 5.3.0 or later"
#error "ParU 1.0.0 requires CHOLMOD 5.3.0 or later"
#endif

// the same values as UMFPACK_STRATEGY defined in UMFPACK/Include/umfpack.h
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
SuiteSparse: A Suite of Sparse matrix packages at http://suitesparse.com
-----------------------------------------------------------------------------

Aug 20, 2024, SuiteSparse VERSION 7.8.2
Sept 5, 2024, SuiteSparse VERSION 7.8.3

SuiteSparse is a set of sparse-matrix-related packages written or co-authored
by Tim Davis, available at https://github.com/DrTimothyAldenDavis/SuiteSparse .
Expand Down
4 changes: 2 additions & 2 deletions SuiteSparse_config/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
cmake_minimum_required ( VERSION 3.22 )

# version of both SuiteSparse and SuiteSparse_config
set ( SUITESPARSE_DATE "Aug 20, 2024" )
set ( SUITESPARSE_DATE "Sept 5, 2024" )
set ( SUITESPARSE_VERSION_MAJOR 7 )
set ( SUITESPARSE_VERSION_MINOR 8 )
set ( SUITESPARSE_VERSION_SUB 2 )
set ( SUITESPARSE_VERSION_SUB 3 )
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 )
Expand Down
6 changes: 3 additions & 3 deletions SuiteSparse_config/SuiteSparse_config.h
Original file line number Diff line number Diff line change
Expand Up @@ -434,10 +434,10 @@ int SuiteSparse_version // returns SUITESPARSE_VERSION

#define SUITESPARSE_HAS_VERSION_FUNCTION

#define SUITESPARSE_DATE "Aug 20, 2024"
#define SUITESPARSE_DATE "Sept 5, 2024"
#define SUITESPARSE_MAIN_VERSION 7
#define SUITESPARSE_SUB_VERSION 8
#define SUITESPARSE_SUBSUB_VERSION 2
#define SUITESPARSE_SUBSUB_VERSION 3

// version format x.y
#define SUITESPARSE_VER_CODE(main,sub) ((main) * 1000 + (sub))
Expand All @@ -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,2)
#define SUITESPARSE__VERSION SUITESPARSE__VERCODE(7,8,3)

//==============================================================================
// SuiteSparse interface to the BLAS and LAPACK libraries
Expand Down

0 comments on commit 644e5c7

Please sign in to comment.