Skip to content

Commit 05c1ab4

Browse files
revise version numbers, dates, and changelogs
1 parent 13739e3 commit 05c1ab4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+191
-134
lines changed

CHOLMOD/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ cmake_minimum_required ( VERSION 3.22 )
1414

1515
set ( CHOLMOD_DATE "Jan 20, 2024" )
1616
set ( CHOLMOD_VERSION_MAJOR 5 CACHE STRING "" FORCE )
17-
set ( CHOLMOD_VERSION_MINOR 1 CACHE STRING "" FORCE )
18-
set ( CHOLMOD_VERSION_SUB 2 CACHE STRING "" FORCE )
17+
set ( CHOLMOD_VERSION_MINOR 2 CACHE STRING "" FORCE )
18+
set ( CHOLMOD_VERSION_SUB 0 CACHE STRING "" FORCE )
1919

2020
message ( STATUS "Building CHOLMOD version: v"
2121
${CHOLMOD_VERSION_MAJOR}.
@@ -112,10 +112,10 @@ endif ( )
112112
#-------------------------------------------------------------------------------
113113

114114
if ( NOT SUITESPARSE_ROOT_CMAKELISTS )
115-
find_package ( SuiteSparse_config 7.5.2
115+
find_package ( SuiteSparse_config 7.6.0
116116
PATHS ${CMAKE_SOURCE_DIR}/../SuiteSparse_config/build NO_DEFAULT_PATH )
117117
if ( NOT TARGET SuiteSparse::SuiteSparseConfig )
118-
find_package ( SuiteSparse_config 7.5.2 REQUIRED )
118+
find_package ( SuiteSparse_config 7.6.0 REQUIRED )
119119
endif ( )
120120

121121
find_package ( AMD 3.3.1

CHOLMOD/Config/cholmod.h.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -309,8 +309,8 @@ int cholmod_l_version (int version [3]) ;
309309

310310
#define CHOLMOD__VERSION SUITESPARSE__VERCODE(@CHOLMOD_VERSION_MAJOR@,@CHOLMOD_VERSION_MINOR@,@CHOLMOD_VERSION_SUB@)
311311
#if !defined (SUITESPARSE__VERSION) || \
312-
(SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,5,2))
313-
#error "CHOLMOD @CHOLMOD_VERSION_MAJOR@.@CHOLMOD_VERSION_MINOR@.@CHOLMOD_VERSION_SUB@ requires SuiteSparse_config 7.5.2 or later"
312+
(SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,6,0))
313+
#error "CHOLMOD @CHOLMOD_VERSION_MAJOR@.@CHOLMOD_VERSION_MINOR@.@CHOLMOD_VERSION_SUB@ requires SuiteSparse_config 7.6.0 or later"
314314
#endif
315315

316316
//------------------------------------------------------------------------------

CHOLMOD/Doc/ChangeLog

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
Jan 20, 2024: version 5.1.2
1+
Jan 20, 2024: version 5.2.0
22

33
* bug fix: CHOLMOD 5.1.0 added a new variable in the CHOLMOD Common
44
struct for development only but this change broke ABI compatibility
5-
since the SOVERSION was not bumped at the same time. v5.1.2 reverts
5+
since the SOVERSION was not bumped at the same time. v5.2.0 reverts
66
this change so the new variable does not appear in production, thus
77
restoring ABI compatibility with v5.0.x.
88

CHOLMOD/Doc/cholmod_version.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
% version of SuiteSparse/CHOLMOD
2-
\date{VERSION 5.1.2, Jan 20, 2024}
2+
\date{VERSION 5.2.0, Jan 20, 2024}

CHOLMOD/Include/cholmod.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -248,11 +248,11 @@
248248

249249
#define CHOLMOD_DATE "Jan 20, 2024"
250250
#define CHOLMOD_MAIN_VERSION 5
251-
#define CHOLMOD_SUB_VERSION 1
252-
#define CHOLMOD_SUBSUB_VERSION 2
251+
#define CHOLMOD_SUB_VERSION 2
252+
#define CHOLMOD_SUBSUB_VERSION 0
253253

254254
#define CHOLMOD_VER_CODE(main,sub) SUITESPARSE_VER_CODE(main,sub)
255-
#define CHOLMOD_VERSION CHOLMOD_VER_CODE(5,1)
255+
#define CHOLMOD_VERSION CHOLMOD_VER_CODE(5,2)
256256
#define CHOLMOD_HAS_VERSION_FUNCTION
257257

258258
#ifdef __cplusplus
@@ -307,10 +307,10 @@ int cholmod_l_version (int version [3]) ;
307307

308308
#include "SuiteSparse_config.h"
309309

310-
#define CHOLMOD__VERSION SUITESPARSE__VERCODE(5,1,2)
310+
#define CHOLMOD__VERSION SUITESPARSE__VERCODE(5,2,0)
311311
#if !defined (SUITESPARSE__VERSION) || \
312-
(SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,5,2))
313-
#error "CHOLMOD 5.1.2 requires SuiteSparse_config 7.5.2 or later"
312+
(SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,6,0))
313+
#error "CHOLMOD 5.2.0 requires SuiteSparse_config 7.6.0 or later"
314314
#endif
315315

