Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ParU 1.0.0 for SuiteSparse 7.8.3 #868

Open
wants to merge 7 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,35 @@
Oct 10, 2024: version 7.8.3

* ParU 1.0.0: first stable release. No change since last version
v0.3.0, except for date, version, and updates to the User Guide.
* UMFPACK 6.3.5: a few typos in comments and user guide; no change to code
* SuiteSparse_config and Example: revised to reflect ParU 1.0.0.
* SuiteSparse_config.h: removed inclusion of MATLAB mex.h in
SuiteSparse_config.h (conflicts with C++ mex files)
* KLU and RBio: revised mexFunctions to handle change in
SuiteSparse_config.h
* 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.5 *
LDL 3.3.2
LAGraph 1.1.4
SuiteSparse_Mongoose 3.3.4
ParU 1.0.0 *
RBio 4.3.4 *
SPEX 3.2.1
SPQR 4.3.4
UMFPACK 6.3.5 *

Aug 20, 2024: version 7.8.2

* LAGraph 1.1.4: bug fix for LAGraph_MMWrite when matrix is dense
Expand Down
16 changes: 8 additions & 8 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 "Oct 10, 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 @@ -96,16 +96,16 @@ find_package ( CHOLMOD 5.3.0 REQUIRED )
find_package ( COLAMD 3.3.4 REQUIRED )
find_package ( CXSparse 4.4.1 REQUIRED )
find_package ( GraphBLAS 9.3.1 )
find_package ( KLU 2.3.4 REQUIRED )
find_package ( KLU_CHOLMOD 2.3.4 REQUIRED )
find_package ( KLU 2.3.5 REQUIRED )
find_package ( KLU_CHOLMOD 2.3.5 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 ( RBio 4.3.3 REQUIRED )
find_package ( ParU 1.0.0 REQUIRED )
find_package ( RBio 4.3.4 REQUIRED )
find_package ( SPEX 3.2.1 REQUIRED ) # requires GMP and MPFR
find_package ( SPQR 4.3.4 REQUIRED )
find_package ( UMFPACK 6.3.4 REQUIRED )
find_package ( UMFPACK 6.3.5 REQUIRED )

# for GMP and MPFR
find_package ( MPFR 4.0.2 REQUIRED ) # from SPEX/cmake_modules
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 "Oct 10, 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
16 changes: 8 additions & 8 deletions Example/Include/my_internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

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

#include "amd.h"
Expand Down Expand Up @@ -69,8 +69,8 @@
#endif

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

#include "ldl.h"
Expand All @@ -79,8 +79,8 @@
#endif

#include "RBio.h"
#if !defined (RBIO__VERSION) || RBIO__VERSION < SUITESPARSE__VERCODE(4,3,3)
#error "This library requires RBio 4.3.3 or later"
#if !defined (RBIO__VERSION) || RBIO__VERSION < SUITESPARSE__VERCODE(4,3,4)
#error "This library requires RBio 4.3.4 or later"
#endif

#include "SPEX.h"
Expand All @@ -94,8 +94,8 @@
#endif

#include "umfpack.h"
#if !defined (UMFPACK__VERSION) || UMFPACK__VERSION < SUITESPARSE__VERCODE(6,3,4)
#error "This library requires UMFPACK 6.3.4 or later"
#if !defined (UMFPACK__VERSION) || UMFPACK__VERSION < SUITESPARSE__VERCODE(6,3,5)
#error "This library requires UMFPACK 6.3.5 or later"
#endif

// SuiteSparse include files for C++:
Expand Down
20 changes: 10 additions & 10 deletions KLU/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@

cmake_minimum_required ( VERSION 3.22 )

set ( KLU_DATE "June 20, 2024" )
set ( KLU_DATE "Oct 10, 2024" )
set ( KLU_VERSION_MAJOR 2 CACHE STRING "" FORCE )
set ( KLU_VERSION_MINOR 3 CACHE STRING "" FORCE )
set ( KLU_VERSION_SUB 4 CACHE STRING "" FORCE )
set ( KLU_VERSION_SUB 5 CACHE STRING "" FORCE )

message ( STATUS "Building KLU version: v"
${KLU_VERSION_MAJOR}.
Expand Down Expand Up @@ -43,22 +43,22 @@ include ( SuiteSparsePolicy )
#-------------------------------------------------------------------------------

if ( NOT SUITESPARSE_ROOT_CMAKELISTS )
find_package ( SuiteSparse_config 7.8.0
find_package ( SuiteSparse_config 7.8.3
PATHS ${CMAKE_SOURCE_DIR}/../SuiteSparse_config/build NO_DEFAULT_PATH )
if ( NOT TARGET SuiteSparse::SuiteSparseConfig )
find_package ( SuiteSparse_config 7.8.0 REQUIRED )
find_package ( SuiteSparse_config 7.8.3 REQUIRED )
endif ( )

find_package ( AMD 3.3.2
find_package ( AMD 3.3.3
PATHS ${CMAKE_SOURCE_DIR}/../AMD/build NO_DEFAULT_PATH )
if ( NOT TARGET SuiteSparse::AMD )
find_package ( AMD 3.3.2 REQUIRED )
find_package ( AMD 3.3.3 REQUIRED )
endif ( )

find_package ( COLAMD 3.3.3
find_package ( COLAMD 3.3.4
PATHS ${CMAKE_SOURCE_DIR}/../COLAMD/build NO_DEFAULT_PATH )
if ( NOT TARGET SuiteSparse::COLAMD )
find_package ( COLAMD 3.3.3 REQUIRED )
find_package ( COLAMD 3.3.4 REQUIRED )
endif ( )

find_package ( BTF 2.3.2
Expand All @@ -77,10 +77,10 @@ if ( SUITESPARSE_ROOT_CMAKELISTS )
else ( )
if ( KLU_USE_CHOLMOD )
# look for CHOLMOD (optional fill-reducing orderings)
find_package ( CHOLMOD 5.2.1
find_package ( CHOLMOD 5.3.0
PATHS ${CMAKE_SOURCE_DIR}/../CHOLMOD/build NO_DEFAULT_PATH )
if ( NOT TARGET SuiteSparse::CHOLMOD )
find_package ( CHOLMOD 5.2.1 )
find_package ( CHOLMOD 5.3.0 )
endif ( )
if ( NOT CHOLMOD_FOUND )
# CHOLMOD not found so disable it
Expand Down
4 changes: 2 additions & 2 deletions KLU/Config/klu.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -833,8 +833,8 @@ void klu_version (int version [3]) ;

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

#if !defined (AMD__VERSION) || \
Expand Down
5 changes: 5 additions & 0 deletions KLU/Doc/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
Oct 10, 2024: version 2.3.5

* MATLAB: revised mexFunction to account for change in
SuiteSparse_config.h

June 20, 2024: version 2.3.4

* minor update for MATLAB on Windows
Expand Down
Binary file modified KLU/Doc/KLU_UserGuide.pdf
Binary file not shown.
2 changes: 1 addition & 1 deletion KLU/Doc/klu_version.tex
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
% version of SuiteSparse/KLU
\date{VERSION 2.3.4, June 20, 2024}
\date{VERSION 2.3.5, Oct 10, 2024}
16 changes: 8 additions & 8 deletions KLU/Include/klu.h
Original file line number Diff line number Diff line change
Expand Up @@ -823,33 +823,33 @@ void klu_version (int version [3]) ;
* #endif
*/

#define KLU_DATE "June 20, 2024"
#define KLU_DATE "Oct 10, 2024"
#define KLU_MAIN_VERSION 2
#define KLU_SUB_VERSION 3
#define KLU_SUBSUB_VERSION 4
#define KLU_SUBSUB_VERSION 5

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

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

#if !defined (AMD__VERSION) || \
(AMD__VERSION < SUITESPARSE__VERCODE(3,3,3))
#error "KLU 2.3.4 requires AMD 3.3.3 or later"
#error "KLU 2.3.5 requires AMD 3.3.3 or later"
#endif

#if !defined (COLAMD__VERSION) || \
(COLAMD__VERSION < SUITESPARSE__VERCODE(3,3,4))
#error "KLU 2.3.4 requires COLAMD 3.3.4 or later"
#error "KLU 2.3.5 requires COLAMD 3.3.4 or later"
#endif

#if !defined (BTF__VERSION) || \
(BTF__VERSION < SUITESPARSE__VERCODE(2,3,2))
#error "KLU 2.3.4 requires BTF 2.3.2 or later"
#error "KLU 2.3.5 requires BTF 2.3.2 or later"
#endif

#endif
Expand Down
2 changes: 1 addition & 1 deletion KLU/MATLAB/klu_install.m
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ function klu_install (metis_path)
end

% compile KLU and add to the path
klu_make (metis_path) ;
klu_make ;
klu_path = pwd ;
addpath (klu_path)

Expand Down
1 change: 1 addition & 0 deletions KLU/MATLAB/klu_mex.c
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@

/* ========================================================================== */

#include "mex.h"
#include "klu.h"

#ifndef NCHOLMOD
Expand Down
10 changes: 5 additions & 5 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 Expand Up @@ -109,10 +109,10 @@ if ( NOT SUITESPARSE_ROOT_CMAKELISTS )
find_package ( CHOLMOD 5.3.0 REQUIRED )
endif ( )

find_package ( UMFPACK 6.3.3
find_package ( UMFPACK 6.3.5
PATHS ${CMAKE_SOURCE_DIR}/../UMFPACK/build NO_DEFAULT_PATH )
if ( NOT UMFPACK_FOUND )
find_package ( UMFPACK 6.3.3 REQUIRED )
find_package ( UMFPACK 6.3.5 REQUIRED )
endif ( )
endif ( )

Expand Down
8 changes: 4 additions & 4 deletions ParU/Config/ParU.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,13 @@ 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) || \
(UMFPACK__VERSION < SUITESPARSE__VERCODE(6,3,4))
#error "ParU @PARU_VERSION_MAJOR@.@PARU_VERSION_MINOR@.@PARU_VERSION_UPDATE@ requires UMFPACK 6.3.4 or later"
(UMFPACK__VERSION < SUITESPARSE__VERCODE(6,3,5))
#error "ParU @PARU_VERSION_MAJOR@.@PARU_VERSION_MINOR@.@PARU_VERSION_UPDATE@ requires UMFPACK 6.3.5 or later"
#endif

#if !defined (CHOLMOD__VERSION) || \
Expand Down
Binary file modified ParU/Doc/paru_user_guide.pdf
Binary file not shown.
Loading
Loading