Skip to content

Commit 16a55e4

Browse files
DrTimothyAldenDavisDrTimothyAldenDavis
committed
2 parents 4c7b999 + 39c23ae commit 16a55e4

25 files changed

+79
-60
lines changed

‎ChangeLog

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
1-
Sept 23, 2024: version 7.8.3
1+
Oct 10, 2024: version 7.8.3
22

33
* ParU 1.0.0: first stable release. No change since last version
44
v0.3.0, except for date, version, and updates to the User Guide.
55
* UMFPACK 6.3.5: a few typos in comments and user guide; no change to code
66
* SuiteSparse_config and Example: revised to reflect ParU 1.0.0.
7+
* SuiteSparse_config.h: removed inclusion of MATLAB mex.h in
8+
SuiteSparse_config.h (conflicts with C++ mex files)
9+
* KLU and RBio: revised mexFunctions to handle change in
10+
SuiteSparse_config.h
711
* Package versions in this release: (* denotes a new version)
812
SuiteSparse_config 7.8.3 *
913
AMD 3.3.3
@@ -16,12 +20,12 @@ Sept 23, 2024: version 7.8.3
1620
CXSparse 4.4.1
1721
Example 1.8.3 *
1822
GraphBLAS 9.3.1
19-
KLU 2.3.4
23+
KLU 2.3.5 *
2024
LDL 3.3.2
2125
LAGraph 1.1.4
2226
SuiteSparse_Mongoose 3.3.4
2327
ParU 1.0.0 *
24-
RBio 4.3.3
28+
RBio 4.3.4 *
2529
SPEX 3.2.1
2630
SPQR 4.3.4
2731
UMFPACK 6.3.5 *

‎Example/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ message ( STATUS "MY prefix path: ${CMAKE_PREFIX_PATH}" )
5353
#-------------------------------------------------------------------------------
5454

5555
# cmake inserts the date and version number into Include/my.h:
56-
set ( MY_DATE "Sept 5, 2024" )
56+
set ( MY_DATE "Oct 10, 2024" )
5757
set ( MY_VERSION_MAJOR 1 )
5858
set ( MY_VERSION_MINOR 8 )
5959
set ( MY_VERSION_PATCH 3 )
@@ -96,13 +96,13 @@ find_package ( CHOLMOD 5.3.0 REQUIRED )
9696
find_package ( COLAMD 3.3.4 REQUIRED )
9797
find_package ( CXSparse 4.4.1 REQUIRED )
9898
find_package ( GraphBLAS 9.3.1 )
99-
find_package ( KLU 2.3.4 REQUIRED )
100-
find_package ( KLU_CHOLMOD 2.3.4 REQUIRED )
99+
find_package ( KLU 2.3.5 REQUIRED )
100+
find_package ( KLU_CHOLMOD 2.3.5 REQUIRED )
101101
find_package ( LDL 3.3.2 REQUIRED )
102102
find_package ( LAGraph 1.1.4 )
103103
find_package ( SuiteSparse_Mongoose 3.3.4 REQUIRED )
104104
find_package ( ParU 1.0.0 REQUIRED )
105-
find_package ( RBio 4.3.3 REQUIRED )
105+
find_package ( RBio 4.3.4 REQUIRED )
106106
find_package ( SPEX 3.2.1 REQUIRED ) # requires GMP and MPFR
107107
find_package ( SPQR 4.3.4 REQUIRED )
108108
find_package ( UMFPACK 6.3.5 REQUIRED )

‎Example/Include/my.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// file, since it is constructed from Config/my.h.in by cmake.
1212

1313
// version and date for example user library
14-
#define MY_DATE "Sept 5, 2024"
14+
#define MY_DATE "Oct 10, 2024"
1515
#define MY_MAJOR_VERSION 1
1616
#define MY_MINOR_VERSION 8
1717
#define MY_PATCH_VERSION 3

‎Example/Include/my_internal.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
// SuiteSparse include files for C/C++:
1616
#include "SuiteSparse_config.h"
17-
#if !defined (SUITESPARSE__VERSION) || SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,8,2)
18-
#error "This library requires SuiteSparse_config 7.8.2 or later"
17+
#if !defined (SUITESPARSE__VERSION) || SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,8,3)
18+
#error "This library requires SuiteSparse_config 7.8.3 or later"
1919
#endif
2020

