Skip to content

Commit

Permalink
CSparse 4.3.0: version update
Browse files Browse the repository at this point in the history
  • Loading branch information
@DrTimothyAldenDavis
DrTimothyAldenDavis committed Nov 28, 2023
1 parent 6453718 commit 02363ca
Show file tree
Hide file tree
Showing 4 changed files with 83 additions and 45 deletions.
4 changes: 2 additions & 2 deletions CSparse/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@

cmake_minimum_required ( VERSION 3.13 )

set ( CSPARSE_DATE "Sept 8, 2023" )
set ( CSPARSE_DATE "Dec 30, 2023" )
set ( CSPARSE_VERSION_MAJOR 4 CACHE STRING "" FORCE )
set ( CSPARSE_VERSION_MINOR 2 CACHE STRING "" FORCE )
set ( CSPARSE_VERSION_MINOR 3 CACHE STRING "" FORCE )
set ( CSPARSE_VERSION_SUB 0 CACHE STRING "" FORCE )

message ( STATUS "Building CSparse version: v"
Expand Down
116 changes: 75 additions & 41 deletions CSparse/Demo/cs_demo.out
View file
Original file line number Diff line number Diff line change
@@ -1,38 +1,72 @@
( cd build && cmake .. && cmake --build . --config Release -j8 )
-- Building CSparse version: v4.2.0 (Sept 8, 2023)
-- Source: /home/faculty/d/davis/dev2/SuiteSparse/CSparse
-- Build: /home/faculty/d/davis/dev2/SuiteSparse/CSparse/build
-- Building CSparse version: v4.3.0 (Dec 30, 2023)
-- Source: /home/davis/dev2/SuiteSparse/CSparse
-- Build: /home/davis/dev2/SuiteSparse/CSparse/build
-- Build type: Release
-- Also compiling the demos in CSparse/Demo
-- Configuring done (0.0s)
-- Generating done (0.0s)
-- Build files have been written to: /home/faculty/d/davis/dev2/SuiteSparse/CSparse/build
gmake[1]: Entering directory '/home/faculty/d/davis/dev2/SuiteSparse/CSparse/build'
[ 47%] Built target csparse_static
[ 93%] Built target csparse
[ 95%] Built target cs_demo1
[ 98%] Built target cs_demo2
[100%] Built target cs_demo3
gmake[1]: Leaving directory '/home/faculty/d/davis/dev2/SuiteSparse/CSparse/build'
-- Configuring done
-- Generating done
-- Build files have been written to: /home/davis/dev2/SuiteSparse/CSparse/build
make[1]: Entering directory '/home/davis/dev2/SuiteSparse/CSparse/build'
make[2]: Entering directory '/home/davis/dev2/SuiteSparse/CSparse/build'
make[3]: Entering directory '/home/davis/dev2/SuiteSparse/CSparse/build'
make[3]: Entering directory '/home/davis/dev2/SuiteSparse/CSparse/build'
Consolidate compiler generated dependencies of target csparse
make[3]: Leaving directory '/home/davis/dev2/SuiteSparse/CSparse/build'
Consolidate compiler generated dependencies of target csparse_static
make[3]: Leaving directory '/home/davis/dev2/SuiteSparse/CSparse/build'
[ 46%] Built target csparse
[ 93%] Built target csparse_static
make[3]: Entering directory '/home/davis/dev2/SuiteSparse/CSparse/build'
make[3]: Entering directory '/home/davis/dev2/SuiteSparse/CSparse/build'
make[3]: Entering directory '/home/davis/dev2/SuiteSparse/CSparse/build'
Consolidate compiler generated dependencies of target cs_demo2
make[3]: Leaving directory '/home/davis/dev2/SuiteSparse/CSparse/build'
Consolidate compiler generated dependencies of target cs_demo3
make[3]: Leaving directory '/home/davis/dev2/SuiteSparse/CSparse/build'
Consolidate compiler generated dependencies of target cs_demo1
make[3]: Leaving directory '/home/davis/dev2/SuiteSparse/CSparse/build'
[ 96%] Built target cs_demo2
[ 98%] Built target cs_demo3
[100%] Built target cs_demo1
make[2]: Leaving directory '/home/davis/dev2/SuiteSparse/CSparse/build'
make[1]: Leaving directory '/home/davis/dev2/SuiteSparse/CSparse/build'
( cd build && cmake -DDEMO=1 .. && cmake --build . --config Release -j8 )
-- Building CSparse version: v4.2.0 (Sept 8, 2023)
-- Source: /home/faculty/d/davis/dev2/SuiteSparse/CSparse
-- Build: /home/faculty/d/davis/dev2/SuiteSparse/CSparse/build
-- Building CSparse version: v4.3.0 (Dec 30, 2023)
-- Source: /home/davis/dev2/SuiteSparse/CSparse
-- Build: /home/davis/dev2/SuiteSparse/CSparse/build
-- Build type: Release
-- Also compiling the demos in CSparse/Demo
-- Configuring done (0.0s)
-- Generating done (0.0s)
-- Build files have been written to: /home/faculty/d/davis/dev2/SuiteSparse/CSparse/build
gmake[1]: Entering directory '/home/faculty/d/davis/dev2/SuiteSparse/CSparse/build'
[ 46%] Built target csparse
[ 93%] Built target csparse_static
[ 95%] Built target cs_demo1
[ 97%] Built target cs_demo3
-- Configuring done
-- Generating done
-- Build files have been written to: /home/davis/dev2/SuiteSparse/CSparse/build
make[1]: Entering directory '/home/davis/dev2/SuiteSparse/CSparse/build'
make[2]: Entering directory '/home/davis/dev2/SuiteSparse/CSparse/build'
make[3]: Entering directory '/home/davis/dev2/SuiteSparse/CSparse/build'
make[3]: Entering directory '/home/davis/dev2/SuiteSparse/CSparse/build'
Consolidate compiler generated dependencies of target csparse_static
make[3]: Leaving directory '/home/davis/dev2/SuiteSparse/CSparse/build'
Consolidate compiler generated dependencies of target csparse
make[3]: Leaving directory '/home/davis/dev2/SuiteSparse/CSparse/build'
[ 47%] Built target csparse_static
[ 93%] Built target csparse
make[3]: Entering directory '/home/davis/dev2/SuiteSparse/CSparse/build'
make[3]: Entering directory '/home/davis/dev2/SuiteSparse/CSparse/build'
make[3]: Entering directory '/home/davis/dev2/SuiteSparse/CSparse/build'
Consolidate compiler generated dependencies of target cs_demo3
make[3]: Leaving directory '/home/davis/dev2/SuiteSparse/CSparse/build'
Consolidate compiler generated dependencies of target cs_demo2
make[3]: Leaving directory '/home/davis/dev2/SuiteSparse/CSparse/build'
Consolidate compiler generated dependencies of target cs_demo1
make[3]: Leaving directory '/home/davis/dev2/SuiteSparse/CSparse/build'
[ 95%] Built target cs_demo3
[ 97%] Built target cs_demo1
[100%] Built target cs_demo2
gmake[1]: Leaving directory '/home/faculty/d/davis/dev2/SuiteSparse/CSparse/build'
make[2]: Leaving directory '/home/davis/dev2/SuiteSparse/CSparse/build'
make[1]: Leaving directory '/home/davis/dev2/SuiteSparse/CSparse/build'
./build/cs_demo1 < ./Matrix/t1
T:
CSparse Version 4.2.0, Sept 8, 2023. Copyright (c) Timothy A. Davis, 2006-2022
CSparse Version 4.3.0, Dec 30, 2023. Copyright (c) Timothy A. Davis, 2006-2022
triplet: 4-by-4, nzmax: 16 nnz: 10
2 2 : 3
1 0 : 3.1
Expand All @@ -45,7 +79,7 @@ triplet: 4-by-4, nzmax: 16 nnz: 10
0 0 : 4.5
2 1 : 1.7
A:
CSparse Version 4.2.0, Sept 8, 2023. Copyright (c) Timothy A. Davis, 2006-2022
CSparse Version 4.3.0, Dec 30, 2023. Copyright (c) Timothy A. Davis, 2006-2022
4-by-4, nzmax: 10 nnz: 10, 1-norm: 11.1
col 0 : locations 0 to 2
1 : 3.1
Expand All @@ -62,7 +96,7 @@ CSparse Version 4.2.0, Sept 8, 2023. Copyright (c) Timothy A. Davis, 2006-2022
3 : 1
1 : 0.9
AT:
CSparse Version 4.2.0, Sept 8, 2023. Copyright (c) Timothy A. Davis, 2006-2022
CSparse Version 4.3.0, Dec 30, 2023. Copyright (c) Timothy A. Davis, 2006-2022
4-by-4, nzmax: 10 nnz: 10, 1-norm: 7.7
col 0 : locations 0 to 1
0 : 4.5
Expand All @@ -79,7 +113,7 @@ CSparse Version 4.2.0, Sept 8, 2023. Copyright (c) Timothy A. Davis, 2006-2022
1 : 0.4
3 : 1
D:
CSparse Version 4.2.0, Sept 8, 2023. Copyright (c) Timothy A. Davis, 2006-2022
CSparse Version 4.3.0, Dec 30, 2023. Copyright (c) Timothy A. Davis, 2006-2022
4-by-4, nzmax: 16 nnz: 16, 1-norm: 139.58
col 0 : locations 0 to 3
1 : 13.95
Expand Down Expand Up @@ -135,7 +169,7 @@ Chol amd(A+A') time: 0.00 resid: 2.55e-19
zero entries dropped: 71
tiny entries dropped: 10
blocks: 38 singletons: 37 structural rank: 183
QR natural time: 0.00 resid: 6.84e-28
QR natural time: 0.01 resid: 6.84e-28
QR amd(A'*A) time: 0.00 resid: 9.38e-28
LU natural time: 0.00 resid: 6.20e-28
LU amd(A+A') time: 0.00 resid: 1.55e-27
Expand All @@ -145,8 +179,8 @@ LU amd(A'*A) time: 0.00 resid: 6.98e-28

--- Matrix: 492-by-490, nnz: 49920 (sym: 0: nnz 0), norm: 9.29e-01
blocks: 10 singletons: 8 structural rank: 448
QR natural time: 0.06 resid: nan
QR amd(A'*A) time: 0.07 resid: nan
QR natural time: 0.11 resid: nan
QR amd(A'*A) time: 0.14 resid: nan
./build/cs_demo2 < ./Matrix/west0067

--- Matrix: 67-by-67, nnz: 294 (sym: 0: nnz 0), norm: 6.14e+00
Expand All @@ -167,11 +201,11 @@ QR amd(A'*A) time: 0.00 resid: 2.25e-16

--- Matrix: 4884-by-4884, nnz: 147631 (sym: -1: nnz 290378), norm: 7.01e+09
blocks: 75 singletons: 74 structural rank: 4884
QR amd(A'*A) time: 0.68 resid: 1.39e-22
LU amd(A+A') time: 0.33 resid: 1.10e-22
LU amd(S'*S) time: 0.34 resid: 1.28e-22
LU amd(A'*A) time: 0.34 resid: 1.78e-22
Chol amd(A+A') time: 0.11 resid: 1.19e-22
QR amd(A'*A) time: 1.41 resid: 1.39e-22
LU amd(A+A') time: 0.81 resid: 1.10e-22
LU amd(S'*S) time: 0.79 resid: 1.28e-22
LU amd(A'*A) time: 0.83 resid: 1.78e-22
Chol amd(A+A') time: 0.25 resid: 1.19e-22
./build/cs_demo3 < ./Matrix/bcsstk01

--- Matrix: 48-by-48, nnz: 224 (sym: -1: nnz 400), norm: 3.57e+09
Expand All @@ -191,12 +225,12 @@ downdate: time: 0.00 (incl solve) resid: 3.74e-17
--- Matrix: 4884-by-4884, nnz: 147631 (sym: -1: nnz 290378), norm: 7.01e+09

chol then update/downdate amd(A+A')
symbolic chol time 0.01
numeric chol time 0.10
symbolic chol time 0.02
numeric chol time 0.22
solve chol time 0.00
original: resid: 1.19e-22
update: time: 0.00
update: time: 0.00 (incl solve) resid: 1.12e-23
rechol: time: 0.10 (incl solve) resid: 1.17e-23
rechol: time: 0.23 (incl solve) resid: 1.17e-23
downdate: time: 0.00
downdate: time: 0.00 (incl solve) resid: 4.09e-22
downdate: time: 0.01 (incl solve) resid: 4.09e-22
4 changes: 4 additions & 0 deletions CSparse/Doc/ChangeLog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
Dec 30, 2023: version 4.3.0

* major change to build system: by Markus Mützel

Sept 8, 2023: version 4.2.0

* cmake updates: SuiteSparse:: namespace by Markus Muetzel
Expand Down
4 changes: 2 additions & 2 deletions CSparse/Include/cs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
#include "mex.h"
#endif
#define CS_VER 4 /* CSparse Version */
#define CS_SUBVER 2
#define CS_SUBVER 3
#define CS_SUBSUB 0
#define CS_DATE "Sept 8, 2023" /* CSparse release date */
#define CS_DATE "Dec 30, 2023" /* CSparse release date */
#define CS_COPYRIGHT "Copyright (c) Timothy A. Davis, 2006-2022"

#ifndef csi
Expand Down

0 comments on commit 02363ca

Please sign in to comment.