Skip to content

Commit 86afa36

Browse files
DrTimothyAldenDavisDrTimothyAldenDavis
committed
remove "set ( Package_USE_OPENMP OFF )"; remove unused parameters in SPQR
1 parent 5631a96 commit 86afa36

Some content is hidden

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

41 files changed

+163
-102
lines changed

‎CHOLMOD/CMakeLists.txt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,6 @@ endif ( )
8484
#-------------------------------------------------------------------------------
8585

8686
option ( CHOLMOD_USE_OPENMP "ON: Use OpenMP in CHOLMOD if available. OFF: Do not use OpenMP. (Default: SUITESPARSE_USE_OPENMP)" ${SUITESPARSE_USE_OPENMP} )
87-
if ( NOT SUITESPARSE_USE_OPENMP )
88-
set ( CHOLMOD_USE_OPENMP "OFF" CACHE STRING "" FORCE )
89-
endif ( )
9087
if ( CHOLMOD_USE_OPENMP )
9188
if ( CMAKE_VERSION VERSION_LESS 3.24 )
9289
find_package ( OpenMP COMPONENTS C )
@@ -115,10 +112,10 @@ endif ( )
115112
#-------------------------------------------------------------------------------
116113

117114
if ( NOT SUITESPARSE_ROOT_CMAKELISTS )
118-
find_package ( SuiteSparse_config 7.5.0
115+
find_package ( SuiteSparse_config 7.5.2
119116
PATHS ${CMAKE_SOURCE_DIR}/../SuiteSparse_config/build NO_DEFAULT_PATH )
120117
if ( NOT TARGET SuiteSparse::SuiteSparseConfig )
121-
find_package ( SuiteSparse_config 7.5.0 REQUIRED )
118+
find_package ( SuiteSparse_config 7.5.2 REQUIRED )
122119
endif ( )
123120

124121
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,0))
313-
#error "CHOLMOD @CHOLMOD_VERSION_MAJOR@.@CHOLMOD_VERSION_MINOR@.@CHOLMOD_VERSION_SUB@ requires SuiteSparse_config 7.5.0 or later"
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"
314314
#endif
315315

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

‎CHOLMOD/Doc/CHOLMOD_UserGuide.pdf

0 Bytes
Binary file not shown.

‎CHOLMOD/Include/cholmod.h

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(5,1,2)
311311
#if !defined (SUITESPARSE__VERSION) || \
312-
(SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,5,0))
313-
#error "CHOLMOD 5.1.2 requires SuiteSparse_config 7.5.0 or later"
312+
(SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,5,2))
313+
#error "CHOLMOD 5.1.2 requires SuiteSparse_config 7.5.2 or later"
314314
#endif
315315

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

‎ChangeLog

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,33 @@
1+
Jan 20, 2024: version 7.5.2
2+
3+
* CHOLMOD 5.1.2: bug fix (restore ABI compatibility with 5.0.x)
4+
* GraphBLAS 9.0.1: minor updates to build system
5+
* SuiteSparse_config 7.5.2: no change except version number
6+
* SPQR 4.3.2: remove unused parameters
7+
* ParU 0.1.2: minor updates to build system
8+
* LAGraph 1.1.2: minor updates to build system
9+
* Package versions in this release:
10+
SuiteSparse_config 7.5.2
11+
AMD 3.3.1
12+
BTF 2.3.1
13+
CAMD 3.3.1
14+
CCOLAMD 3.3.1
15+
CHOLMOD 5.1.2
16+
COLAMD 3.3.1
17+
CSparse 4.3.0
18+
CXSparse 4.3.1
19+
Example 1.6.1
20+
GraphBLAS 9.0.1
21+
KLU 2.3.1
22+
LDL 3.3.1
23+
LAGraph 1.1.2
24+
SuiteSparse_Mongoose 3.3.1
25+
ParU 0.1.2
26+
RBio 4.3.1
27+
SPEX 2.3.1
28+
SPQR 4.3.2
29+
UMFPACK 6.3.1
30+
131
Jan 12, 2024: version 7.5.1
232

333
* SuiteSparse_config: bug fix to SUITESPARSE__VERCODE macro.

‎Example/CMakeLists.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ 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 "Jan 12, 2024" )
56+
set ( MY_DATE "Jan 20, 2024" )
5757
set ( MY_VERSION_MAJOR 1 )
5858
set ( MY_VERSION_MINOR 6 )
59-
set ( MY_VERSION_PATCH 1 )
59+
set ( MY_VERSION_PATCH 2 )
6060