2121
#include "amd.h"
@@ -69,8 +69,8 @@
6969
#endif
7070

7171
#include "klu.h"
72-
#if !defined (KLU__VERSION) || KLU__VERSION < SUITESPARSE__VERCODE(2,3,4)
73-
#error "This library requires KLU 2.3.4 or later"
72+
#if !defined (KLU__VERSION) || KLU__VERSION < SUITESPARSE__VERCODE(2,3,5)
73+
#error "This library requires KLU 2.3.5 or later"
7474
#endif
7575

7676
#include "ldl.h"
@@ -79,8 +79,8 @@
7979
#endif
8080

8181
#include "RBio.h"
82-
#if !defined (RBIO__VERSION) || RBIO__VERSION < SUITESPARSE__VERCODE(4,3,3)
83-
#error "This library requires RBio 4.3.3 or later"
82+
#if !defined (RBIO__VERSION) || RBIO__VERSION < SUITESPARSE__VERCODE(4,3,4)
83+
#error "This library requires RBio 4.3.4 or later"
8484
#endif
8585

8686
#include "SPEX.h"

‎KLU/CMakeLists.txt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212

1313
cmake_minimum_required ( VERSION 3.22 )
1414

15-
set ( KLU_DATE "June 20, 2024" )
15+
set ( KLU_DATE "Oct 10, 2024" )
1616
set ( KLU_VERSION_MAJOR 2 CACHE STRING "" FORCE )
1717
set ( KLU_VERSION_MINOR 3 CACHE STRING "" FORCE )
18-
set ( KLU_VERSION_SUB 4 CACHE STRING "" FORCE )
18+
set ( KLU_VERSION_SUB 5 CACHE STRING "" FORCE )
1919

