UMFPACK 6.3.0: version update, remove amd_internal.h

DrTimothyAldenDavis · Nov 28, 2023 · 8934550 · 8934550
1 parent a4cd618
commit 8934550
Show file tree

Hide file tree

Showing 28 changed files with 345 additions and 415 deletions.
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 "Oct 23, 2023" )
+set ( UMFPACK_DATE "Dec 30, 2023" )
 set ( UMFPACK_VERSION_MAJOR 6 CACHE STRING "" FORCE )
-set ( UMFPACK_VERSION_MINOR 2 CACHE STRING "" FORCE )
-set ( UMFPACK_VERSION_SUB   2 CACHE STRING "" FORCE )
+set ( UMFPACK_VERSION_MINOR 3 CACHE STRING "" FORCE )
+set ( UMFPACK_VERSION_SUB   0 CACHE STRING "" FORCE )
 
 message ( STATUS "Building UMFPACK version: v"
     ${UMFPACK_VERSION_MAJOR}.
@@ -61,35 +61,35 @@ else ( )
 endif ( )
 
 if ( NOT SUITESPARSE_ROOT_CMAKELISTS )
-    find_package ( SuiteSparse_config 7.3.0
+    find_package ( SuiteSparse_config 7.4.0
         PATHS ${CMAKE_SOURCE_DIR}/../SuiteSparse_config/build NO_DEFAULT_PATH )
     if ( NOT TARGET SuiteSparse::SuiteSparseConfig )
-        find_package ( SuiteSparse_config 7.3.0 REQUIRED )
+        find_package ( SuiteSparse_config 7.4.0 REQUIRED )
     endif ( )
 
-    find_package ( AMD 3.2.1
+    find_package ( AMD 3.3.0
         PATHS ${CMAKE_SOURCE_DIR}/../AMD/build NO_DEFAULT_PATH )
     if ( NOT TARGET SuiteSparse::AMD )
-        find_package ( AMD 3.2.1 REQUIRED )
+        find_package ( AMD 3.3.0 REQUIRED )
     endif ( )
 
     if ( DEMO AND NOT WIN32 )
-        find_package ( COLAMD 3.2.1
+        find_package ( COLAMD 3.3.0
             PATHS ${CMAKE_SOURCE_DIR}/../COLAMD/build NO_DEFAULT_PATH )
         if ( NOT TARGET SuiteSparse::COLAMD )
-            find_package ( COLAMD 3.2.1 REQUIRED )
+            find_package ( COLAMD 3.3.0 REQUIRED )
         endif ( )
 
-        find_package ( CAMD 3.2.1
+        find_package ( CAMD 3.3.0
             PATHS ${CMAKE_SOURCE_DIR}/../CAMD/build NO_DEFAULT_PATH )
         if ( NOT TARGET SuiteSparse::CAMD )
-            find_package ( CAMD 3.2.1 REQUIRED )
+            find_package ( CAMD 3.3.0 REQUIRED )
         endif ( )
 
-        find_package ( CCOLAMD 3.2.1
+        find_package ( CCOLAMD 3.3.0
             PATHS ${CMAKE_SOURCE_DIR}/../CCOLAMD/build NO_DEFAULT_PATH )
         if ( NOT TARGET SuiteSparse::CCOLAMD )
-            find_package ( CCOLAMD 3.2.1 REQUIRED )
+            find_package ( CCOLAMD 3.3.0 REQUIRED )
         endif ( )
     endif ( )
 endif ( )
@@ -100,10 +100,10 @@ option ( NCHOLMOD "ON: do not use CHOLMOD.  OFF (default): use CHOLMOD" OFF )
 
 if ( NOT SUITESPARSE_ROOT_CMAKELISTS AND NOT NCHOLMOD )
     # look for CHOLMOD (optional fill-reducing orderings)
-    find_package ( CHOLMOD 5.0.0
+    find_package ( CHOLMOD 5.1.0
         PATHS ${CMAKE_SOURCE_DIR}/../CHOLMOD/build NO_DEFAULT_PATH )
     if ( NOT TARGET SuiteSparse::CHOLMOD )
-        find_package ( CHOLMOD 5.0.0 )
+        find_package ( CHOLMOD 5.1.0 )
     endif ( )
 
     if ( NOT CHOLMOD_FOUND )

diff --git a/UMFPACK/Demo/umf4hb.out b/UMFPACK/Demo/umf4hb.out
@@ -1,4 +1,4 @@
-UMFPACK V6.2.1 (Sept 18, 2023), Control:
+UMFPACK V6.3.0 (Dec 30, 2023), Control:
     Matrix entry defined as: double
     Int (generic integer) defined as: int32_t
 
@@ -38,7 +38,7 @@ UMFPACK V6.2.1 (Sept 18, 2023), Control:
     computer/operating system: Linux
     size of int32_t: 4 int64_t: 8 Int: 4 pointer: 8 double: 8 Entry: 8 (in bytes)
 
-UMFPACK V6.2.1 (Sept 18, 2023), Info:
+UMFPACK V6.3.0 (Dec 30, 2023), 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
@@ -106,8 +106,8 @@ UMFPACK V6.2.1 (Sept 18, 2023), 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.04
+    numeric factorization mflops (wallclock):      0.07
 
     solve flops:                                   1.20800e+03
     iterative refinement steps taken:              0
@@ -119,7 +119,7 @@ UMFPACK V6.2.1 (Sept 18, 2023), Info:
  Matrix key: WEST0067                      
 symbolic analysis:
    status:     0.
-   time:      0.10E-03 (sec)
+   time:      0.18E-03 (sec)
    estimates (upper bound) for numeric LU:
    size of LU:          0.02 (MB)
    memory needed:       0.06 (MB)
@@ -128,7 +128,7 @@ symbolic analysis:
    nnz (U):             902.
 numeric factorization:
    status:     0.
-   time:      0.77E-02
+   time:      0.38E-01
    actual numeric LU statistics:
    size of LU:          0.01 (MB)
    memory needed:       0.04 (MB)

diff --git a/UMFPACK/Demo/umf4hb64.out b/UMFPACK/Demo/umf4hb64.out
@@ -1,4 +1,4 @@
-UMFPACK V6.2.1 (Sept 18, 2023), Control:
+UMFPACK V6.3.0 (Dec 30, 2023), Control:
     Matrix entry defined as: double
     Int (generic integer) defined as: int64_t
 
@@ -38,7 +38,7 @@ UMFPACK V6.2.1 (Sept 18, 2023), Control:
     computer/operating system: Linux
     size of int32_t: 4 int64_t: 8 Int: 8 pointer: 8 double: 8 Entry: 8 (in bytes)
 
-UMFPACK V6.2.1 (Sept 18, 2023), Info:
+UMFPACK V6.3.0 (Dec 30, 2023), 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
@@ -107,7 +107,7 @@ UMFPACK V6.2.1 (Sept 18, 2023), Info:
     numeric factorization reallocations:           1
     costly numeric factorization reallocations:    1
     numeric factorization wallclock time (sec):    0.03
-    numeric factorization mflops (wallclock):      0.10
+    numeric factorization mflops (wallclock):      0.08
 
     solve flops:                                   1.20800e+03
     iterative refinement steps taken:              0
@@ -119,7 +119,7 @@ UMFPACK V6.2.1 (Sept 18, 2023), Info:
  Matrix key: WEST0067                      
 symbolic analysis:
    status:     0.
-   time:      0.11E-03 (sec)
+   time:      0.20E-03 (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.27E-01
+   time:      0.35E-01
    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.2.1 (Sept 18, 2023), Control:
+UMFPACK V6.3.0 (Dec 30, 2023), Control:
     Matrix entry defined as: double complex
     Int (generic integer) defined as: int32_t
 
@@ -38,7 +38,7 @@ UMFPACK V6.2.1 (Sept 18, 2023), Control:
     computer/operating system: Linux
     size of int32_t: 4 int64_t: 8 Int: 4 pointer: 8 double: 8 Entry: 16 (in bytes)
 
-UMFPACK V6.2.1 (Sept 18, 2023), Info:
+UMFPACK V6.3.0 (Dec 30, 2023), 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
@@ -119,10 +119,10 @@ UMFPACK V6.2.1 (Sept 18, 2023), 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):      783.23
-    symbolic + numeric wall clock time (sec):      0.02
-    symbolic + numeric mflops (wall clock):        712.11
+    numeric factorization wallclock time (sec):    0.14
+    numeric factorization mflops (wallclock):      102.27
+    symbolic + numeric wall clock time (sec):      0.14
+    symbolic + numeric mflops (wall clock):        99.78
 
     solve flops:                                   3.70332e+05
     iterative refinement steps taken:              0
@@ -134,7 +134,7 @@ UMFPACK V6.2.1 (Sept 18, 2023), Info:
  Matrix key: QC324                         
 symbolic analysis:
    status:     0.
-   time:      0.18E-02 (sec)
+   time:      0.35E-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.18E-01
+   time:      0.14E+00
    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.2.1 (Sept 18, 2023), Control:
+UMFPACK V6.3.0 (Dec 30, 2023), Control:
     Matrix entry defined as: double complex
     Int (generic integer) defined as: int64_t
 
@@ -38,7 +38,7 @@ UMFPACK V6.2.1 (Sept 18, 2023), Control:
     computer/operating system: Linux
     size of int32_t: 4 int64_t: 8 Int: 8 pointer: 8 double: 8 Entry: 16 (in bytes)
 
-UMFPACK V6.2.1 (Sept 18, 2023), Info:
+UMFPACK V6.3.0 (Dec 30, 2023), 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
@@ -119,10 +119,10 @@ UMFPACK V6.2.1 (Sept 18, 2023), Info:
     numeric factorization defragmentations:        0
     numeric factorization reallocations:           0
     costly numeric factorization reallocations:    0
-    numeric factorization wallclock time (sec):    0.01
-    numeric factorization mflops (wallclock):      962.67
-    symbolic + numeric wall clock time (sec):      0.02
-    symbolic + numeric mflops (wall clock):        839.26
+    numeric factorization wallclock time (sec):    0.29
+    numeric factorization mflops (wallclock):      50.19
+    symbolic + numeric wall clock time (sec):      0.29
+    symbolic + numeric mflops (wall clock):        49.53
 
     solve flops:                                   3.70332e+05
     iterative refinement steps taken:              0
@@ -134,7 +134,7 @@ UMFPACK V6.2.1 (Sept 18, 2023), Info:
  Matrix key: QC324                         
 symbolic analysis:
    status:     0.
-   time:      0.22E-02 (sec)
+   time:      0.38E-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.15E-01
+   time:      0.29E+00
    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
diff --git a/UMFPACK/Demo/umfpack_di_demo.out b/UMFPACK/Demo/umfpack_di_demo.out
@@ -1,5 +1,5 @@
 
-UMFPACK V6.2 (Sept 18, 2023) demo: _di_ version
+UMFPACK V6.3 (Dec 30, 2023) demo: _di_ version
 
 UMFPACK:  Copyright (c) 2005-2023 by Timothy A. Davis.  All Rights Reserved.
 
@@ -10,9 +10,9 @@ UMFPACK License: SPDX-License-Identifier: GPL-2.0+
 
 
 Availability: http://www.suitesparse.com
-UMFPACK V6.2.1 (Sept 18, 2023): OK
+UMFPACK V6.3.0 (Dec 30, 2023): OK
 
-UMFPACK V6.2.1 (Sept 18, 2023), Control:
+UMFPACK V6.3.0 (Dec 30, 2023), Control:
     Matrix entry defined as: double
     Int (generic integer) defined as: int32_t
 
@@ -257,7 +257,7 @@ diagonal of U: dense vector, n = 5.
 
     Numeric object:  OK
 
-UMFPACK V6.2.1 (Sept 18, 2023), Info:
+UMFPACK V6.3.0 (Dec 30, 2023), 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
@@ -346,7 +346,7 @@ UMFPACK V6.2.1 (Sept 18, 2023), Info:
 
 UMFPACK:  Copyright (c) 2005-2023 by Timothy A. Davis.  All Rights Reserved.
 
-UMFPACK V6.2.1 (Sept 18, 2023): OK
+UMFPACK V6.3.0 (Dec 30, 2023): OK
 
 
 x (solution of Ax=b): dense vector, n = 5. 
@@ -362,7 +362,7 @@ maxnorm of residual: 1.06581e-14
 
 UMFPACK:  Copyright (c) 2005-2023 by Timothy A. Davis.  All Rights Reserved.
 
-UMFPACK V6.2.1 (Sept 18, 2023): OK
+UMFPACK V6.3.0 (Dec 30, 2023): OK
 
 determinant: (1.14) * 10^(2)
 
@@ -376,7 +376,7 @@ x (solution of Ax=b, solve is split into 3 steps): dense vector, n = 5.
 
 maxnorm of residual: 1.06581e-14
 
-UMFPACK V6.2.1 (Sept 18, 2023), Info:
+UMFPACK V6.3.0 (Dec 30, 2023), 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
@@ -605,7 +605,7 @@ diagonal of U: dense vector, n = 5.
 
     Numeric object:  OK
 
-UMFPACK V6.2.1 (Sept 18, 2023), Info:
+UMFPACK V6.3.0 (Dec 30, 2023), 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
@@ -852,7 +852,7 @@ diagonal of U: dense vector, n = 5.
 
     Numeric object:  OK
 
-UMFPACK V6.2.1 (Sept 18, 2023), Info:
+UMFPACK V6.3.0 (Dec 30, 2023), 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
@@ -1300,7 +1300,7 @@ Freeing numeric object:
 Loading numeric object:
 
 Done loading numeric object
-UMFPACK V6.2.1 (Sept 18, 2023), Info:
+UMFPACK V6.3.0 (Dec 30, 2023), 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
@@ -1509,7 +1509,7 @@ Done copying numeric object
 Numeric blob size: 752
 
 Done serialize/deserialize of numeric object
-UMFPACK V6.2.1 (Sept 18, 2023), Info:
+UMFPACK V6.3.0 (Dec 30, 2023), 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
@@ -1607,7 +1607,7 @@ maxnorm of residual: 3.55271e-15
 
 
 Solving C'x=b again, using umfpack_di_wsolve instead:
-UMFPACK V6.2.1 (Sept 18, 2023), Info:
+UMFPACK V6.3.0 (Dec 30, 2023), 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
@@ -1705,4 +1705,4 @@ maxnorm of residual: 3.55271e-15
 
 
 umfpack_di_demo complete.
-Total time:  0.00 seconds (CPU time),  0.00 seconds (wallclock time)
+Total time:  0.01 seconds (CPU time),  0.01 seconds (wallclock time)