6161
message ( STATUS "Building MY library version: v"
6262
${MY_VERSION_MAJOR}.
@@ -87,24 +87,24 @@ project ( my
8787
#-------------------------------------------------------------------------------
8888

8989
# look for all SuiteSparse packages:
90-
find_package ( SuiteSparse_config 7.5.1 REQUIRED )
90+
find_package ( SuiteSparse_config 7.5.2 REQUIRED )
9191
find_package ( AMD 3.3.1 REQUIRED )
9292
find_package ( BTF 2.3.1 REQUIRED )
9393
find_package ( CAMD 3.3.1 REQUIRED )
9494
find_package ( CCOLAMD 3.3.1 REQUIRED )
95-
find_package ( CHOLMOD 5.1.1 REQUIRED )
95+
find_package ( CHOLMOD 5.1.2 REQUIRED )
9696
find_package ( COLAMD 3.3.1 REQUIRED )
9797
find_package ( CXSparse 4.3.1 REQUIRED )
98-
find_package ( GraphBLAS 9.0.0 )
98+
find_package ( GraphBLAS 9.0.1 )
9999
find_package ( KLU 2.3.1 REQUIRED )
100100
find_package ( KLU_CHOLMOD 2.3.1 REQUIRED )
101101
find_package ( LDL 3.3.1 REQUIRED )
102-
find_package ( LAGraph 1.1.1 )
102+
find_package ( LAGraph 1.1.2 )
103103
find_package ( SuiteSparse_Mongoose 3.3.1 REQUIRED )
104-
find_package ( ParU 0.1.1 REQUIRED )
104+
find_package ( ParU 0.1.2 REQUIRED )
105105
find_package ( RBio 4.3.1 REQUIRED )
106106
find_package ( SPEX 2.3.1 REQUIRED ) # requires GMP and MPFR
107-
find_package ( SPQR 4.3.1 REQUIRED )
107+
find_package ( SPQR 4.3.2 REQUIRED )
108108
find_package ( UMFPACK 6.3.1 REQUIRED )
109109

110110
#-------------------------------------------------------------------------------

‎Example/Include/my.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
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 "Jan 12, 2024"
14+
#define MY_DATE "Jan 20, 2024"
1515
#define MY_MAJOR_VERSION 1
1616
#define MY_MINOR_VERSION 6
17-
#define MY_PATCH_VERSION 1
17+
#define MY_PATCH_VERSION 2
1818

1919
#ifdef __cplusplus
2020
extern "C" {

‎GraphBLAS/CMakeLists.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,6 @@ endif ( )
5757

5858
# in the future, when GraphBLAS can use CUDA in production:
5959
# option ( GRAPHBLAS_USE_CUDA "ON (default): enable CUDA acceleration for GraphBLAS, OFF: do not use CUDA" ${SUITESPARSE_USE_CUDA} )
60-
# if ( NOT SUITESPARSE_USE_CUDA )
61-
# set ( GRAPHBLAS_USE_CUDA "OFF" CACHE STRING "" FORCE )
62-
# endif ( )
6360

6461
if ( SUITESPARSE_HAS_CUDA AND GRAPHBLAS_USE_CUDA )
6562
# FOR NOW: do not compile FactoryKernels when developing the CUDA kernels
@@ -101,9 +98,6 @@ endif ( )
10198
#-------------------------------------------------------------------------------
10299

103100
option ( GRAPHBLAS_USE_OPENMP "ON: Use OpenMP in GraphBLAS if available. OFF: Do not use OpenMP. (Default: SUITESPARSE_USE_OPENMP)" ${SUITESPARSE_USE_OPENMP} )
104-
if ( NOT SUITESPARSE_USE_OPENMP )
105-
set ( GRAPHBLAS_USE_OPENMP "OFF" CACHE STRING "" FORCE )
106-
endif ( )
107101
if ( GRAPHBLAS_USE_OPENMP )
108102
if ( CMAKE_VERSION VERSION_LESS 3.24 )
109103
find_package ( OpenMP COMPONENTS C )

‎GraphBLAS/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 9.0.1
2+
3+
* minor updates to build system
4+
15
Jan 10, 2024: version 9.0.0
26

37
* GrB_get/GrB_set: new functions from the v2.1 C API.

‎GraphBLAS/Doc/GraphBLAS_UserGuide.pdf

30.4 KB
Binary file not shown.

0 commit comments

Comments
 (0)