Skip to content

Commit 8934550

Browse files
DrTimothyAldenDavisDrTimothyAldenDavis
committed
UMFPACK 6.3.0: version update, remove amd_internal.h
1 parent a4cd618 commit 8934550

28 files changed

+345
-415
lines changed

‎UMFPACK/CMakeLists.txt‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
# cmake 3.22 is required to find the BLAS in SuiteSparse_config
1313
cmake_minimum_required ( VERSION 3.22 )
1414

15-
set ( UMFPACK_DATE "Oct 23, 2023" )
15+
set ( UMFPACK_DATE "Dec 30, 2023" )
1616
set ( UMFPACK_VERSION_MAJOR 6 CACHE STRING "" FORCE )
17-
set ( UMFPACK_VERSION_MINOR 2 CACHE STRING "" FORCE )
18-
set ( UMFPACK_VERSION_SUB 2 CACHE STRING "" FORCE )
17+
set ( UMFPACK_VERSION_MINOR 3 CACHE STRING "" FORCE )
18+
set ( UMFPACK_VERSION_SUB 0 CACHE STRING "" FORCE )
1919

2020
message ( STATUS "Building UMFPACK version: v"
2121
${UMFPACK_VERSION_MAJOR}.
@@ -61,35 +61,35 @@ else ( )
6161
endif ( )
6262

6363
if ( NOT SUITESPARSE_ROOT_CMAKELISTS )
64-
find_package ( SuiteSparse_config 7.3.0
64+
find_package ( SuiteSparse_config 7.4.0
6565
PATHS ${CMAKE_SOURCE_DIR}/../SuiteSparse_config/build NO_DEFAULT_PATH )
6666
if ( NOT TARGET SuiteSparse::SuiteSparseConfig )
67-
find_package ( SuiteSparse_config 7.3.0 REQUIRED )
67+
find_package ( SuiteSparse_config 7.4.0 REQUIRED )
6868
endif ( )
6969

70-
find_package ( AMD 3.2.1
70+
find_package ( AMD 3.3.0
7171
PATHS ${CMAKE_SOURCE_DIR}/../AMD/build NO_DEFAULT_PATH )
7272
if ( NOT TARGET SuiteSparse::AMD )
73-
find_package ( AMD 3.2.1 REQUIRED )
73+
find_package ( AMD 3.3.0 REQUIRED )
7474
endif ( )
7575

7676
if ( DEMO AND NOT WIN32 )
77-
find_package ( COLAMD 3.2.1
77+
find_package ( COLAMD 3.3.0
7878
PATHS ${CMAKE_SOURCE_DIR}/../COLAMD/build NO_DEFAULT_PATH )
7979
if ( NOT TARGET SuiteSparse::COLAMD )
80-
find_package ( COLAMD 3.2.1 REQUIRED )
80+
find_package ( COLAMD 3.3.0 REQUIRED )
8181
endif ( )
8282

83-
find_package ( CAMD 3.2.1
83+
find_package ( CAMD 3.3.0
8484
PATHS ${CMAKE_SOURCE_DIR}/../CAMD/build NO_DEFAULT_PATH )
8585
if ( NOT TARGET SuiteSparse::CAMD )
86-
find_package ( CAMD 3.2.1 REQUIRED )
86+
find_package ( CAMD 3.3.0 REQUIRED )
8787
endif ( )
8888

89-
find_package ( CCOLAMD 3.2.1
89+
find_package ( CCOLAMD 3.3.0
9090
PATHS ${CMAKE_SOURCE_DIR}/../CCOLAMD/build NO_DEFAULT_PATH )
9191
if ( NOT TARGET SuiteSparse::CCOLAMD )
92-
find_package ( CCOLAMD 3.2.1 REQUIRED )
92+
find_package ( CCOLAMD 3.3.0 REQUIRED )
9393
endif ( )
9494
endif ( )
9595
endif ( )
@@ -100,10 +100,10 @@ option ( NCHOLMOD "ON: do not use CHOLMOD. OFF (default): use CHOLMOD" OFF )
100100

101101
if ( NOT SUITESPARSE_ROOT_CMAKELISTS AND NOT NCHOLMOD )
102102
# look for CHOLMOD (optional fill-reducing orderings)
103-
find_package ( CHOLMOD 5.0.0
103+
find_package ( CHOLMOD 5.1.0
104104
PATHS ${CMAKE_SOURCE_DIR}/../CHOLMOD/build NO_DEFAULT_PATH )
105105
if ( NOT TARGET SuiteSparse::CHOLMOD )
106-
find_package ( CHOLMOD 5.0.0 )
106+
find_package ( CHOLMOD 5.1.0 )
107107
endif ( )
108108

109109
if ( NOT CHOLMOD_FOUND )

‎UMFPACK/Demo/umf4hb.out‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
UMFPACK V6.2.1 (Sept 18, 2023), Control:
1+
UMFPACK V6.3.0 (Dec 30, 2023), Control:
22
Matrix entry defined as: double
33
Int (generic integer) defined as: int32_t
44

@@ -38,7 +38,7 @@ UMFPACK V6.2.1 (Sept 18, 2023), Control:
3838
computer/operating system: Linux
3939
size of int32_t: 4 int64_t: 8 Int: 4 pointer: 8 double: 8 Entry: 8 (in bytes)
4040

41-
UMFPACK V6.2.1 (Sept 18, 2023), Info:
41+
UMFPACK V6.3.0 (Dec 30, 2023), Info:
4242
matrix entry defined as: double
4343
Int (generic integer) defined as: int32_t
4444
BLAS library used: Intel MKL 64lp BLAS (32-bit integers). size of BLAS integer: 4
@@ -106,8 +106,8 @@ UMFPACK V6.2.1 (Sept 18, 2023), Info:
106106
numeric factorization defragmentations: 1
107107
numeric factorization reallocations: 1
108108
costly numeric factorization reallocations: 1
109-
numeric factorization wallclock time (sec): 0.01
110-
numeric factorization mflops (wallclock): 0.34
109+
numeric factorization wallclock time (sec): 0.04
110+
numeric factorization mflops (wallclock): 0.07
111111

112112
solve flops: 1.20800e+03
113113
iterative refinement steps taken: 0
@@ -119,7 +119,7 @@ UMFPACK V6.2.1 (Sept 18, 2023), Info:
119119
Matrix key: WEST0067
120120
symbolic analysis:
121121
status: 0.
122-
time: 0.10E-03 (sec)
122+
time: 0.18E-03 (sec)
123123
estimates (upper bound) for numeric LU:
124124
size of LU: 0.02 (MB)
125125
memory needed: 0.06 (MB)
@@ -128,7 +128,7 @@ symbolic analysis:
128128
nnz (U): 902.
129129
numeric factorization:
130130
status: 0.
131-
time: 0.77E-02
131+
time: 0.38E-01
132132
actual numeric LU statistics:
133133
size of LU: 0.01 (MB)
134134
memory needed: 0.04 (MB)

‎UMFPACK/Demo/umf4hb64.out‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
UMFPACK V6.2.1 (Sept 18, 2023), Control:
1+
UMFPACK V6.3.0 (Dec 30, 2023), Control:
22
Matrix entry defined as: double
33
Int (generic integer) defined as: int64_t
44

@@ -38,7 +38,7 @@ UMFPACK V6.2.1 (Sept 18, 2023), Control:
3838
computer/operating system: Linux
3939
size of int32_t: 4 int64_t: 8 Int: 8 pointer: 8 double: 8 Entry: 8 (in bytes)
4040

41-
UMFPACK V6.2.1 (Sept 18, 2023), Info:
41+
UMFPACK V6.3.0 (Dec 30, 2023), Info:
4242
matrix entry defined as: double
4343
Int (generic integer) defined as: int64_t
4444
BLAS library used: Intel MKL 64lp BLAS (32-bit integers). size of BLAS integer: 4
@@ -107,7 +107,7 @@ UMFPACK V6.2.1 (Sept 18, 2023), Info:
107107
numeric factorization reallocations: 1
108108
costly numeric factorization reallocations: 1
109109
numeric factorization wallclock time (sec): 0.03
110-
numeric factorization mflops (wallclock): 0.10
110+
numeric factorization mflops (wallclock): 0.08
111111

112112
solve flops: 1.20800e+03
113113
iterative refinement steps taken: 0
@@ -119,7 +119,7 @@ UMFPACK V6.2.1 (Sept 18, 2023), Info:
119119
Matrix key: WEST0067
120120
symbolic analysis:
121121
status: 0.
122-
time: 0.11E-03 (sec)
122+
time: 0.20E-03 (sec)
123123
estimates (upper bound) for numeric LU:
124124
size of LU: 0.02 (MB)
125125
memory needed: 0.08 (MB)
@@ -128,7 +128,7 @@ symbolic analysis:
128128
nnz (U): 902.
129129
numeric factorization:
130130
status: 0.
131-
time: 0.27E-01
131+
time: 0.35E-01
132132
actual numeric LU statistics:
133133
size of LU: 0.01 (MB)
134134
memory needed: 0.06 (MB)

‎UMFPACK/Demo/umf4zhb.out‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
UMFPACK V6.2.1 (Sept 18, 2023), Control:
1+
UMFPACK V6.3.0 (Dec 30, 2023), Control:
22
Matrix entry defined as: double complex
33
Int (generic integer) defined as: int32_t
44

@@ -38,7 +38,7 @@ UMFPACK V6.2.1 (Sept 18, 2023), Control:
3838
computer/operating system: Linux
3939
size of int32_t: 4 int64_t: 8 Int: 4 pointer: 8 double: 8 Entry: 16 (in bytes)
4040

41-
UMFPACK V6.2.1 (Sept 18, 2023), Info:
41+
UMFPACK V6.3.0 (Dec 30, 2023), Info:
4242
matrix entry defined as: double complex
4343
Int (generic integer) defined as: int32_t
4444
BLAS library used: Intel MKL 64lp BLAS (32-bit integers). size of BLAS integer: 4
@@ -119,10 +119,10 @@ UMFPACK V6.2.1 (Sept 18, 2023), Info:
119119
numeric factorization defragmentations: 0
120120
numeric factorization reallocations: 0
121121
costly numeric factorization reallocations: 0
122-
numeric factorization wallclock time (sec): 0.02
123-
numeric factorization mflops (wallclock): 783.23
124-
symbolic + numeric wall clock time (sec): 0.02
125-
symbolic + numeric mflops (wall clock): 712.11
122+
numeric factorization wallclock time (sec): 0.14
123+
numeric factorization mflops (wallclock): 102.27
124+
symbolic + numeric wall clock time (sec): 0.14
125+
symbolic + numeric mflops (wall clock): 99.78
126126

127127
solve flops: 3.70332e+05
128128
iterative refinement steps taken: 0
@@ -134,7 +134,7 @@ UMFPACK V6.2.1 (Sept 18, 2023), Info:
134134
Matrix key: QC324
135135
symbolic analysis:
136136
status: 0.
137-
time: 0.18E-02 (sec)
137+
time: 0.35E-02 (sec)
138138
estimates (upper bound) for numeric LU:
139139
size of LU: 1.17 (MB)
140140
memory needed: 2.40 (MB)
@@ -143,11 +143,11 @@ symbolic analysis:
143143
nnz (U): 39609.
144144
numeric factorization:
145145
status: 0.
146-
time: 0.18E-01
146+
time: 0.14E+00
147147
actual numeric LU statistics:
148148
size of LU: 0.72 (MB)
149149
memory needed: 1.14 (MB)
150150
flop count: 0.14E+08
151151
nnz (L): 23247.
152152
nnz (U): 23247.
153-
norm (A*x-b): 2.7037543144102808E-013
153+
norm (A*x-b): 2.7082234386269613E-013

‎UMFPACK/Demo/umf4zhb64.out‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
UMFPACK V6.2.1 (Sept 18, 2023), Control:
1+
UMFPACK V6.3.0 (Dec 30, 2023), Control:
22
Matrix entry defined as: double complex
33
Int (generic integer) defined as: int64_t
44

@@ -38,7 +38,7 @@ UMFPACK V6.2.1 (Sept 18, 2023), Control:
3838
computer/operating system: Linux
3939
size of int32_t: 4 int64_t: 8 Int: 8 pointer: 8 double: 8 Entry: 16 (in bytes)
4040

41-
UMFPACK V6.2.1 (Sept 18, 2023), Info:
41+
UMFPACK V6.3.0 (Dec 30, 2023), Info:
4242
matrix entry defined as: double complex
4343
Int (generic integer) defined as: int64_t
4444
BLAS library used: Intel MKL 64lp BLAS (32-bit integers). size of BLAS integer: 4
@@ -119,10 +119,10 @@ UMFPACK V6.2.1 (Sept 18, 2023), Info:
119119
numeric factorization defragmentations: 0
120120
numeric factorization reallocations: 0
121121
costly numeric factorization reallocations: 0
122-
numeric factorization wallclock time (sec): 0.01
123-
numeric factorization mflops (wallclock): 962.67
124-
symbolic + numeric wall clock time (sec): 0.02
125-
symbolic + numeric mflops (wall clock): 839.26
122+
numeric factorization wallclock time (sec): 0.29
123+
numeric factorization mflops (wallclock): 50.19
124+
symbolic + numeric wall clock time (sec): 0.29
125+
symbolic + numeric mflops (wall clock): 49.53
126126

127127
solve flops: 3.70332e+05
128128
iterative refinement steps taken: 0
@@ -134,7 +134,7 @@ UMFPACK V6.2.1 (Sept 18, 2023), Info:
134134
Matrix key: QC324
135135
symbolic analysis:
136136
status: 0.
137-
time: 0.22E-02 (sec)
137+
time: 0.38E-02 (sec)
138138
estimates (upper bound) for numeric LU:
139139
size of LU: 1.37 (MB)
140140
memory needed: 2.97 (MB)
@@ -143,11 +143,11 @@ symbolic analysis:
143143
nnz (U): 39609.
144144
numeric factorization:
145145
status: 0.
146-
time: 0.15E-01
146+
time: 0.29E+00
147147
actual numeric LU statistics:
148148
size of LU: 0.74 (MB)
149149
memory needed: 1.38 (MB)
150150
flop count: 0.14E+08
151151
nnz (L): 23247.
152152
nnz (U): 23247.
153-
norm (A*x-b): 2.7037543144102808E-013
153+
norm (A*x-b): 2.7082234386269613E-013

‎UMFPACK/Demo/umfpack_di_demo.out‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
UMFPACK V6.2 (Sept 18, 2023) demo: _di_ version
2+
UMFPACK V6.3 (Dec 30, 2023) demo: _di_ version
33

44
UMFPACK: Copyright (c) 2005-2023 by Timothy A. Davis. All Rights Reserved.
55

@@ -10,9 +10,9 @@ UMFPACK License: SPDX-License-Identifier: GPL-2.0+
1010

1111

1212
Availability: http://www.suitesparse.com
13-
UMFPACK V6.2.1 (Sept 18, 2023): OK
13+
UMFPACK V6.3.0 (Dec 30, 2023): OK
1414

15-
UMFPACK V6.2.1 (Sept 18, 2023), Control:
15+
UMFPACK V6.3.0 (Dec 30, 2023), Control:
1616
Matrix entry defined as: double
1717
Int (generic integer) defined as: int32_t
1818

@@ -257,7 +257,7 @@ diagonal of U: dense vector, n = 5.
257257

258258
Numeric object: OK
259259

260-
UMFPACK V6.2.1 (Sept 18, 2023), Info:
260+
UMFPACK V6.3.0 (Dec 30, 2023), Info:
261261
matrix entry defined as: double
262262
Int (generic integer) defined as: int32_t
263263
BLAS library used: Intel MKL 64lp BLAS (32-bit integers). size of BLAS integer: 4
@@ -346,7 +346,7 @@ UMFPACK V6.2.1 (Sept 18, 2023), Info:
346346

347347
UMFPACK: Copyright (c) 2005-2023 by Timothy A. Davis. All Rights Reserved.
348348

349-
UMFPACK V6.2.1 (Sept 18, 2023): OK
349+
UMFPACK V6.3.0 (Dec 30, 2023): OK
350350

351351

352352
x (solution of Ax=b): dense vector, n = 5.
@@ -362,7 +362,7 @@ maxnorm of residual: 1.06581e-14
362362

363363
UMFPACK: Copyright (c) 2005-2023 by Timothy A. Davis. All Rights Reserved.
364364

365-
UMFPACK V6.2.1 (Sept 18, 2023): OK
365+
UMFPACK V6.3.0 (Dec 30, 2023): OK
366366

367367
determinant: (1.14) * 10^(2)
368368

@@ -376,7 +376,7 @@ x (solution of Ax=b, solve is split into 3 steps): dense vector, n = 5.
376376

377377
maxnorm of residual: 1.06581e-14
378378

379-
UMFPACK V6.2.1 (Sept 18, 2023), Info:
379+
UMFPACK V6.3.0 (Dec 30, 2023), Info:
380380
matrix entry defined as: double
381381
Int (generic integer) defined as: int32_t
382382
BLAS library used: Intel MKL 64lp BLAS (32-bit integers). size of BLAS integer: 4
@@ -605,7 +605,7 @@ diagonal of U: dense vector, n = 5.
605605

606606
Numeric object: OK
607607

608-
UMFPACK V6.2.1 (Sept 18, 2023), Info:
608+
UMFPACK V6.3.0 (Dec 30, 2023), Info:
609609
matrix entry defined as: double
610610
Int (generic integer) defined as: int32_t
611611
BLAS library used: Intel MKL 64lp BLAS (32-bit integers). size of BLAS integer: 4
@@ -852,7 +852,7 @@ diagonal of U: dense vector, n = 5.
852852

853853
Numeric object: OK
854854

855-
UMFPACK V6.2.1 (Sept 18, 2023), Info:
855+
UMFPACK V6.3.0 (Dec 30, 2023), Info:
856856
matrix entry defined as: double
857857
Int (generic integer) defined as: int32_t
858858
BLAS library used: Intel MKL 64lp BLAS (32-bit integers). size of BLAS integer: 4
@@ -1300,7 +1300,7 @@ Freeing numeric object:
13001300
Loading numeric object:
13011301

13021302
Done loading numeric object
1303-
UMFPACK V6.2.1 (Sept 18, 2023), Info:
1303+
UMFPACK V6.3.0 (Dec 30, 2023), Info:
13041304
matrix entry defined as: double
13051305
Int (generic integer) defined as: int32_t
13061306
BLAS library used: Intel MKL 64lp BLAS (32-bit integers). size of BLAS integer: 4
@@ -1509,7 +1509,7 @@ Done copying numeric object
15091509
Numeric blob size: 752
15101510

15111511
Done serialize/deserialize of numeric object
1512-
UMFPACK V6.2.1 (Sept 18, 2023), Info:
1512+
UMFPACK V6.3.0 (Dec 30, 2023), Info:
15131513
matrix entry defined as: double
15141514
Int (generic integer) defined as: int32_t
15151515
BLAS library used: Intel MKL 64lp BLAS (32-bit integers). size of BLAS integer: 4
@@ -1607,7 +1607,7 @@ maxnorm of residual: 3.55271e-15
16071607

16081608

16091609
Solving C'x=b again, using umfpack_di_wsolve instead:
1610-
UMFPACK V6.2.1 (Sept 18, 2023), Info:
1610+
UMFPACK V6.3.0 (Dec 30, 2023), Info:
16111611
matrix entry defined as: double
16121612
Int (generic integer) defined as: int32_t
16131613
BLAS library used: Intel MKL 64lp BLAS (32-bit integers). size of BLAS integer: 4
@@ -1705,4 +1705,4 @@ maxnorm of residual: 3.55271e-15
17051705

17061706

17071707
umfpack_di_demo complete.
1708-
Total time: 0.00 seconds (CPU time), 0.00 seconds (wallclock time)
1708+
Total time: 0.01 seconds (CPU time), 0.01 seconds (wallclock time)

0 commit comments

Comments
 (0)