umfpack 6.3.5: typos in comments and user guide

DrTimothyAldenDavis · Sep 23, 2024 · a8616ee · a8616ee
1 parent 0d1c8dd
commit a8616ee
Show file tree

Hide file tree

Showing 23 changed files with 124 additions and 118 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,7 +1,8 @@
-Sept 5, 2024: version 7.8.3
+Sept 23, 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.
     * Package versions in this release: (* denotes a new version)
         SuiteSparse_config 7.8.3    *
@@ -23,7 +24,7 @@ Sept 5, 2024: version 7.8.3
         RBio 4.3.3
         SPEX 3.2.1
         SPQR 4.3.4
-        UMFPACK 6.3.4
+        UMFPACK 6.3.5               *
 
 Aug 20, 2024: version 7.8.2
 

diff --git a/Example/CMakeLists.txt b/Example/CMakeLists.txt
@@ -105,7 +105,7 @@ find_package ( ParU 1.0.0 REQUIRED )
 find_package ( RBio 4.3.3 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

diff --git a/Example/Include/my_internal.h b/Example/Include/my_internal.h
@@ -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++:

diff --git a/ParU/CMakeLists.txt b/ParU/CMakeLists.txt
@@ -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 ( )
 

diff --git a/ParU/Config/ParU.h.in b/ParU/Config/ParU.h.in
@@ -65,8 +65,8 @@ typedef enum ParU_Info
 #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) || \

diff --git a/ParU/Include/ParU.h b/ParU/Include/ParU.h
@@ -65,8 +65,8 @@ typedef enum ParU_Info
 #endif
 
 #if !defined (UMFPACK__VERSION) || \
-    (UMFPACK__VERSION < SUITESPARSE__VERCODE(6,3,4))
-#error "ParU 1.0.0 requires UMFPACK 6.3.4 or later"
+    (UMFPACK__VERSION < SUITESPARSE__VERCODE(6,3,5))
+#error "ParU 1.0.0 requires UMFPACK 6.3.5 or later"
 #endif
 
 #if !defined (CHOLMOD__VERSION) || \

diff --git a/UMFPACK/CMakeLists.txt b/UMFPACK/CMakeLists.txt
@@ -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 "June 20, 2024" )
+set ( UMFPACK_DATE "Sept 23, 2024" )
 set ( UMFPACK_VERSION_MAJOR 6 CACHE STRING "" FORCE )
 set ( UMFPACK_VERSION_MINOR 3 CACHE STRING "" FORCE )