2020
message ( STATUS "Building KLU version: v"
2121
${KLU_VERSION_MAJOR}.
@@ -43,22 +43,22 @@ include ( SuiteSparsePolicy )
4343
#-------------------------------------------------------------------------------
4444

4545
if ( NOT SUITESPARSE_ROOT_CMAKELISTS )
46-
find_package ( SuiteSparse_config 7.8.0
46+
find_package ( SuiteSparse_config 7.8.3
4747
PATHS ${CMAKE_SOURCE_DIR}/../SuiteSparse_config/build NO_DEFAULT_PATH )
4848
if ( NOT TARGET SuiteSparse::SuiteSparseConfig )
49-
find_package ( SuiteSparse_config 7.8.0 REQUIRED )
49+
find_package ( SuiteSparse_config 7.8.3 REQUIRED )
5050
endif ( )
5151

52-
find_package ( AMD 3.3.2
52+
find_package ( AMD 3.3.3
5353
PATHS ${CMAKE_SOURCE_DIR}/../AMD/build NO_DEFAULT_PATH )
5454
if ( NOT TARGET SuiteSparse::AMD )
55-
find_package ( AMD 3.3.2 REQUIRED )
55+
find_package ( AMD 3.3.3 REQUIRED )
5656
endif ( )
5757

58-
find_package ( COLAMD 3.3.3
58+
find_package ( COLAMD 3.3.4
5959
PATHS ${CMAKE_SOURCE_DIR}/../COLAMD/build NO_DEFAULT_PATH )
6060
if ( NOT TARGET SuiteSparse::COLAMD )
61-
find_package ( COLAMD 3.3.3 REQUIRED )
61+
find_package ( COLAMD 3.3.4 REQUIRED )
6262
endif ( )
6363

6464
find_package ( BTF 2.3.2
@@ -77,10 +77,10 @@ if ( SUITESPARSE_ROOT_CMAKELISTS )
7777
else ( )
7878
if ( KLU_USE_CHOLMOD )
7979
# look for CHOLMOD (optional fill-reducing orderings)
80-
find_package ( CHOLMOD 5.2.1
80+
find_package ( CHOLMOD 5.3.0
8181
PATHS ${CMAKE_SOURCE_DIR}/../CHOLMOD/build NO_DEFAULT_PATH )
8282
if ( NOT TARGET SuiteSparse::CHOLMOD )
83-
find_package ( CHOLMOD 5.2.1 )
83+
find_package ( CHOLMOD 5.3.0 )
8484
endif ( )
8585
if ( NOT CHOLMOD_FOUND )
8686
# CHOLMOD not found so disable it

‎KLU/Config/klu.h.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -833,8 +833,8 @@ void klu_version (int version [3]) ;
833833

834834
#define KLU__VERSION SUITESPARSE__VERCODE(@KLU_VERSION_MAJOR@,@KLU_VERSION_MINOR@,@KLU_VERSION_SUB@)
835835
#if !defined (SUITESPARSE__VERSION) || \
836-
(SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,8,0))
837-
#error "KLU @KLU_VERSION_MAJOR@.@KLU_VERSION_MINOR@.@KLU_VERSION_SUB@ requires SuiteSparse_config 7.8.0 or later"
836+
(SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,8,3))
837+
#error "KLU @KLU_VERSION_MAJOR@.@KLU_VERSION_MINOR@.@KLU_VERSION_SUB@ requires SuiteSparse_config 7.8.3 or later"
838838
#endif
839839

840840
#if !defined (AMD__VERSION) || \

‎KLU/Doc/ChangeLog

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
Oct 10, 2024: version 2.3.5
2+
3+
* MATLAB: revised mexFunction to account for change in
4+
SuiteSparse_config.h
5+
16
June 20, 2024: version 2.3.4
27

38
* minor update for MATLAB on Windows

‎KLU/Doc/KLU_UserGuide.pdf

12.7 KB
Binary file not shown.

‎KLU/Doc/klu_version.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
% version of SuiteSparse/KLU
2-
\date{VERSION 2.3.4, June 20, 2024}
2+
\date{VERSION 2.3.5, Oct 10, 2024}

‎KLU/Include/klu.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -823,33 +823,33 @@ void klu_version (int version [3]) ;
823823
* #endif
824824
*/
825825

826-
#define KLU_DATE "June 20, 2024"
826+
#define KLU_DATE "Oct 10, 2024"
827827
#define KLU_MAIN_VERSION 2
828828
#define KLU_SUB_VERSION 3
829-
#define KLU_SUBSUB_VERSION 4
829+
#define KLU_SUBSUB_VERSION 5
830830

831831
#define KLU_VERSION_CODE(main,sub) SUITESPARSE_VER_CODE(main,sub)
832832
#define KLU_VERSION KLU_VERSION_CODE(2,3)
833833

834-
#define KLU__VERSION SUITESPARSE__VERCODE(2,3,4)
834+
#define KLU__VERSION SUITESPARSE__VERCODE(2,3,5)
835835
#if !defined (SUITESPARSE__VERSION) || \
836-
(SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,8,0))
837-
#error "KLU 2.3.4 requires SuiteSparse_config 7.8.0 or later"
836+
(SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,8,3))
837+
#error "KLU 2.3.5 requires SuiteSparse_config 7.8.3 or later"
838838
#endif
839839

840840
#if !defined (AMD__VERSION) || \
841841
(AMD__VERSION < SUITESPARSE__VERCODE(3,3,3))
842-
#error "KLU 2.3.4 requires AMD 3.3.3 or later"
842+
#error "KLU 2.3.5 requires AMD 3.3.3 or later"
843843
#endif
844844

845845
#if !defined (COLAMD__VERSION) || \
846846
(COLAMD__VERSION < SUITESPARSE__VERCODE(3,3,4))
847-
#error "KLU 2.3.4 requires COLAMD 3.3.4 or later"
847+
#error "KLU 2.3.5 requires COLAMD 3.3.4 or later"
848848
#endif
849849

850850
#if !defined (BTF__VERSION) || \
851851
(BTF__VERSION < SUITESPARSE__VERCODE(2,3,2))
852-
#error "KLU 2.3.4 requires BTF 2.3.2 or later"
852+
#error "KLU 2.3.5 requires BTF 2.3.2 or later"
853853
#endif
854854

855855
#endif

0 commit comments

Comments
 (0)