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.

Sign up for GitHub

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

Jump to bottom

KLU 2.3.1 and UMFPACK 6.3.1 #674

Merged
merged 1 commit into from
Jan 1, 2024
Merged

KLU 2.3.1 and UMFPACK 6.3.1 #674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# SuiteSparse/CMakeLists.txt: root CMake build rules
#-------------------------------------------------------------------------------

# Copyright (c) 2023, Timothy A. Davis, All Rights Reserved.
# Copyright (c) 2023-2024, Timothy A. Davis, All Rights Reserved.
# Just this particular file is under the Apache-2.0 license; each package has
# its own license.
# SPDX-License-Identifier: Apache-2.0
Expand Down
4 changes: 2 additions & 2 deletions ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ Jan XX, 2024: version 7.5.0 FIXME for 7.5.0
see https://github.com/GraphBLAS/graphblas-api-c
* Example 1.6.0: using GraphBLAS 9.0.0 and SuiteSparse_config 7.5.0,
remove explicit dependencies on OpenMP, libm, GMP, and MPFR
* CHOLMOD 5.1.1, SPQR 4.3.1, ParU 0.1.1, LAGraph 1.1.1:
minor updates to build system
* CHOLMOD 5.1.1, SPQR 4.3.1, ParU 0.1.1, LAGraph 1.1.1, UMFPACK 6.3.1,
KLU 2.3.1: minor updates to build system and MATLAB interfaces

Dec 30, 2023: version 7.4.0

Expand Down
6 changes: 3 additions & 3 deletions Example/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,16 +96,16 @@ find_package ( CHOLMOD 5.1.1 REQUIRED )
find_package ( COLAMD 3.3.0 REQUIRED )
find_package ( CXSparse 4.3.0 REQUIRED )
find_package ( GraphBLAS 9.0.0 )
find_package ( KLU 2.3.0 REQUIRED )
find_package ( KLU_CHOLMOD 2.3.0 REQUIRED )
find_package ( KLU 2.3.1 REQUIRED )
find_package ( KLU_CHOLMOD 2.3.1 REQUIRED )
find_package ( LDL 3.3.0 REQUIRED )
find_package ( LAGraph 1.1.1 )
find_package ( SuiteSparse_Mongoose 3.3.0 REQUIRED )
find_package ( ParU 0.1.1 REQUIRED )
find_package ( RBio 4.3.0 REQUIRED )
find_package ( SPEX 2.3.0 REQUIRED ) # requires GMP and MPFR
find_package ( SPQR 4.3.1 REQUIRED )
find_package ( UMFPACK 6.3.0 REQUIRED )
find_package ( UMFPACK 6.3.1 REQUIRED )

#-------------------------------------------------------------------------------
# configure files
Expand Down
12 changes: 6 additions & 6 deletions KLU/CMakeLists.txt
View file
Open in desktop
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 "Dec 30, 2023" )
set ( KLU_DATE "Jan XX, 2024" ) # FIXME for 7.5.0
set ( KLU_VERSION_MAJOR 2 CACHE STRING "" FORCE )
set ( KLU_VERSION_MINOR 3 CACHE STRING "" FORCE )
set ( KLU_VERSION_SUB 0 CACHE STRING "" FORCE )
set ( KLU_VERSION_SUB 1 CACHE STRING "" FORCE )

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

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

