Skip to content

Commit a8616ee

Browse files
DrTimothyAldenDavisDrTimothyAldenDavis
committed
umfpack 6.3.5: typos in comments and user guide
1 parent 0d1c8dd commit a8616ee

23 files changed

+124
-118
lines changed

‎ChangeLog

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
Sept 5, 2024: version 7.8.3
1+
Sept 23, 2024: version 7.8.3
22

33
* ParU 1.0.0: first stable release. No change since last version
44
v0.3.0, except for date, version, and updates to the User Guide.
5+
* UMFPACK 6.3.5: a few typos in comments and user guide; no change to code
56
* SuiteSparse_config and Example: revised to reflect ParU 1.0.0.
67
* Package versions in this release: (* denotes a new version)
78
SuiteSparse_config 7.8.3 *
@@ -23,7 +24,7 @@ Sept 5, 2024: version 7.8.3
2324
RBio 4.3.3
2425
SPEX 3.2.1
2526
SPQR 4.3.4
26-
UMFPACK 6.3.4
27+
UMFPACK 6.3.5 *
2728

2829
Aug 20, 2024: version 7.8.2
2930

‎Example/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ find_package ( ParU 1.0.0 REQUIRED )
105105
find_package ( RBio 4.3.3 REQUIRED )
106106
find_package ( SPEX 3.2.1 REQUIRED ) # requires GMP and MPFR
107107
find_package ( SPQR 4.3.4 REQUIRED )
108-
find_package ( UMFPACK 6.3.4 REQUIRED )
108+
find_package ( UMFPACK 6.3.5 REQUIRED )
109109

110110
# for GMP and MPFR
111111
find_package ( MPFR 4.0.2 REQUIRED ) # from SPEX/cmake_modules

‎Example/Include/my_internal.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@
9494
#endif
9595

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

101101
// SuiteSparse include files for C++:

‎ParU/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,10 @@ if ( NOT SUITESPARSE_ROOT_CMAKELISTS )
109109
find_package ( CHOLMOD 5.3.0 REQUIRED )
110110
endif ( )
111111

112-
find_package ( UMFPACK 6.3.3
112+
find_package ( UMFPACK 6.3.5
113113
PATHS ${CMAKE_SOURCE_DIR}/../UMFPACK/build NO_DEFAULT_PATH )
114114
if ( NOT UMFPACK_FOUND )
115-
find_package ( UMFPACK 6.3.3 REQUIRED )
115+
find_package ( UMFPACK 6.3.5 REQUIRED )
116116
endif ( )
117117
endif ( )
118118

‎ParU/Config/ParU.h.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ typedef enum ParU_Info
6565
#endif
6666

6767
#if !defined (UMFPACK__VERSION) || \
68-
(UMFPACK__VERSION < SUITESPARSE__VERCODE(6,3,4))
69-
#error "ParU @PARU_VERSION_MAJOR@.@PARU_VERSION_MINOR@.@PARU_VERSION_UPDATE@ requires UMFPACK 6.3.4 or later"
68+
(UMFPACK__VERSION < SUITESPARSE__VERCODE(6,3,5))
69+
#error "ParU @PARU_VERSION_MAJOR@.@PARU_VERSION_MINOR@.@PARU_VERSION_UPDATE@ requires UMFPACK 6.3.5 or later"
7070
#endif
7171

7272
#if !defined (CHOLMOD__VERSION) || \

‎ParU/Include/ParU.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ typedef enum ParU_Info
6565
#endif
6666

6767
#if !defined (UMFPACK__VERSION) || \
68-
(UMFPACK__VERSION < SUITESPARSE__VERCODE(6,3,4))
69-
#error "ParU 1.0.0 requires UMFPACK 6.3.4 or later"
68+
(UMFPACK__VERSION < SUITESPARSE__VERCODE(6,3,5))
69+
#error "ParU 1.0.0 requires UMFPACK 6.3.5 or later"
7070
#endif
7171

7272
#if !defined (CHOLMOD__VERSION) || \

‎UMFPACK/CMakeLists.txt

Lines changed: 2 additions & 2 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 "June 20, 2024" )
15+
set ( UMFPACK_DATE "Sept 23, 2024" )
1616
set ( UMFPACK_VERSION_MAJOR 6 CACHE STRING "" FORCE )
1717
set ( UMFPACK_VERSION_MINOR 3 CACHE STRING "" FORCE )
18-
set ( UMFPACK_VERSION_SUB 4 CACHE STRING "" FORCE )
18+
set ( UMFPACK_VERSION_SUB 5 CACHE STRING "" FORCE )
1919