316316
//------------------------------------------------------------------------------

CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ include ( SuiteSparsePolicy )
110110

111111
if ( SUITESPARSE_USE_SYSTEM_GRAPHBLAS )
112112
list ( REMOVE_ITEM SUITESPARSE_ENABLE_PROJECTS "graphblas" )
113-
find_package ( GraphBLAS 9.0.0 REQUIRED )
113+
find_package ( GraphBLAS 9.0.1 REQUIRED )
114114
else ( )
115115
if ( "lagraph" IN_LIST SUITESPARSE_ENABLE_PROJECTS )
116116
# LAGraph requires GraphBLAS.
@@ -136,7 +136,7 @@ endif ( )
136136

137137
if ( SUITESPARSE_USE_SYSTEM_CHOLMOD )
138138
list ( REMOVE_ITEM SUITESPARSE_ENABLE_PROJECTS "cholmod" )
139-
find_package ( CHOLMOD 5.1.1 REQUIRED )
139+
find_package ( CHOLMOD 5.2.0 REQUIRED )
140140
else ( )
141141
if ( ( KLU_USE_CHOLMOD AND "klu" IN_LIST SUITESPARSE_ENABLE_PROJECTS )
142142
OR ( UMFPACK_USE_CHOLMOD AND "umfpack" IN_LIST SUITESPARSE_ENABLE_PROJECTS )
@@ -210,7 +210,7 @@ endif ( )
210210

211211
if ( SUITESPARSE_USE_SYSTEM_SUITESPARSE_CONFIG )
212212
list ( REMOVE_ITEM SUITESPARSE_ENABLE_PROJECTS "suitesparse_config" )
213-
find_package ( SuiteSparse_config 7.5.0 REQUIRED )
213+
find_package ( SuiteSparse_config 7.6.0 REQUIRED )
214214
else ( )
215215
if ( "mongoose" IN_LIST SUITESPARSE_ENABLE_PROJECTS
216216
OR "amd" IN_LIST SUITESPARSE_ENABLE_PROJECTS

CSparse/CMakeLists.txt

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
# Note that CSparse can use an older cmake version than most of SuiteSparse.
1919
cmake_minimum_required ( VERSION 3.13 ) # CSparse can be built stand-alone
2020

21-
set ( CSPARSE_DATE "Dec 30, 2023" )
21+
set ( CSPARSE_DATE "Jan 20, 2024" )
2222
set ( CSPARSE_VERSION_MAJOR 4 CACHE STRING "" FORCE )
2323
set ( CSPARSE_VERSION_MINOR 3 CACHE STRING "" FORCE )
24-
set ( CSPARSE_VERSION_SUB 0 CACHE STRING "" FORCE )
24+
set ( CSPARSE_VERSION_SUB 1 CACHE STRING "" FORCE )
2525

2626
message ( STATUS "Building CSparse version: v"
2727
${CSPARSE_VERSION_MAJOR}.
@@ -60,6 +60,13 @@ message ( STATUS "Build type: " ${CMAKE_BUILD_TYPE} )
6060
option ( BUILD_SHARED_LIBS "OFF: do not build shared libraries. ON (default): build shared libraries" ON )
6161
option ( BUILD_STATIC_LIBS "OFF: do not build static libraries. ON (default): build static libraries" ON )
6262

63+
if ( CMAKE_C_COMPILER_ID STREQUAL "Clang" )
64+
set ( CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Wno-extra-semi-stmt" )
65+
endif ( )
66+
if ( CMAKE_CXX_COMPILER_ID STREQUAL "Clang" )
67+
set ( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Wno-extra-semi-stmt" )
68+
endif ( )
69+
6370
#-------------------------------------------------------------------------------
6471
# Configure cs.h with version number
6572
#-------------------------------------------------------------------------------

CSparse/Doc/ChangeLog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
Jan 20, 2024: version 4.3.1
2+
3+
* minor updates to build system
4+
15
Dec 30, 2023: version 4.3.0
26

37
* major change to build system: by Markus Mützel

CSparse/Include/cs.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
#endif
1515
#define CS_VER 4 /* CSparse Version */
1616
#define CS_SUBVER 3
17-
#define CS_SUBSUB 0
18-
#define CS_DATE "Dec 30, 2023" /* CSparse release date */
17+
#define CS_SUBSUB 1
18+
#define CS_DATE "Jan 20, 2024" /* CSparse release date */
1919
#define CS_COPYRIGHT "Copyright (c) Timothy A. Davis, 2006-2023"
2020

2121
#ifndef csi

CXSparse/Doc/ChangeLog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
Jan 10, 2024: version 4.3.1
2+
3+
* minor updates to build system
4+
15
Dec 30, 2023: version 4.3.0
26

37
* major change to build system: by Markus Mützel

0 commit comments

Comments
 (0)