find_package ( AMD 3.3.0
Expand Down Expand Up @@ -77,10 +77,10 @@ if ( SUITESPARSE_ROOT_CMAKELISTS )
else ( )
if ( KLU_USE_CHOLMOD )
# look for CHOLMOD (optional fill-reducing orderings)
find_package ( CHOLMOD 5.1.0
find_package ( CHOLMOD 5.1.1
PATHS ${CMAKE_SOURCE_DIR}/../CHOLMOD/build NO_DEFAULT_PATH )
if ( NOT TARGET SuiteSparse::CHOLMOD )
find_package ( CHOLMOD 5.1.0 )
find_package ( CHOLMOD 5.1.1 )
endif ( )
if ( NOT CHOLMOD_FOUND )
# CHOLMOD not found so disable it
Expand Down
2 changes: 1 addition & 1 deletion KLU/Config/KLU.pc.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# KLU, Copyright (c) 2004-2023, Timothy A. Davis.
# KLU, Copyright (c) 2004-2024, Timothy A. Davis.
# All Rights Reserved.
# SPDX-License-Identifier: LGPL-2.1-or-later

Expand Down
2 changes: 1 addition & 1 deletion KLU/Config/KLUConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# The following copyright and license applies to just this file only, not to
# the library itself:
# KLUConfig.cmake, Copyright (c) 2023, Timothy A. Davis. All Rights Reserved.
# KLUConfig.cmake, Copyright (c) 2023-2024, Timothy A. Davis. All Rights Reserved.
# SPDX-License-Identifier: BSD-3-clause

#-------------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion KLU/Config/KLU_CHOLMOD.pc.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# KLU_CHOLMOD, Copyright (c) 2004-2023, Timothy A. Davis.
# KLU_CHOLMOD, Copyright (c) 2004-2024, Timothy A. Davis.
# All Rights Reserved.
# SPDX-License-Identifier: LGPL-2.1-or-later

Expand Down
2 changes: 1 addition & 1 deletion KLU/Config/KLU_CHOLMODConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# The following copyright and license applies to just this file only, not to
# the library itself:
# KLU_CHOLMODConfig.cmake, Copyright (c) 2023, Timothy A. Davis. All Rights Reserved.
# KLU_CHOLMODConfig.cmake, Copyright (c) 2023-2024, Timothy A. Davis. All Rights Reserved.
# SPDX-License-Identifier: BSD-3-clause

#-------------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion KLU/Config/klu.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// KLU/Source/klu.h: include file for KLU
//------------------------------------------------------------------------------

// KLU, Copyright (c) 2004-2023, University of Florida. All Rights Reserved.
// KLU, Copyright (c) 2004-2024, University of Florida. All Rights Reserved.
// Authors: Timothy A. Davis and Ekanathan Palamadai.
// SPDX-License-Identifier: LGPL-2.1+

Expand Down
5 changes: 5 additions & 0 deletions KLU/Doc/ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
Jan XX, 2024: version 2.3.1 FIXME for 7.5.0

* MATLAB interface: add -DNO_SSIZE_T for Windows
* minor updates to build system

Dec 30, 2023: version 2.3.0

* major change to build system: by Markus Mützel
Expand Down
Binary file modified KLU/Doc/KLU_UserGuide.pdf
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion KLU/Doc/klu_version.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
% version of SuiteSparse/KLU
\date{VERSION 2.3.0, Dec 30, 2023}
\date{VERSION 2.3.1, Jan XX, 2024}
14 changes: 7 additions & 7 deletions KLU/Include/klu.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// KLU/Source/klu.h: include file for KLU
//------------------------------------------------------------------------------

// KLU, Copyright (c) 2004-2023, University of Florida. All Rights Reserved.
// KLU, Copyright (c) 2004-2024, University of Florida. All Rights Reserved.
// Authors: Timothy A. Davis and Ekanathan Palamadai.
// SPDX-License-Identifier: LGPL-2.1+

Expand Down Expand Up @@ -823,29 +823,29 @@ void klu_version (int version [3]) ;
* #endif
*/

#define KLU_DATE "Dec 30, 2023"
#define KLU_DATE "Jan XX, 2024"
#define KLU_MAIN_VERSION 2
#define KLU_SUB_VERSION 3
#define KLU_SUBSUB_VERSION 0
#define KLU_SUBSUB_VERSION 1

#define KLU_VERSION_CODE(main,sub) SUITESPARSE_VER_CODE(main,sub)
#define KLU_VERSION KLU_VERSION_CODE(KLU_MAIN_VERSION,KLU_SUB_VERSION)

#if !defined (SUITESPARSE_VERSION) || \
(SUITESPARSE_VERSION < SUITESPARSE_VER_CODE(7,4))
#error "KLU 2.3.0 requires SuiteSparse_config 7.4.0 or later"
#error "KLU 2.3.1 requires SuiteSparse_config 7.4.0 or later"
#endif

#if AMD_VERSION < SUITESPARSE_VER_CODE(3,3)
#error "KLU 2.3.0 requires AMD 3.3.0 or later"
#error "KLU 2.3.1 requires AMD 3.3.0 or later"
#endif

#if COLAMD_VERSION < SUITESPARSE_VER_CODE(3,3)
#error "KLU 2.3.0 requires COLAMD 3.3.0 or later"
#error "KLU 2.3.1 requires COLAMD 3.3.0 or later"
#endif

#if BTF_VERSION < SUITESPARSE_VER_CODE(2,3)
#error "KLU 2.3.0 requires BTF 2.3.0 or later"
#error "KLU 2.3.1 requires BTF 2.3.0 or later"
#endif

#endif
Expand Down
12 changes: 6 additions & 6 deletions UMFPACK/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
# cmake 3.22 is required to find the BLAS in SuiteSparse_config
cmake_minimum_required ( VERSION 3.22 )

set ( UMFPACK_DATE "Dec 30, 2023" )
set ( UMFPACK_DATE "Jan XX, 2024" ) # FIXME for 7.5.0
set ( UMFPACK_VERSION_MAJOR 6 CACHE STRING "" FORCE )
set ( UMFPACK_VERSION_MINOR 3 CACHE STRING "" FORCE )
set ( UMFPACK_VERSION_SUB 0 CACHE STRING "" FORCE )
set ( UMFPACK_VERSION_SUB 1 CACHE STRING "" FORCE )

message ( STATUS "Building UMFPACK version: v"
${UMFPACK_VERSION_MAJOR}.
Expand Down Expand Up @@ -45,10 +45,10 @@ include ( SuiteSparsePolicy )
#-------------------------------------------------------------------------------

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

find_package ( AMD 3.3.0
Expand All @@ -73,10 +73,10 @@ if ( SUITESPARSE_ROOT_CMAKELISTS )
else ( )
if ( UMFPACK_USE_CHOLMOD )
# look for CHOLMOD (optional fill-reducing orderings)
find_package ( CHOLMOD 5.1.0
find_package ( CHOLMOD 5.1.1
PATHS ${CMAKE_SOURCE_DIR}/../CHOLMOD/build NO_DEFAULT_PATH )
if ( NOT TARGET SuiteSparse::CHOLMOD )
find_package ( CHOLMOD 5.1.0 )
find_package ( CHOLMOD 5.1.1 )
endif ( )
if ( NOT CHOLMOD_FOUND )
# CHOLMOD not found so disable it
Expand Down
2 changes: 1 addition & 1 deletion UMFPACK/Config/UMFPACK.pc.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# UMFPACK, Copyright (c) 1995-2023, Timothy A. Davis.
# UMFPACK, Copyright (c) 1995-2024, Timothy A. Davis.
# All Rights Reserved.
# SPDX-License-Identifier: GPL-2.0-or-later

Expand Down
2 changes: 1 addition & 1 deletion UMFPACK/Config/UMFPACKConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# The following copyright and license applies to just this file only, not to
# the library itself:
# UMFPACKConfig.cmake, Copyright (c) 2023, Timothy A. Davis. All Rights Reserved.
# UMFPACKConfig.cmake, Copyright (c) 2023-2024, Timothy A. Davis. All Rights Reserved.
# SPDX-License-Identifier: BSD-3-clause

#-------------------------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions UMFPACK/Config/umfpack.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// UMFPACK/Include/umfpack.h: include file for UMFPACK
//------------------------------------------------------------------------------

// UMFPACK, Copyright (c) 2005-2023, Timothy A. Davis, All Rights Reserved.
// UMFPACK, Copyright (c) 2005-2024, Timothy A. Davis, All Rights Reserved.
// SPDX-License-Identifier: GPL-2.0+

//------------------------------------------------------------------------------
Expand Down Expand Up @@ -40,7 +40,7 @@
/* -------------------------------------------------------------------------- */

#define UMFPACK_COPYRIGHT \
"UMFPACK: Copyright (c) 2005-2023 by Timothy A. Davis. All Rights Reserved.\n"
"UMFPACK: Copyright (c) 2005-2024 by Timothy A. Davis. All Rights Reserved.\n"

#define UMFPACK_LICENSE_PART1 \
"\nUMFPACK License: SPDX-License-Identifier: GPL-2.0+\n" \
Expand Down
5 changes: 5 additions & 0 deletions UMFPACK/Doc/ChangeLog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
Jan XX, 2024: version 6.3.1 FIXME for 7.5.0

* MATLAB interface: add -DNO_SSIZE_T for Windows
* minor updates to build system

Dec 30, 2023: version 6.3.0

* major change to build system: by Markus Mützel
Expand Down
Binary file modified UMFPACK/Doc/UMFPACK_QuickStart.pdf
View file
Open in desktop
Binary file not shown.
Binary file modified UMFPACK/Doc/UMFPACK_UserGuide.pdf
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion UMFPACK/Doc/umfpack_version.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
% version of SuiteSparse/UMFPACK
\date{VERSION 6.3.0, Dec 30, 2023}
\date{VERSION 6.3.1, Jan XX, 2024}
12 changes: 6 additions & 6 deletions UMFPACK/Include/umfpack.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// UMFPACK/Include/umfpack.h: include file for UMFPACK
//------------------------------------------------------------------------------

// UMFPACK, Copyright (c) 2005-2023, Timothy A. Davis, All Rights Reserved.
// UMFPACK, Copyright (c) 2005-2024, Timothy A. Davis, All Rights Reserved.
// SPDX-License-Identifier: GPL-2.0+

//------------------------------------------------------------------------------
Expand Down Expand Up @@ -40,7 +40,7 @@
/* -------------------------------------------------------------------------- */

#define UMFPACK_COPYRIGHT \
"UMFPACK: Copyright (c) 2005-2023 by Timothy A. Davis. All Rights Reserved.\n"
"UMFPACK: Copyright (c) 2005-2024 by Timothy A. Davis. All Rights Reserved.\n"

#define UMFPACK_LICENSE_PART1 \
"\nUMFPACK License: SPDX-License-Identifier: GPL-2.0+\n" \
Expand Down Expand Up @@ -74,21 +74,21 @@
* below.
*/

#define UMFPACK_DATE "Dec 30, 2023"
#define UMFPACK_DATE "Jan XX, 2024"
#define UMFPACK_MAIN_VERSION 6
#define UMFPACK_SUB_VERSION 3
#define UMFPACK_SUBSUB_VERSION 0
#define UMFPACK_SUBSUB_VERSION 1

#define UMFPACK_VER_CODE(main,sub) SUITESPARSE_VER_CODE(main,sub)
#define UMFPACK_VER UMFPACK_VER_CODE(UMFPACK_MAIN_VERSION,UMFPACK_SUB_VERSION)

#if !defined (SUITESPARSE_VERSION) || \
(SUITESPARSE_VERSION < SUITESPARSE_VER_CODE(7,4))
#error "UMFPACK 6.3.0 requires SuiteSparse_config 7.4.0 or later"
#error "UMFPACK 6.3.1 requires SuiteSparse_config 7.4.0 or later"
#endif

#if AMD_VERSION < SUITESPARSE_VER_CODE(3,3)
#error "UMFPACK 6.3.0 requires AMD 3.3.0 or later"
#error "UMFPACK 6.3.1 requires AMD 3.3.0 or later"
#endif

// user code should not directly use GB_STR or GB_XSTR
Expand Down