-set ( UMFPACK_VERSION_SUB   4 CACHE STRING "" FORCE )
+set ( UMFPACK_VERSION_SUB   5 CACHE STRING "" FORCE )
 
 message ( STATUS "Building UMFPACK version: v"
     ${UMFPACK_VERSION_MAJOR}.

diff --git a/UMFPACK/Config/umfpack.h.in b/UMFPACK/Config/umfpack.h.in
@@ -5008,12 +5008,12 @@ complex int32_t Syntax:
 
     #include "umfpack.h"
     void *Numeric ;
-    double *Mx, *Mz, *Ex, Info [UMFPACK_INFO] ;
+    double Mx, Mz, Ex, Info [UMFPACK_INFO] ;
     int status = umfpack_zl_get_determinant (&Mx, &Mz, &Ex, Numeric, Info) ;
 
 packed complex Syntax:
 
-    Same as above, except Mz is NULL.
+    Same as above, except Mz is NULL, and Mx is an array of size 2.
 
 Author: Contributed by David Bateman, Motorola, Paris
 

diff --git a/UMFPACK/Demo/umf4hb.out b/UMFPACK/Demo/umf4hb.out
@@ -1,4 +1,4 @@
-UMFPACK V6.3.3 (Mar 22, 2024), Control:
+UMFPACK V6.3.5 (Sept 23, 2024), Control:
     Matrix entry defined as: double
     Int (generic integer) defined as: int32_t
 
@@ -33,17 +33,17 @@ UMFPACK V6.3.3 (Mar 22, 2024), Control:
     The following options can only be changed at compile-time:
     8: BLAS library used:  Intel MKL 64lp BLAS (32-bit integers).  size of BLAS integer: 4
     compiled for ANSI C
-    CPU timer: SuiteSparse_time ( )
+    CPU timer: omp_get_wtime
     compiled with CHOLMOD ordering options
     computer/operating system: Linux
     size of int32_t: 4 int64_t: 8 Int: 4 pointer: 8 double: 8 Entry: 8 (in bytes)
 
-UMFPACK V6.3.3 (Mar 22, 2024), Info:
+UMFPACK V6.3.5 (Sept 23, 2024), Info:
     matrix entry defined as:          double
     Int (generic integer) defined as: int32_t
     BLAS library used: Intel MKL 64lp BLAS (32-bit integers).  size of BLAS integer: 4
     MATLAB: no.
-    CPU timer: SuiteSparse_time ( )
+    CPU timer: omp_get_wtime
     number of rows in matrix A:       67
     number of columns in matrix A:    67
     entries in matrix A:              294
@@ -106,8 +106,8 @@ UMFPACK V6.3.3 (Mar 22, 2024), Info:
     numeric factorization defragmentations:        1
     numeric factorization reallocations:           1
     costly numeric factorization reallocations:    1
-    numeric factorization wallclock time (sec):    0.01
-    numeric factorization mflops (wallclock):      0.34
+    numeric factorization wallclock time (sec):    0.00
+    numeric factorization mflops (wallclock):      0.77
 
     solve flops:                                   1.20800e+03
     iterative refinement steps taken:              0
@@ -119,7 +119,7 @@ UMFPACK V6.3.3 (Mar 22, 2024), Info:
  Matrix key: WEST0067                      
 symbolic analysis:
    status:     0.
-   time:      0.10E-03 (sec)
+   time:      0.84E-04 (sec)
    estimates (upper bound) for numeric LU:
    size of LU:          0.02 (MB)
    memory needed:       0.06 (MB)
@@ -128,13 +128,13 @@ symbolic analysis:
    nnz (U):             902.
 numeric factorization:
    status:     0.
-   time:      0.77E-02
+   time:      0.34E-02
    actual numeric LU statistics:
    size of LU:          0.01 (MB)
    memory needed:       0.04 (MB)
    flop count:      0.26E+04
    nnz (L):             331.
    nnz (U):             340.
  norm (A*x-b):    1.7763568394002505E-015
- norm (A*x-b):    1.1546319456101628E-014
- norm (A*x-b):    1.1546319456101628E-014
+ norm (A*x-b):    1.5099033134902129E-014
+ norm (A*x-b):    1.5099033134902129E-014
diff --git a/UMFPACK/Demo/umf4hb64.out b/UMFPACK/Demo/umf4hb64.out
@@ -1,4 +1,4 @@
-UMFPACK V6.3.3 (Mar 22, 2024), Control:
+UMFPACK V6.3.5 (Sept 23, 2024), Control:
     Matrix entry defined as: double
     Int (generic integer) defined as: int64_t
 
@@ -33,17 +33,17 @@ UMFPACK V6.3.3 (Mar 22, 2024), Control:
     The following options can only be changed at compile-time:
     8: BLAS library used:  Intel MKL 64lp BLAS (32-bit integers).  size of BLAS integer: 4
     compiled for ANSI C
-    CPU timer: SuiteSparse_time ( )
+    CPU timer: omp_get_wtime
     compiled with CHOLMOD ordering options
     computer/operating system: Linux
     size of int32_t: 4 int64_t: 8 Int: 8 pointer: 8 double: 8 Entry: 8 (in bytes)
 
-UMFPACK V6.3.3 (Mar 22, 2024), Info:
+UMFPACK V6.3.5 (Sept 23, 2024), Info:
     matrix entry defined as:          double
     Int (generic integer) defined as: int64_t
     BLAS library used: Intel MKL 64lp BLAS (32-bit integers).  size of BLAS integer: 4
     MATLAB: no.
-    CPU timer: SuiteSparse_time ( )
+    CPU timer: omp_get_wtime
     number of rows in matrix A:       67
     number of columns in matrix A:    67
     entries in matrix A:              294
@@ -106,8 +106,8 @@ UMFPACK V6.3.3 (Mar 22, 2024), Info:
     numeric factorization defragmentations:        1
     numeric factorization reallocations:           1
     costly numeric factorization reallocations:    1
-    numeric factorization wallclock time (sec):    0.01
-    numeric factorization mflops (wallclock):      0.33
+    numeric factorization wallclock time (sec):    0.00
+    numeric factorization mflops (wallclock):      0.77
 
     solve flops:                                   1.20800e+03
     iterative refinement steps taken:              0
@@ -119,7 +119,7 @@ UMFPACK V6.3.3 (Mar 22, 2024), Info:
  Matrix key: WEST0067                      
 symbolic analysis:
    status:     0.
-   time:      0.13E-03 (sec)
+   time:      0.96E-04 (sec)
    estimates (upper bound) for numeric LU:
    size of LU:          0.02 (MB)
    memory needed:       0.08 (MB)
@@ -128,7 +128,7 @@ symbolic analysis:
    nnz (U):             902.
 numeric factorization:
    status:     0.
-   time:      0.78E-02
+   time:      0.34E-02
    actual numeric LU statistics:
    size of LU:          0.01 (MB)
    memory needed:       0.06 (MB)

diff --git a/UMFPACK/Demo/umf4zhb.out b/UMFPACK/Demo/umf4zhb.out
@@ -1,4 +1,4 @@
-UMFPACK V6.3.3 (Mar 22, 2024), Control:
+UMFPACK V6.3.5 (Sept 23, 2024), Control:
     Matrix entry defined as: double complex
     Int (generic integer) defined as: int32_t
 
@@ -33,17 +33,17 @@ UMFPACK V6.3.3 (Mar 22, 2024), Control:
     The following options can only be changed at compile-time:
     8: BLAS library used:  Intel MKL 64lp BLAS (32-bit integers).  size of BLAS integer: 4
     compiled for ANSI C
-    CPU timer: SuiteSparse_time ( )
+    CPU timer: omp_get_wtime
     compiled with CHOLMOD ordering options
     computer/operating system: Linux
     size of int32_t: 4 int64_t: 8 Int: 4 pointer: 8 double: 8 Entry: 16 (in bytes)
 
-UMFPACK V6.3.3 (Mar 22, 2024), Info:
+UMFPACK V6.3.5 (Sept 23, 2024), Info:
     matrix entry defined as:          double complex
     Int (generic integer) defined as: int32_t
     BLAS library used: Intel MKL 64lp BLAS (32-bit integers).  size of BLAS integer: 4
     MATLAB: no.
-    CPU timer: SuiteSparse_time ( )
+    CPU timer: omp_get_wtime
     number of rows in matrix A:       324
     number of columns in matrix A:    324
     entries in matrix A:              26730
@@ -119,10 +119,10 @@ UMFPACK V6.3.3 (Mar 22, 2024), Info:
     numeric factorization defragmentations:        0
     numeric factorization reallocations:           0
     costly numeric factorization reallocations:    0
-    numeric factorization wallclock time (sec):    0.02
-    numeric factorization mflops (wallclock):      853.80
-    symbolic + numeric wall clock time (sec):      0.02
-    symbolic + numeric mflops (wall clock):        770.03
+    numeric factorization wallclock time (sec):    0.01
+    numeric factorization mflops (wallclock):      2377.42
+    symbolic + numeric wall clock time (sec):      0.01
+    symbolic + numeric mflops (wall clock):        2023.42
 
     solve flops:                                   3.70332e+05
     iterative refinement steps taken:              0
@@ -134,7 +134,7 @@ UMFPACK V6.3.3 (Mar 22, 2024), Info:
  Matrix key: QC324                         
 symbolic analysis:
    status:     0.
-   time:      0.18E-02 (sec)
+   time:      0.11E-02 (sec)
    estimates (upper bound) for numeric LU:
    size of LU:          1.17 (MB)
    memory needed:       2.40 (MB)
@@ -143,11 +143,11 @@ symbolic analysis:
    nnz (U):           39609.
 numeric factorization:
    status:     0.
-   time:      0.17E-01
+   time:      0.60E-02
    actual numeric LU statistics:
    size of LU:          0.72 (MB)
    memory needed:       1.14 (MB)
    flop count:      0.14E+08
    nnz (L):           23247.
    nnz (U):           23247.
- norm (A*x-b):    2.7037543144102808E-013
+ norm (A*x-b):    2.7082234386269613E-013
diff --git a/UMFPACK/Demo/umf4zhb64.out b/UMFPACK/Demo/umf4zhb64.out
@@ -1,4 +1,4 @@
-UMFPACK V6.3.3 (Mar 22, 2024), Control:
+UMFPACK V6.3.5 (Sept 23, 2024), Control:
     Matrix entry defined as: double complex
     Int (generic integer) defined as: int64_t
 
@@ -33,17 +33,17 @@ UMFPACK V6.3.3 (Mar 22, 2024), Control:
     The following options can only be changed at compile-time:
     8: BLAS library used:  Intel MKL 64lp BLAS (32-bit integers).  size of BLAS integer: 4
     compiled for ANSI C
-    CPU timer: SuiteSparse_time ( )
+    CPU timer: omp_get_wtime
     compiled with CHOLMOD ordering options
     computer/operating system: Linux
     size of int32_t: 4 int64_t: 8 Int: 8 pointer: 8 double: 8 Entry: 16 (in bytes)
 
-UMFPACK V6.3.3 (Mar 22, 2024), Info:
+UMFPACK V6.3.5 (Sept 23, 2024), Info:
     matrix entry defined as:          double complex
     Int (generic integer) defined as: int64_t
     BLAS library used: Intel MKL 64lp BLAS (32-bit integers).  size of BLAS integer: 4
     MATLAB: no.
-    CPU timer: SuiteSparse_time ( )
+    CPU timer: omp_get_wtime
     number of rows in matrix A:       324
     number of columns in matrix A:    324
     entries in matrix A:              26730
@@ -119,10 +119,10 @@ UMFPACK V6.3.3 (Mar 22, 2024), Info:
     numeric factorization defragmentations:        0
     numeric factorization reallocations:           0
     costly numeric factorization reallocations:    0
-    numeric factorization wallclock time (sec):    0.02
-    numeric factorization mflops (wallclock):      852.02
-    symbolic + numeric wall clock time (sec):      0.02
-    symbolic + numeric mflops (wall clock):        750.09
+    numeric factorization wallclock time (sec):    0.00
+    numeric factorization mflops (wallclock):      2886.50
+    symbolic + numeric wall clock time (sec):      0.01
+    symbolic + numeric mflops (wall clock):        2357.41
 
     solve flops:                                   3.70332e+05
     iterative refinement steps taken:              0
@@ -134,7 +134,7 @@ UMFPACK V6.3.3 (Mar 22, 2024), Info:
  Matrix key: QC324                         
 symbolic analysis:
    status:     0.
-   time:      0.23E-02 (sec)
+   time:      0.11E-02 (sec)
    estimates (upper bound) for numeric LU:
    size of LU:          1.37 (MB)
    memory needed:       2.97 (MB)
@@ -143,11 +143,11 @@ symbolic analysis:
    nnz (U):           39609.
 numeric factorization:
    status:     0.
-   time:      0.17E-01
+   time:      0.50E-02
    actual numeric LU statistics:
    size of LU:          0.74 (MB)
    memory needed:       1.38 (MB)
    flop count:      0.14E+08
    nnz (L):           23247.
    nnz (U):           23247.
- norm (A*x-b):    2.7037543144102808E-013
+ norm (A*x-b):    2.7082234386269613E-013