2020
message ( STATUS "Building UMFPACK version: v"
2121
${UMFPACK_VERSION_MAJOR}.

‎UMFPACK/Config/umfpack.h.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5008,12 +5008,12 @@ complex int32_t Syntax:
50085008
50095009
#include "umfpack.h"
50105010
void *Numeric ;
5011-
double *Mx, *Mz, *Ex, Info [UMFPACK_INFO] ;
5011+
double Mx, Mz, Ex, Info [UMFPACK_INFO] ;
50125012
int status = umfpack_zl_get_determinant (&Mx, &Mz, &Ex, Numeric, Info) ;
50135013
50145014
packed complex Syntax:
50155015
5016-
Same as above, except Mz is NULL.
5016+
Same as above, except Mz is NULL, and Mx is an array of size 2.
50175017
50185018
Author: Contributed by David Bateman, Motorola, Paris
50195019

‎UMFPACK/Demo/umf4hb.out

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
UMFPACK V6.3.3 (Mar 22, 2024), Control:
1+
UMFPACK V6.3.5 (Sept 23, 2024), Control:
22
Matrix entry defined as: double
33
Int (generic integer) defined as: int32_t
44

@@ -33,17 +33,17 @@ UMFPACK V6.3.3 (Mar 22, 2024), Control:
3333
The following options can only be changed at compile-time:
3434
8: BLAS library used: Intel MKL 64lp BLAS (32-bit integers). size of BLAS integer: 4
3535
compiled for ANSI C
36-
CPU timer: SuiteSparse_time ( )
36+
CPU timer: omp_get_wtime
3737
compiled with CHOLMOD ordering options
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.3.3 (Mar 22, 2024), Info:
41+
UMFPACK V6.3.5 (Sept 23, 2024), 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
4545
MATLAB: no.
46-
CPU timer: SuiteSparse_time ( )
46+
CPU timer: omp_get_wtime
4747
number of rows in matrix A: 67
4848
number of columns in matrix A: 67
4949
entries in matrix A: 294
@@ -106,8 +106,8 @@ UMFPACK V6.3.3 (Mar 22, 2024), 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.00
110+
numeric factorization mflops (wallclock): 0.77
111111

112112
solve flops: 1.20800e+03
113113
iterative refinement steps taken: 0
@@ -119,7 +119,7 @@ UMFPACK V6.3.3 (Mar 22, 2024), Info:
119119
Matrix key: WEST0067
120120
symbolic analysis:
121121
status: 0.
122-
time: 0.10E-03 (sec)
122+
time: 0.84E-04 (sec)
123123
estimates (upper bound) for numeric LU:
124124
size of LU: 0.02 (MB)
125125
memory needed: 0.06 (MB)
@@ -128,13 +128,13 @@ symbolic analysis:
128128
nnz (U): 902.
129129
numeric factorization:
130130
status: 0.
131-
time: 0.77E-02
131+
time: 0.34E-02
132132
actual numeric LU statistics:
133133
size of LU: 0.01 (MB)
134134
memory needed: 0.04 (MB)
135135
flop count: 0.26E+04
136136
nnz (L): 331.
137137
nnz (U): 340.
138138
norm (A*x-b): 1.7763568394002505E-015
139-
norm (A*x-b): 1.1546319456101628E-014
140-
norm (A*x-b): 1.1546319456101628E-014
139+
norm (A*x-b): 1.5099033134902129E-014
140+
norm (A*x-b): 1.5099033134902129E-014

‎UMFPACK/Demo/umf4hb64.out

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
UMFPACK V6.3.3 (Mar 22, 2024), Control:
1+
UMFPACK V6.3.5 (Sept 23, 2024), Control:
22
Matrix entry defined as: double
33
Int (generic integer) defined as: int64_t
44

@@ -33,17 +33,17 @@ UMFPACK V6.3.3 (Mar 22, 2024), Control:
3333
The following options can only be changed at compile-time:
3434
8: BLAS library used: Intel MKL 64lp BLAS (32-bit integers). size of BLAS integer: 4
3535
compiled for ANSI C
36-
CPU timer: SuiteSparse_time ( )
36+
CPU timer: omp_get_wtime
3737
compiled with CHOLMOD ordering options
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.3.3 (Mar 22, 2024), Info:
41+
UMFPACK V6.3.5 (Sept 23, 2024), 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
4545
MATLAB: no.
46-
CPU timer: SuiteSparse_time ( )
46+
CPU timer: omp_get_wtime
4747
number of rows in matrix A: 67
4848
number of columns in matrix A: 67
4949
entries in matrix A: 294
@@ -106,8 +106,8 @@ UMFPACK V6.3.3 (Mar 22, 2024), 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.33
109+
numeric factorization wallclock time (sec): 0.00
110+
numeric factorization mflops (wallclock): 0.77
111111

112112
solve flops: 1.20800e+03
113113
iterative refinement steps taken: 0
@@ -119,7 +119,7 @@ UMFPACK V6.3.3 (Mar 22, 2024), Info:
119119
Matrix key: WEST0067
120120
symbolic analysis:
121121
status: 0.
122-
time: 0.13E-03 (sec)
122+
time: 0.96E-04 (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.78E-02
131+
time: 0.34E-02
132132
actual numeric LU statistics:
133133
size of LU: 0.01 (MB)
134134
memory needed: 0.06 (MB)

‎UMFPACK/Demo/umf4zhb.out

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
UMFPACK V6.3.3 (Mar 22, 2024), Control:
1+
UMFPACK V6.3.5 (Sept 23, 2024), Control:
22
Matrix entry defined as: double complex
33
Int (generic integer) defined as: int32_t
44

@@ -33,17 +33,17 @@ UMFPACK V6.3.3 (Mar 22, 2024), Control:
3333
The following options can only be changed at compile-time:
3434
8: BLAS library used: Intel MKL 64lp BLAS (32-bit integers). size of BLAS integer: 4
3535
compiled for ANSI C
36-
CPU timer: SuiteSparse_time ( )
36+
CPU timer: omp_get_wtime
3737
compiled with CHOLMOD ordering options
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.3.3 (Mar 22, 2024), Info:
41+
UMFPACK V6.3.5 (Sept 23, 2024), 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
4545
MATLAB: no.
46-
CPU timer: SuiteSparse_time ( )
46+
CPU timer: omp_get_wtime
4747
number of rows in matrix A: 324
4848
number of columns in matrix A: 324
4949
entries in matrix A: 26730
@@ -119,10 +119,10 @@ UMFPACK V6.3.3 (Mar 22, 2024), 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): 853.80
124-
symbolic + numeric wall clock time (sec): 0.02
125-
symbolic + numeric mflops (wall clock): 770.03
122+
numeric factorization wallclock time (sec): 0.01
123+
numeric factorization mflops (wallclock): 2377.42
124+
symbolic + numeric wall clock time (sec): 0.01
125+
symbolic + numeric mflops (wall clock): 2023.42
126126

127127
solve flops: 3.70332e+05
128128
iterative refinement steps taken: 0
@@ -134,7 +134,7 @@ UMFPACK V6.3.3 (Mar 22, 2024), Info:
134134
Matrix key: QC324
135135
symbolic analysis:
136136
status: 0.
137-
time: 0.18E-02 (sec)
137+
time: 0.11E-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.17E-01
146+
time: 0.60E-02
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: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
UMFPACK V6.3.3 (Mar 22, 2024), Control:
1+
UMFPACK V6.3.5 (Sept 23, 2024), Control:
22
Matrix entry defined as: double complex
33
Int (generic integer) defined as: int64_t
44

@@ -33,17 +33,17 @@ UMFPACK V6.3.3 (Mar 22, 2024), Control:
3333
The following options can only be changed at compile-time:
3434
8: BLAS library used: Intel MKL 64lp BLAS (32-bit integers). size of BLAS integer: 4
3535
compiled for ANSI C
36-
CPU timer: SuiteSparse_time ( )
36+
CPU timer: omp_get_wtime
3737
compiled with CHOLMOD ordering options
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.3.3 (Mar 22, 2024), Info:
41+
UMFPACK V6.3.5 (Sept 23, 2024), 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
4545
MATLAB: no.
46-
CPU timer: SuiteSparse_time ( )
46+
CPU timer: omp_get_wtime
4747
number of rows in matrix A: 324
4848
number of columns in matrix A: 324
4949
entries in matrix A: 26730
@@ -119,10 +119,10 @@ UMFPACK V6.3.3 (Mar 22, 2024), 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): 852.02
124-
symbolic + numeric wall clock time (sec): 0.02
125-
symbolic + numeric mflops (wall clock): 750.09
122+
numeric factorization wallclock time (sec): 0.00
123+
numeric factorization mflops (wallclock): 2886.50
124+
symbolic + numeric wall clock time (sec): 0.01
125+
symbolic + numeric mflops (wall clock): 2357.41
126126

127127
solve flops: 3.70332e+05
128128
iterative refinement steps taken: 0
@@ -134,7 +134,7 @@ UMFPACK V6.3.3 (Mar 22, 2024), Info:
134134
Matrix key: QC324
135135
symbolic analysis:
136136
status: 0.
137-
time: 0.23E-02 (sec)
137+
time: 0.11E-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.17E-01
146+
time: 0.50E-02
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

0 commit comments

Comments
 (0)