diff --git a/CCOLAMD/CMakeLists.txt b/CCOLAMD/CMakeLists.txt index 3dae5d98d8..5aa7439bfd 100644 --- a/CCOLAMD/CMakeLists.txt +++ b/CCOLAMD/CMakeLists.txt @@ -11,10 +11,10 @@ cmake_minimum_required ( VERSION 3.22 ) -set ( CCOLAMD_DATE "Jan 10, 2024" ) +set ( CCOLAMD_DATE "Jan 20, 2024" ) set ( CCOLAMD_VERSION_MAJOR 3 CACHE STRING "" FORCE ) set ( CCOLAMD_VERSION_MINOR 3 CACHE STRING "" FORCE ) -set ( CCOLAMD_VERSION_SUB 1 CACHE STRING "" FORCE ) +set ( CCOLAMD_VERSION_SUB 2 CACHE STRING "" FORCE ) message ( STATUS "Building CCOLAMD version: v" ${CCOLAMD_VERSION_MAJOR}. @@ -43,10 +43,10 @@ include ( SuiteSparsePolicy ) #------------------------------------------------------------------------------- if ( NOT SUITESPARSE_ROOT_CMAKELISTS ) - find_package ( SuiteSparse_config 7.5.0 + find_package ( SuiteSparse_config 7.6.0 PATHS ${CMAKE_SOURCE_DIR}/../SuiteSparse_config/build NO_DEFAULT_PATH ) if ( NOT TARGET SuiteSparse::SuiteSparseConfig ) - find_package ( SuiteSparse_config 7.5.0 REQUIRED ) + find_package ( SuiteSparse_config 7.6.0 REQUIRED ) endif ( ) endif ( ) diff --git a/CCOLAMD/Config/ccolamd.h.in b/CCOLAMD/Config/ccolamd.h.in index f7aff9fa03..013d8e87c8 100644 --- a/CCOLAMD/Config/ccolamd.h.in +++ b/CCOLAMD/Config/ccolamd.h.in @@ -46,8 +46,8 @@ #define CCOLAMD__VERSION SUITESPARSE__VERCODE(@CCOLAMD_VERSION_MAJOR@,@CCOLAMD_VERSION_MINOR@,@CCOLAMD_VERSION_SUB@) #if !defined (SUITESPARSE__VERSION) || \ - (SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,5,0)) -#error "CCOLAMD @CCOLAMD_VERSION_MAJOR@.@CCOLAMD_VERSION_MINOR@.@CCOLAMD_VERSION_SUB@ requires SuiteSparse_config 7.5.0 or later" + (SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,6,0)) +#error "CCOLAMD @CCOLAMD_VERSION_MAJOR@.@CCOLAMD_VERSION_MINOR@.@CCOLAMD_VERSION_SUB@ requires SuiteSparse_config 7.6.0 or later" #endif /* ========================================================================== */ diff --git a/CCOLAMD/Doc/ChangeLog b/CCOLAMD/Doc/ChangeLog index 52b5e564c5..809c4825d6 100644 --- a/CCOLAMD/Doc/ChangeLog +++ b/CCOLAMD/Doc/ChangeLog @@ -1,3 +1,7 @@ +Jan 20, 2024: version 3.3.2 + + * minor updates to build system + Jan 10, 2024: version 3.3.1 * minor updates to build system diff --git a/CCOLAMD/Include/ccolamd.h b/CCOLAMD/Include/ccolamd.h index cf20524a96..847f4aef56 100644 --- a/CCOLAMD/Include/ccolamd.h +++ b/CCOLAMD/Include/ccolamd.h @@ -36,18 +36,18 @@ * #endif */ -#define CCOLAMD_DATE "Jan 10, 2024" +#define CCOLAMD_DATE "Jan 20, 2024" #define CCOLAMD_MAIN_VERSION 3 #define CCOLAMD_SUB_VERSION 3 -#define CCOLAMD_SUBSUB_VERSION 1 +#define CCOLAMD_SUBSUB_VERSION 2 #define CCOLAMD_VERSION_CODE(main,sub) SUITESPARSE_VER_CODE(main,sub) #define CCOLAMD_VERSION CCOLAMD_VERSION_CODE(3,3) -#define CCOLAMD__VERSION SUITESPARSE__VERCODE(3,3,1) +#define CCOLAMD__VERSION SUITESPARSE__VERCODE(3,3,2) #if !defined (SUITESPARSE__VERSION) || \ - (SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,5,0)) -#error "CCOLAMD 3.3.1 requires SuiteSparse_config 7.5.0 or later" + (SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,6,0)) +#error "CCOLAMD 3.3.2 requires SuiteSparse_config 7.6.0 or later" #endif /* ========================================================================== */ diff --git a/CCOLAMD/Makefile b/CCOLAMD/Makefile index 4b7e8ec8cc..5d1f56c382 100644 --- a/CCOLAMD/Makefile +++ b/CCOLAMD/Makefile @@ -64,7 +64,7 @@ remake: # just run cmake to set things up setup: - ( cd build ; cmake $(CMAKE_OPTIONS) .. ) + ( cd build && cmake $(CMAKE_OPTIONS) .. ) install: ( cd build && cmake --install . ) diff --git a/CHOLMOD/CMakeLists.txt b/CHOLMOD/CMakeLists.txt index 9f01fa4212..7dce63fb3f 100644 --- a/CHOLMOD/CMakeLists.txt +++ b/CHOLMOD/CMakeLists.txt @@ -124,10 +124,10 @@ if ( NOT SUITESPARSE_ROOT_CMAKELISTS ) find_package ( AMD 3.3.1 REQUIRED ) endif ( ) - find_package ( COLAMD 3.3.1 + find_package ( COLAMD 3.3.2 PATHS ${CMAKE_SOURCE_DIR}/../COLAMD/build NO_DEFAULT_PATH ) if ( NOT TARGET SuiteSparse::COLAMD ) - find_package ( COLAMD 3.3.1 REQUIRED ) + find_package ( COLAMD 3.3.2 REQUIRED ) endif ( ) endif ( ) @@ -237,10 +237,10 @@ endif ( ) find_package ( CAMD 3.3.1 ) endif ( ) - find_package ( CCOLAMD 3.3.1 + find_package ( CCOLAMD 3.3.2 PATHS ${CMAKE_SOURCE_DIR}/../CCOLAMD/build NO_DEFAULT_PATH ) if ( NOT TARGET SuiteSparse::CCOLAMD ) - find_package ( CCOLAMD 3.3.1 ) + find_package ( CCOLAMD 3.3.2 ) endif ( ) if ( NOT CAMD_FOUND OR NOT CCOLAMD_FOUND ) diff --git a/CMakeLists.txt b/CMakeLists.txt index 12b8903a80..0a23a5a480 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -170,7 +170,7 @@ endif ( ) if ( SUITESPARSE_USE_SYSTEM_COLAMD ) list ( REMOVE_ITEM SUITESPARSE_ENABLE_PROJECTS "colamd" ) - find_package ( COLAMD 3.3.1 REQUIRED ) + find_package ( COLAMD 3.3.2 REQUIRED ) else ( ) if ( "cholmod" IN_LIST SUITESPARSE_ENABLE_PROJECTS OR "spex" IN_LIST SUITESPARSE_ENABLE_PROJECTS ) @@ -197,7 +197,7 @@ endif ( ) if ( SUITESPARSE_USE_SYSTEM_CCOLAMD ) list ( REMOVE_ITEM SUITESPARSE_ENABLE_PROJECTS "ccolamd" ) - find_package ( CCOLAMD 3.3.1 REQUIRED ) + find_package ( CCOLAMD 3.3.2 REQUIRED ) else ( ) if ( CHOLMOD_CAMD AND "cholmod" IN_LIST SUITESPARSE_ENABLE_PROJECTS ) # CHOLMOD can optionally use CCOLAMD. diff --git a/COLAMD/CMakeLists.txt b/COLAMD/CMakeLists.txt index f040b81bbe..39ac72edac 100644 --- a/COLAMD/CMakeLists.txt +++ b/COLAMD/CMakeLists.txt @@ -11,10 +11,10 @@ cmake_minimum_required ( VERSION 3.22 ) -set ( COLAMD_DATE "Jan 10, 2024" ) +set ( COLAMD_DATE "Jan 20, 2024" ) set ( COLAMD_VERSION_MAJOR 3 CACHE STRING "" FORCE ) set ( COLAMD_VERSION_MINOR 3 CACHE STRING "" FORCE ) -set ( COLAMD_VERSION_SUB 1 CACHE STRING "" FORCE ) +set ( COLAMD_VERSION_SUB 2 CACHE STRING "" FORCE ) message ( STATUS "Building COLAMD version: v" ${COLAMD_VERSION_MAJOR}. @@ -43,10 +43,10 @@ include ( SuiteSparsePolicy ) #------------------------------------------------------------------------------- if ( NOT SUITESPARSE_ROOT_CMAKELISTS ) - find_package ( SuiteSparse_config 7.5.0 + find_package ( SuiteSparse_config 7.6.0 PATHS ${CMAKE_SOURCE_DIR}/../SuiteSparse_config/build NO_DEFAULT_PATH ) if ( NOT TARGET SuiteSparse::SuiteSparseConfig ) - find_package ( SuiteSparse_config 7.5.0 REQUIRED ) + find_package ( SuiteSparse_config 7.6.0 REQUIRED ) endif ( ) endif ( ) diff --git a/COLAMD/Config/colamd.h.in b/COLAMD/Config/colamd.h.in index 3b751af808..2d9a0c07f7 100644 --- a/COLAMD/Config/colamd.h.in +++ b/COLAMD/Config/colamd.h.in @@ -75,8 +75,8 @@ #define COLAMD__VERSION SUITESPARSE__VERCODE(@COLAMD_VERSION_MAJOR@,@COLAMD_VERSION_MINOR@,@COLAMD_VERSION_SUB@) #if !defined (SUITESPARSE__VERSION) || \ - (SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,5,0)) -#error "COLAMD @COLAMD_VERSION_MAJOR@.@COLAMD_VERSION_MINOR@.@COLAMD_VERSION_SUB@ requires SuiteSparse_config 7.5.0 or later" + (SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,6,0)) +#error "COLAMD @COLAMD_VERSION_MAJOR@.@COLAMD_VERSION_MINOR@.@COLAMD_VERSION_SUB@ requires SuiteSparse_config 7.6.0 or later" #endif /* ========================================================================== */ diff --git a/COLAMD/Doc/ChangeLog b/COLAMD/Doc/ChangeLog index 65d4e55aa8..9904dacaf3 100644 --- a/COLAMD/Doc/ChangeLog +++ b/COLAMD/Doc/ChangeLog @@ -1,3 +1,7 @@ +Jan 20, 2024: version 3.3.2 + + * minor updates to build system + Jan 10, 2024: version 3.3.1 * minor updates to build system diff --git a/COLAMD/Include/colamd.h b/COLAMD/Include/colamd.h index adea8c314a..93c2c08eba 100644 --- a/COLAMD/Include/colamd.h +++ b/COLAMD/Include/colamd.h @@ -65,18 +65,18 @@ * Versions 2.3 and earlier of COLAMD do not include a #define'd version number. */ -#define COLAMD_DATE "Jan 10, 2024" +#define COLAMD_DATE "Jan 20, 2024" #define COLAMD_MAIN_VERSION 3 #define COLAMD_SUB_VERSION 3 -#define COLAMD_SUBSUB_VERSION 1 +#define COLAMD_SUBSUB_VERSION 2 #define COLAMD_VERSION_CODE(main,sub) SUITESPARSE_VER_CODE(main,sub) #define COLAMD_VERSION COLAMD_VERSION_CODE(3,3) -#define COLAMD__VERSION SUITESPARSE__VERCODE(3,3,1) +#define COLAMD__VERSION SUITESPARSE__VERCODE(3,3,2) #if !defined (SUITESPARSE__VERSION) || \ - (SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,5,0)) -#error "COLAMD 3.3.1 requires SuiteSparse_config 7.5.0 or later" + (SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,6,0)) +#error "COLAMD 3.3.2 requires SuiteSparse_config 7.6.0 or later" #endif /* ========================================================================== */ diff --git a/COLAMD/Makefile b/COLAMD/Makefile index 8c541b1d8f..787ee26f3b 100644 --- a/COLAMD/Makefile +++ b/COLAMD/Makefile @@ -64,7 +64,7 @@ remake: # just run cmake to set things up setup: - ( cd build ; cmake $(CMAKE_OPTIONS) .. ) + ( cd build && cmake $(CMAKE_OPTIONS) .. ) install: ( cd build && cmake --install . ) diff --git a/ChangeLog b/ChangeLog index 3d5b4d3a94..0f1eb87902 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,20 +2,22 @@ Jan 20, 2024: version 7.6.0 * CHOLMOD 5.2.0: bug fix (restore ABI compatibility with 5.0.x, i.e., 5.2.0 is ABI incompatible to 5.1.x) - * SuiteSparse_config 7.6.0: no change except version number + * SuiteSparse_config 7.6.0, Mongoose 3.3.2, COLAMD 3.3.2, CCOLAMD 3.3.2: + port Makefile to Windows * SPQR 4.3.2: remove unused parameters * LAGraph 1.1.2, CSparse 4.3.1, ParU 0.1.2, GraphBLAS 9.0.1: minor updates to build system - * Example 1.6.2, UMFPACK 6.3.2, KLU 2.3.2: revise version numbers of - dependent packages + * Example 1.6.2, UMFPACK 6.3.2, KLU 2.3.2, SuiteSparse_Mongoose 3.3.2, + SPEX 2.3.2: revise version numbers of dependent packages + * AMD, BTF, CAMD, CXSparse, LDL, RBio: unchanged * Package versions in this release: SuiteSparse_config 7.6.0 AMD 3.3.1 BTF 2.3.1 CAMD 3.3.1 - CCOLAMD 3.3.1 + CCOLAMD 3.3.2 CHOLMOD 5.2.0 - COLAMD 3.3.1 + COLAMD 3.3.2 CSparse 4.3.1 CXSparse 4.3.1 Example 1.6.2 @@ -23,10 +25,10 @@ Jan 20, 2024: version 7.6.0 KLU 2.3.2 LDL 3.3.1 LAGraph 1.1.2 - SuiteSparse_Mongoose 3.3.1 + SuiteSparse_Mongoose 3.3.2 ParU 0.1.2 RBio 4.3.1 - SPEX 2.3.1 + SPEX 2.3.2 SPQR 4.3.2 UMFPACK 6.3.2 diff --git a/Example/CMakeLists.txt b/Example/CMakeLists.txt index 3295f13b4c..85cb7d81e0 100644 --- a/Example/CMakeLists.txt +++ b/Example/CMakeLists.txt @@ -91,19 +91,19 @@ find_package ( SuiteSparse_config 7.6.0 REQUIRED ) find_package ( AMD 3.3.1 REQUIRED ) find_package ( BTF 2.3.1 REQUIRED ) find_package ( CAMD 3.3.1 REQUIRED ) -find_package ( CCOLAMD 3.3.1 REQUIRED ) +find_package ( CCOLAMD 3.3.2 REQUIRED ) find_package ( CHOLMOD 5.2.0 REQUIRED ) -find_package ( COLAMD 3.3.1 REQUIRED ) +find_package ( COLAMD 3.3.2 REQUIRED ) find_package ( CXSparse 4.3.1 REQUIRED ) find_package ( GraphBLAS 9.0.1 ) find_package ( KLU 2.3.2 REQUIRED ) find_package ( KLU_CHOLMOD 2.3.2 REQUIRED ) find_package ( LDL 3.3.1 REQUIRED ) find_package ( LAGraph 1.1.2 ) -find_package ( SuiteSparse_Mongoose 3.3.1 REQUIRED ) +find_package ( SuiteSparse_Mongoose 3.3.2 REQUIRED ) find_package ( ParU 0.1.2 REQUIRED ) find_package ( RBio 4.3.1 REQUIRED ) -find_package ( SPEX 2.3.1 REQUIRED ) # requires GMP and MPFR +find_package ( SPEX 2.3.2 REQUIRED ) # requires GMP and MPFR find_package ( SPQR 4.3.2 REQUIRED ) find_package ( UMFPACK 6.3.2 REQUIRED ) diff --git a/Example/Include/my_internal.h b/Example/Include/my_internal.h index 63451dc137..e1c1b60c5f 100644 --- a/Example/Include/my_internal.h +++ b/Example/Include/my_internal.h @@ -34,8 +34,8 @@ #endif #include "ccolamd.h" -#if !defined (CCOLAMD__VERSION) || CCOLAMD__VERSION < SUITESPARSE__VERCODE(3,3,1) -#error "This library requires CCOLAMD 3.3.1 or later" +#if !defined (CCOLAMD__VERSION) || CCOLAMD__VERSION < SUITESPARSE__VERCODE(3,3,2) +#error "This library requires CCOLAMD 3.3.2 or later" #endif #include "cholmod.h" @@ -44,8 +44,8 @@ #endif #include "colamd.h" -#if !defined (COLAMD__VERSION) || COLAMD__VERSION < SUITESPARSE__VERCODE(3,3,1) -#error "This library requires COLAMD 3.3.1 or later" +#if !defined (COLAMD__VERSION) || COLAMD__VERSION < SUITESPARSE__VERCODE(3,3,2) +#error "This library requires COLAMD 3.3.2 or later" #endif #include "cs.h" @@ -103,8 +103,8 @@ #include "SuiteSparseQR.hpp" #include "Mongoose.hpp" - #if !defined (Mongoose__VERSION) || Mongoose__VERSION < SUITESPARSE__VERCODE(3,3,1) - #error "This library requires Mongoose 3.3.1 or later" + #if !defined (Mongoose__VERSION) || Mongoose__VERSION < SUITESPARSE__VERCODE(3,3,2) + #error "This library requires Mongoose 3.3.2 or later" #endif #endif diff --git a/GraphBLAS/GraphBLAS/Makefile b/GraphBLAS/GraphBLAS/Makefile index 165da86343..e881460b23 100644 --- a/GraphBLAS/GraphBLAS/Makefile +++ b/GraphBLAS/GraphBLAS/Makefile @@ -44,7 +44,7 @@ remake: # just run cmake; do not compile setup: - ( cd build ; cmake $(CMAKE_OPTIONS) .. ; ) + ( cd build && cmake $(CMAKE_OPTIONS) .. ; ) # installs GraphBLAS to the install location defined by cmake, usually # /usr/local/lib and /usr/local/include diff --git a/GraphBLAS/cpu_features/Makefile b/GraphBLAS/cpu_features/Makefile index ec2de5a1f1..3de4ff6175 100644 --- a/GraphBLAS/cpu_features/Makefile +++ b/GraphBLAS/cpu_features/Makefile @@ -9,7 +9,7 @@ go: distclean: purge install: - ( cd build ; make install ) + ( cd build && make install ) purge: - rm -rf ./build/* diff --git a/KLU/CMakeLists.txt b/KLU/CMakeLists.txt index 4d3e88abcb..05025e37f1 100644 --- a/KLU/CMakeLists.txt +++ b/KLU/CMakeLists.txt @@ -55,16 +55,16 @@ if ( NOT SUITESPARSE_ROOT_CMAKELISTS ) find_package ( AMD 3.3.1 REQUIRED ) endif ( ) - find_package ( COLAMD 3.3.1 + find_package ( COLAMD 3.3.2 PATHS ${CMAKE_SOURCE_DIR}/../COLAMD/build NO_DEFAULT_PATH ) if ( NOT TARGET SuiteSparse::COLAMD ) - find_package ( COLAMD 3.3.1 REQUIRED ) + find_package ( COLAMD 3.3.2 REQUIRED ) endif ( ) - find_package ( BTF 2.3.0 + find_package ( BTF 2.3.1 PATHS ${CMAKE_SOURCE_DIR}/../BTF/build NO_DEFAULT_PATH ) if ( NOT TARGET SuiteSparse::BTF ) - find_package ( BTF 2.3.0 REQUIRED ) + find_package ( BTF 2.3.1 REQUIRED ) endif ( ) endif ( ) diff --git a/KLU/Config/klu.h.in b/KLU/Config/klu.h.in index eea73901ba..1f02c4be5f 100644 --- a/KLU/Config/klu.h.in +++ b/KLU/Config/klu.h.in @@ -843,8 +843,8 @@ void klu_version (int version [3]) ; #endif #if !defined (COLAMD__VERSION) || \ - (COLAMD__VERSION < SUITESPARSE__VERCODE(3,3,1)) -#error "KLU @KLU_VERSION_MAJOR@.@KLU_VERSION_MINOR@.@KLU_VERSION_SUB@ requires COLAMD 3.3.1 or later" + (COLAMD__VERSION < SUITESPARSE__VERCODE(3,3,2)) +#error "KLU @KLU_VERSION_MAJOR@.@KLU_VERSION_MINOR@.@KLU_VERSION_SUB@ requires COLAMD 3.3.2 or later" #endif #if !defined (BTF__VERSION) || \ diff --git a/KLU/Include/klu.h b/KLU/Include/klu.h index 70e2c4a119..22155ff8b5 100644 --- a/KLU/Include/klu.h +++ b/KLU/Include/klu.h @@ -843,8 +843,8 @@ void klu_version (int version [3]) ; #endif #if !defined (COLAMD__VERSION) || \ - (COLAMD__VERSION < SUITESPARSE__VERCODE(3,3,1)) -#error "KLU 2.3.2 requires COLAMD 3.3.1 or later" + (COLAMD__VERSION < SUITESPARSE__VERCODE(3,3,2)) +#error "KLU 2.3.2 requires COLAMD 3.3.2 or later" #endif #if !defined (BTF__VERSION) || \ diff --git a/LAGraph/Makefile b/LAGraph/Makefile index 2f91ff5fc4..dcbd44ac9e 100644 --- a/LAGraph/Makefile +++ b/LAGraph/Makefile @@ -85,10 +85,10 @@ remake: # just run cmake to set things up setup: - ( cd build ; cmake $(CMAKE_OPTIONS) .. ) + ( cd build && cmake $(CMAKE_OPTIONS) .. ) install: - ( cd build ; cmake --install . ) + ( cd build && cmake --install . ) # remove any installed libraries and #include files uninstall: diff --git a/Makefile b/Makefile index bd3fd7c25f..0b1d0d81d6 100644 --- a/Makefile +++ b/Makefile @@ -58,7 +58,8 @@ local: ( cd CAMD && $(MAKE) local ) ( cd CCOLAMD && $(MAKE) local ) ( cd CHOLMOD && $(MAKE) local ) - ( cd CSparse && $(MAKE) ) # CSparse is compiled but not installed + ( cd CSparse && $(MAKE) ) +# CSparse is compiled but not installed ( cd CXSparse && $(MAKE) local ) ( cd LDL && $(MAKE) local ) ( cd KLU && $(MAKE) local ) @@ -81,7 +82,8 @@ global: ( cd CAMD && $(MAKE) global ) ( cd CCOLAMD && $(MAKE) global ) ( cd CHOLMOD && $(MAKE) global ) - ( cd CSparse && $(MAKE) ) # CSparse is compiled but not installed + ( cd CSparse && $(MAKE) ) +# CSparse is compiled but not installed ( cd CXSparse && $(MAKE) global ) ( cd LDL && $(MAKE) global ) ( cd KLU && $(MAKE) global ) @@ -103,7 +105,8 @@ install: ( cd CAMD && $(MAKE) install ) ( cd CCOLAMD && $(MAKE) install ) ( cd CHOLMOD && $(MAKE) install ) - ( cd CXSparse && $(MAKE) install ) # CXSparse is installed instead + ( cd CXSparse && $(MAKE) install ) +# CXSparse is installed instead ( cd LDL && $(MAKE) install ) ( cd KLU && $(MAKE) install ) ( cd UMFPACK && $(MAKE) install ) diff --git a/Mongoose/CMakeLists.txt b/Mongoose/CMakeLists.txt index c65f218261..b8820f4601 100644 --- a/Mongoose/CMakeLists.txt +++ b/Mongoose/CMakeLists.txt @@ -35,11 +35,11 @@ cmake_minimum_required ( VERSION 3.22 ) -set ( Mongoose_DATE "Jan 10, 2024" ) -set ( Mongoose_NUMERIC_DATE "2024-01-10" ) +set ( Mongoose_DATE "Jan 20, 2024" ) +set ( Mongoose_NUMERIC_DATE "2024-01-20" ) set ( Mongoose_VERSION_MAJOR 3 CACHE STRING "" FORCE ) set ( Mongoose_VERSION_MINOR 3 CACHE STRING "" FORCE ) -set ( Mongoose_VERSION_PATCH 1 CACHE STRING "" FORCE ) +set ( Mongoose_VERSION_PATCH 2 CACHE STRING "" FORCE ) message ( STATUS "Building Mongoose version: v" ${Mongoose_VERSION_MAJOR}. @@ -69,10 +69,10 @@ include ( SuiteSparsePolicy ) #------------------------------------------------------------------------------- if ( NOT SUITESPARSE_ROOT_CMAKELISTS ) - find_package ( SuiteSparse_config 7.5.0 + find_package ( SuiteSparse_config 7.6.0 PATHS ${CMAKE_SOURCE_DIR}/../SuiteSparse_config/build NO_DEFAULT_PATH ) if ( NOT TARGET SuiteSparse::SuiteSparseConfig ) - find_package ( SuiteSparse_config 7.5.0 REQUIRED ) + find_package ( SuiteSparse_config 7.6.0 REQUIRED ) endif ( ) endif ( ) diff --git a/Mongoose/Doc/ChangeLog b/Mongoose/Doc/ChangeLog index f1a493db07..8b4503454f 100644 --- a/Mongoose/Doc/ChangeLog +++ b/Mongoose/Doc/ChangeLog @@ -1,3 +1,7 @@ +Jan 20, 2024: version 3.3.2 + + * minor updates to build system + Jan 10, 2024: version 3.3.1 * minor update to build system diff --git a/Mongoose/Doc/title-info.tex b/Mongoose/Doc/title-info.tex index 17a35c4175..4388410005 100644 --- a/Mongoose/Doc/title-info.tex +++ b/Mongoose/Doc/title-info.tex @@ -1,3 +1,3 @@ -\title{Mongoose User Guide, Version 3.3.1} +\title{Mongoose User Guide, Version 3.3.2} \author{Scott Kolodziej, Nuri Yeralan, Tim Davis, William W. Hager} -\date{Jan 10, 2024} +\date{Jan 20, 2024} diff --git a/Mongoose/Include/Mongoose.hpp b/Mongoose/Include/Mongoose.hpp index 7e87dc8fb8..cbdad85db5 100644 --- a/Mongoose/Include/Mongoose.hpp +++ b/Mongoose/Include/Mongoose.hpp @@ -20,13 +20,13 @@ // Configuration information from CMake #define Mongoose_VERSION_MAJOR 3 #define Mongoose_VERSION_MINOR 3 -#define Mongoose_VERSION_PATCH 1 -#define Mongoose_DATE "Jan 10, 2024" +#define Mongoose_VERSION_PATCH 2 +#define Mongoose_DATE "Jan 20, 2024" -#define Mongoose__VERSION SUITESPARSE__VERCODE(3,3,1) +#define Mongoose__VERSION SUITESPARSE__VERCODE(3,3,2) #if !defined (SUITESPARSE__VERSION) || \ - (SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,5,0)) -#error "Mongoose 3.3.1 requires SuiteSparse_config 7.5.0 or later" + (SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,6,0)) +#error "Mongoose 3.3.2 requires SuiteSparse_config 7.6.0 or later" #endif #if defined (_MSC_VER) && ! defined (__INTEL_COMPILER) diff --git a/Mongoose/Makefile b/Mongoose/Makefile index 3918e3a03e..65060e68a5 100644 --- a/Mongoose/Makefile +++ b/Mongoose/Makefile @@ -47,7 +47,7 @@ global: # build the Mongoose library (static and dynamic) and run a quick test demos: library - ( cd build ; ./demo ) + ( cd build && ./demo ) ( cd build && ctest . || ctest . --rerun-failed --output-on-failure ) # the same as "make library" @@ -60,7 +60,7 @@ install: # create the Doc/Mongoose_UserGuide.pdf docs: - ( cd build ; cmake $(CMAKE_OPTIONS) .. ; cmake --build . --target userguide ) + ( cd build && cmake $(CMAKE_OPTIONS) .. ; cmake --build . --target userguide ) # remove any installed libraries and #include files uninstall: @@ -68,7 +68,7 @@ uninstall: # run the extensive tests test: - ( cd build ; cmake $(CMAKE_OPTIONS) .. ; ctest . ) + ( cd build && cmake $(CMAKE_OPTIONS) .. ; ctest . ) clean: distclean diff --git a/Mongoose/Version/Mongoose.hpp.in b/Mongoose/Version/Mongoose.hpp.in index 3956f03839..4fe1891703 100644 --- a/Mongoose/Version/Mongoose.hpp.in +++ b/Mongoose/Version/Mongoose.hpp.in @@ -25,8 +25,8 @@ #define Mongoose__VERSION SUITESPARSE__VERCODE(@Mongoose_VERSION_MAJOR@,@Mongoose_VERSION_MINOR@,@Mongoose_VERSION_PATCH@) #if !defined (SUITESPARSE__VERSION) || \ - (SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,5,0)) -#error "Mongoose @Mongoose_VERSION_MAJOR@.@Mongoose_VERSION_MINOR@.@Mongoose_VERSION_PATCH@ requires SuiteSparse_config 7.5.0 or later" + (SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,6,0)) +#error "Mongoose @Mongoose_VERSION_MAJOR@.@Mongoose_VERSION_MINOR@.@Mongoose_VERSION_PATCH@ requires SuiteSparse_config 7.6.0 or later" #endif #if defined (_MSC_VER) && ! defined (__INTEL_COMPILER) diff --git a/Mongoose/codemeta.json b/Mongoose/codemeta.json index 8a689ede68..9a8ad464c4 100644 --- a/Mongoose/codemeta.json +++ b/Mongoose/codemeta.json @@ -7,8 +7,8 @@ "codeRepository": "https://github.com/ScottKolo/Mongoose", "issueTracker": "https://github.com/ScottKolo/Mongoose/issues", "license": "https://spdx.org/licenses/GPL-3.0-only.html", - "version": "3.3.1", - "softwareVersion": "3.3.1", + "version": "3.3.2", + "softwareVersion": "3.3.2", "author": [ { "@type": "Person", @@ -47,7 +47,7 @@ }, "contIntegration": "https://travis-ci.com/ScottKolo/Mongoose", "developmentStatus": "active", - "downloadUrl": "https://github.com/ScottKolo/Mongoose/archive/v3.3.1.zip", + "downloadUrl": "https://github.com/ScottKolo/Mongoose/archive/v3.3.2.zip", "funding":"Office of Naval Research grant N00014-11-1-0068", "funding":"Office of Naval Research grant N00014-15-1-2048", "funding":"Office of Naval Research grant N00014-18-1-2100", @@ -66,7 +66,7 @@ ], "dateCreated":"2018-04-09", "datePublished":"2018-05-25", - "dateModified":"2024-01-10", + "dateModified":"2024-01-20", "programmingLanguage": "C++", "programmingLanguage": "MATLAB" } diff --git a/README.md b/README.md index 82dea3805f..29c74df122 100644 --- a/README.md +++ b/README.md @@ -686,9 +686,7 @@ papers in ACM TOMS, for each package. About the BLAS and LAPACK libraries ----------------------------------------------------------------------------- -NOTE: Use of the Intel MKL BLAS is strongly recommended. In a 2019 test, -OpenBLAS caused severe performance degradation. The reason for this is being -investigated, and this may be resolved in the future. +NOTE: if you use OpenBLAS, be sure to use version 0.3.27 or later. To select your BLAS/LAPACK, see the instructions in SuiteSparseBLAS.cmake in `SuiteSparse_config/cmake_modules`. If `SuiteSparse_config` finds a BLAS with @@ -794,11 +792,7 @@ for example, which changes the compiler to gcc and g++. This will work on Linux/Unix and the Mac. It should automatically detect if you have the Intel compilers or not, and whether or not you have CUDA. -NOTE: Use of the Intel MKL BLAS is strongly recommended. The OpenBLAS can -(rarely) result in severe performance degradation, in CHOLMOD in particular. -The reason for this is still under investigation and might already be resolved -in the current version of OpenBLAS. See -`SuiteSparse_config/cmake_modules/SuiteSparsePolicy.cmake` to select your BLAS. +See `SuiteSparse_config/cmake_modules/SuiteSparsePolicy.cmake` to select your BLAS. You may also need to add SuiteSparse/lib to your path. If your copy of SuiteSparse is in /home/me/SuiteSparse, for example, then add this to your diff --git a/SPEX/CMakeLists.txt b/SPEX/CMakeLists.txt index b7b6544114..bf95b7e4b4 100644 --- a/SPEX/CMakeLists.txt +++ b/SPEX/CMakeLists.txt @@ -12,10 +12,10 @@ cmake_minimum_required ( VERSION 3.22 ) -set ( SPEX_DATE "Jan 10, 2024" ) +set ( SPEX_DATE "Jan 20, 2024" ) set ( SPEX_VERSION_MAJOR 2 CACHE STRING "" FORCE ) set ( SPEX_VERSION_MINOR 3 CACHE STRING "" FORCE ) -set ( SPEX_VERSION_SUB 1 CACHE STRING "" FORCE ) +set ( SPEX_VERSION_SUB 2 CACHE STRING "" FORCE ) message ( STATUS "Building SPEX version: v" ${SPEX_VERSION_MAJOR}. @@ -45,10 +45,10 @@ include ( SuiteSparsePolicy ) #------------------------------------------------------------------------------- if ( NOT SUITESPARSE_ROOT_CMAKELISTS ) - find_package ( SuiteSparse_config 7.5.0 + find_package ( SuiteSparse_config 7.6.0 PATHS ${CMAKE_SOURCE_DIR}/../SuiteSparse_config/build NO_DEFAULT_PATH ) if ( NOT TARGET SuiteSparse::SuiteSparseConfig ) - find_package ( SuiteSparse_config 7.5.0 REQUIRED ) + find_package ( SuiteSparse_config 7.6.0 REQUIRED ) endif ( ) find_package ( AMD 3.3.1 @@ -57,10 +57,10 @@ if ( NOT SUITESPARSE_ROOT_CMAKELISTS ) find_package ( AMD 3.3.1 REQUIRED ) endif ( ) - find_package ( COLAMD 3.3.1 + find_package ( COLAMD 3.3.2 PATHS ${CMAKE_SOURCE_DIR}/../COLAMD/build NO_DEFAULT_PATH ) if ( NOT TARGET SuiteSparse::COLAMD ) - find_package ( COLAMD 3.3.1 REQUIRED ) + find_package ( COLAMD 3.3.2 REQUIRED ) endif ( ) endif ( ) diff --git a/SPEX/Config/SPEX.h.in b/SPEX/Config/SPEX.h.in index 99a3943a58..6f46f2f110 100644 --- a/SPEX/Config/SPEX.h.in +++ b/SPEX/Config/SPEX.h.in @@ -267,8 +267,8 @@ #define SPEX__VERSION SUITESPARSE__VERCODE(@SPEX_VERSION_MAJOR@,@SPEX_VERSION_MINOR@,@SPEX_VERSION_SUB@) #if !defined (SUITESPARSE__VERSION) || \ - (SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,5,0)) -#error "SPEX @SPEX_VERSION_MAJOR@.@SPEX_VERSION_MINOR@.@SPEX_VERSION_SUB@ requires SuiteSparse_config 7.5.0 or later" + (SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,6,0)) +#error "SPEX @SPEX_VERSION_MAJOR@.@SPEX_VERSION_MINOR@.@SPEX_VERSION_SUB@ requires SuiteSparse_config 7.6.0 or later" #endif #if defined ( __cplusplus ) diff --git a/SPEX/Doc/SPEX_version.tex b/SPEX/Doc/SPEX_version.tex index 51c9ad457b..041cc55a18 100644 --- a/SPEX/Doc/SPEX_version.tex +++ b/SPEX/Doc/SPEX_version.tex @@ -1,2 +1,2 @@ % version of SuiteSparse/SPEX -VERSION 2.3.1, Jan 10, 2024 +VERSION 2.3.2, Jan 20, 2024 diff --git a/SPEX/Include/SPEX.h b/SPEX/Include/SPEX.h index af10fd0934..edfc198353 100644 --- a/SPEX/Include/SPEX.h +++ b/SPEX/Include/SPEX.h @@ -259,16 +259,16 @@ // Version //------------------------------------------------------------------------------ -#define SPEX_DATE "Jan 10, 2024" -#define SPEX_VERSION "2.3.1" +#define SPEX_DATE "Jan 20, 2024" +#define SPEX_VERSION "2.3.2" #define SPEX_VERSION_MAJOR 2 #define SPEX_VERSION_MINOR 3 -#define SPEX_VERSION_SUB 1 +#define SPEX_VERSION_SUB 2 -#define SPEX__VERSION SUITESPARSE__VERCODE(2,3,1) +#define SPEX__VERSION SUITESPARSE__VERCODE(2,3,2) #if !defined (SUITESPARSE__VERSION) || \ - (SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,5,0)) -#error "SPEX 2.3.1 requires SuiteSparse_config 7.5.0 or later" + (SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,6,0)) +#error "SPEX 2.3.2 requires SuiteSparse_config 7.6.0 or later" #endif #if defined ( __cplusplus ) diff --git a/SuiteSparse_config/Config/README.md.in b/SuiteSparse_config/Config/README.md.in index 7051d0554e..bc0c9142fa 100644 --- a/SuiteSparse_config/Config/README.md.in +++ b/SuiteSparse_config/Config/README.md.in @@ -686,9 +686,7 @@ papers in ACM TOMS, for each package. About the BLAS and LAPACK libraries ----------------------------------------------------------------------------- -NOTE: Use of the Intel MKL BLAS is strongly recommended. In a 2019 test, -OpenBLAS caused severe performance degradation. The reason for this is being -investigated, and this may be resolved in the future. +NOTE: if you use OpenBLAS, be sure to use version 0.3.27 or later. To select your BLAS/LAPACK, see the instructions in SuiteSparseBLAS.cmake in `SuiteSparse_config/cmake_modules`. If `SuiteSparse_config` finds a BLAS with @@ -794,11 +792,7 @@ for example, which changes the compiler to gcc and g++. This will work on Linux/Unix and the Mac. It should automatically detect if you have the Intel compilers or not, and whether or not you have CUDA. -NOTE: Use of the Intel MKL BLAS is strongly recommended. The OpenBLAS can -(rarely) result in severe performance degradation, in CHOLMOD in particular. -The reason for this is still under investigation and might already be resolved -in the current version of OpenBLAS. See -`SuiteSparse_config/cmake_modules/SuiteSparsePolicy.cmake` to select your BLAS. +See `SuiteSparse_config/cmake_modules/SuiteSparsePolicy.cmake` to select your BLAS. You may also need to add SuiteSparse/lib to your path. If your copy of SuiteSparse is in /home/me/SuiteSparse, for example, then add this to your diff --git a/SuiteSparse_config/Config/SuiteSparse_config.h.in b/SuiteSparse_config/Config/SuiteSparse_config.h.in index f9cb67da4c..0d203f55e6 100644 --- a/SuiteSparse_config/Config/SuiteSparse_config.h.in +++ b/SuiteSparse_config/Config/SuiteSparse_config.h.in @@ -545,12 +545,12 @@ int SuiteSparse_version // returns SUITESPARSE_VERSION // If the suffix does not contain "_", use (Sun Perf., for example): -// cd build ; cmake -DBLAS64_SUFFIX="64" .. +// cd build && cmake -DBLAS64_SUFFIX="64" .. // If the suffix contains "_" (OpenBLAS in spack for example), use the // following: -// cd build ; cmake -DBLAS64_SUFFIX="_64" .. +// cd build && cmake -DBLAS64_SUFFIX="_64" .. // This setting could be used by the spack packaging of SuiteSparse when linked // with the spack-installed OpenBLAS with 64-bit integers. See diff --git a/SuiteSparse_config/Makefile b/SuiteSparse_config/Makefile index 4439708714..a14ac2fdf4 100644 --- a/SuiteSparse_config/Makefile +++ b/SuiteSparse_config/Makefile @@ -48,7 +48,7 @@ global: ( cd build && cmake $(CMAKE_OPTIONS) -USUITESPARSE_PKGFILEDIR -DSUITESPARSE_LOCAL_INSTALL=0 .. && cmake --build . --config Release -j${JOBS} ) debug: - ( cd build ; cmake $(CMAKE_OPTIONS) -DCMAKE_BUILD_TYPE=Debug .. ; cmake --build . --config Debug ) + ( cd build && cmake $(CMAKE_OPTIONS) -DCMAKE_BUILD_TYPE=Debug .. ; cmake --build . --config Debug ) all: library @@ -56,14 +56,14 @@ demos: library # just compile after running cmake; do not run cmake again remake: - ( cd build ; cmake --build . ) + ( cd build && cmake --build . ) # just run cmake to set things up setup: - ( cd build ; cmake $(CMAKE_OPTIONS) .. ) + ( cd build && cmake $(CMAKE_OPTIONS) .. ) install: - ( cd build ; cmake --install . ) + ( cd build && cmake --install . ) # remove any installed libraries and #include files uninstall: diff --git a/SuiteSparse_config/SuiteSparse_config.h b/SuiteSparse_config/SuiteSparse_config.h index b8d779ef72..01ce98c5c8 100644 --- a/SuiteSparse_config/SuiteSparse_config.h +++ b/SuiteSparse_config/SuiteSparse_config.h @@ -545,12 +545,12 @@ int SuiteSparse_version // returns SUITESPARSE_VERSION // If the suffix does not contain "_", use (Sun Perf., for example): -// cd build ; cmake -DBLAS64_SUFFIX="64" .. +// cd build && cmake -DBLAS64_SUFFIX="64" .. // If the suffix contains "_" (OpenBLAS in spack for example), use the // following: -// cd build ; cmake -DBLAS64_SUFFIX="_64" .. +// cd build && cmake -DBLAS64_SUFFIX="_64" .. // This setting could be used by the spack packaging of SuiteSparse when linked // with the spack-installed OpenBLAS with 64-bit integers. See diff --git a/SuiteSparse_config/cmake_modules/SuiteSparseBLAS.cmake b/SuiteSparse_config/cmake_modules/SuiteSparseBLAS.cmake index be7cd2e739..adcd4266f0 100644 --- a/SuiteSparse_config/cmake_modules/SuiteSparseBLAS.cmake +++ b/SuiteSparse_config/cmake_modules/SuiteSparseBLAS.cmake @@ -50,7 +50,7 @@ endif ( ) # To request specific BLAS, use either (for example): # # CMAKE_OPTIONS="-DBLA_VENDOR=Apple" make -# cd build ; cmake -DBLA_VENDOR=Apple .. ; make +# cd build && cmake -DBLA_VENDOR=Apple .. ; make # # Use SUITESPARSE_USE_64BIT_BLAS to select 64-bit or 32-bit BLAS. If # BLA_VENDOR is also defined, this setting is strictly enforced. If set to diff --git a/SuiteSparse_config/cmake_modules/SuiteSparseBLAS64.cmake b/SuiteSparse_config/cmake_modules/SuiteSparseBLAS64.cmake index 1a5c636901..72efcd5ce0 100644 --- a/SuiteSparse_config/cmake_modules/SuiteSparseBLAS64.cmake +++ b/SuiteSparse_config/cmake_modules/SuiteSparseBLAS64.cmake @@ -25,12 +25,12 @@ set ( SuiteSparse_BLAS_integer "int64_t" ) # If the suffix does not contain "_", use (Sun Perf., for example): -# cd build ; cmake -DBLAS64_SUFFIX="64" .. +# cd build && cmake -DBLAS64_SUFFIX="64" .. # If the suffix contains "_" (OpenBLAS in spack for example), use the # following: -# cd build ; cmake -DBLAS64_SUFFIX="_64" .. +# cd build && cmake -DBLAS64_SUFFIX="_64" .. # This setting could be used by the spack packaging of SuiteSparse when linked # with the spack-installed OpenBLAS with 64-bit integers. See