Skip to content

Commit 02363ca

Browse files
DrTimothyAldenDavisDrTimothyAldenDavis
committed
CSparse 4.3.0: version update
1 parent 6453718 commit 02363ca

File tree

4 files changed

+83
-45
lines changed

4 files changed

+83
-45
lines changed

‎CSparse/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717

1818
cmake_minimum_required ( VERSION 3.13 )
1919

20-
set ( CSPARSE_DATE "Sept 8, 2023" )
20+
set ( CSPARSE_DATE "Dec 30, 2023" )
2121
set ( CSPARSE_VERSION_MAJOR 4 CACHE STRING "" FORCE )
22-
set ( CSPARSE_VERSION_MINOR 2 CACHE STRING "" FORCE )
22+
set ( CSPARSE_VERSION_MINOR 3 CACHE STRING "" FORCE )
2323
set ( CSPARSE_VERSION_SUB 0 CACHE STRING "" FORCE )
2424

2525
message ( STATUS "Building CSparse version: v"

‎CSparse/Demo/cs_demo.out‎

Lines changed: 75 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,72 @@
11
( cd build && cmake .. && cmake --build . --config Release -j8 )
2-
-- Building CSparse version: v4.2.0 (Sept 8, 2023)
3-
-- Source: /home/faculty/d/davis/dev2/SuiteSparse/CSparse
4-
-- Build: /home/faculty/d/davis/dev2/SuiteSparse/CSparse/build
2+
-- Building CSparse version: v4.3.0 (Dec 30, 2023)
3+
-- Source: /home/davis/dev2/SuiteSparse/CSparse
4+
-- Build: /home/davis/dev2/SuiteSparse/CSparse/build
55
-- Build type: Release
66
-- Also compiling the demos in CSparse/Demo
7-
-- Configuring done (0.0s)
8-
-- Generating done (0.0s)
9-
-- Build files have been written to: /home/faculty/d/davis/dev2/SuiteSparse/CSparse/build
10-
gmake[1]: Entering directory '/home/faculty/d/davis/dev2/SuiteSparse/CSparse/build'
11-
[ 47%] Built target csparse_static
12-
[ 93%] Built target csparse
13-
[ 95%] Built target cs_demo1
14-
[ 98%] Built target cs_demo2
15-
[100%] Built target cs_demo3
16-
gmake[1]: Leaving directory '/home/faculty/d/davis/dev2/SuiteSparse/CSparse/build'
7+
-- Configuring done
8+
-- Generating done
9+
-- Build files have been written to: /home/davis/dev2/SuiteSparse/CSparse/build
10+
make[1]: Entering directory '/home/davis/dev2/SuiteSparse/CSparse/build'
11+
make[2]: Entering directory '/home/davis/dev2/SuiteSparse/CSparse/build'
12+
make[3]: Entering directory '/home/davis/dev2/SuiteSparse/CSparse/build'
13+
make[3]: Entering directory '/home/davis/dev2/SuiteSparse/CSparse/build'
14+
Consolidate compiler generated dependencies of target csparse
15+
make[3]: Leaving directory '/home/davis/dev2/SuiteSparse/CSparse/build'
16+
Consolidate compiler generated dependencies of target csparse_static
17+
make[3]: Leaving directory '/home/davis/dev2/SuiteSparse/CSparse/build'
18+
[ 46%] Built target csparse
19+
[ 93%] Built target csparse_static
20+
make[3]: Entering directory '/home/davis/dev2/SuiteSparse/CSparse/build'
21+
make[3]: Entering directory '/home/davis/dev2/SuiteSparse/CSparse/build'
22+
make[3]: Entering directory '/home/davis/dev2/SuiteSparse/CSparse/build'
23+
Consolidate compiler generated dependencies of target cs_demo2
24+
make[3]: Leaving directory '/home/davis/dev2/SuiteSparse/CSparse/build'
25+
Consolidate compiler generated dependencies of target cs_demo3
26+
make[3]: Leaving directory '/home/davis/dev2/SuiteSparse/CSparse/build'
27+
Consolidate compiler generated dependencies of target cs_demo1
28+
make[3]: Leaving directory '/home/davis/dev2/SuiteSparse/CSparse/build'
29+
[ 96%] Built target cs_demo2
30+
[ 98%] Built target cs_demo3
31+
[100%] Built target cs_demo1
32+
make[2]: Leaving directory '/home/davis/dev2/SuiteSparse/CSparse/build'
33+
make[1]: Leaving directory '/home/davis/dev2/SuiteSparse/CSparse/build'
1734
( cd build && cmake -DDEMO=1 .. && cmake --build . --config Release -j8 )
18-
-- Building CSparse version: v4.2.0 (Sept 8, 2023)
19-
-- Source: /home/faculty/d/davis/dev2/SuiteSparse/CSparse
20-
-- Build: /home/faculty/d/davis/dev2/SuiteSparse/CSparse/build
35+
-- Building CSparse version: v4.3.0 (Dec 30, 2023)
36+
-- Source: /home/davis/dev2/SuiteSparse/CSparse
37+
-- Build: /home/davis/dev2/SuiteSparse/CSparse/build
2138
-- Build type: Release
2239
-- Also compiling the demos in CSparse/Demo
23-
-- Configuring done (0.0s)
24-
-- Generating done (0.0s)
25-
-- Build files have been written to: /home/faculty/d/davis/dev2/SuiteSparse/CSparse/build
26-
gmake[1]: Entering directory '/home/faculty/d/davis/dev2/SuiteSparse/CSparse/build'
27-
[ 46%] Built target csparse
28-
[ 93%] Built target csparse_static
29-
[ 95%] Built target cs_demo1
30-
[ 97%] Built target cs_demo3
40+
-- Configuring done
41+
-- Generating done
42+
-- Build files have been written to: /home/davis/dev2/SuiteSparse/CSparse/build
43+
make[1]: Entering directory '/home/davis/dev2/SuiteSparse/CSparse/build'
44+
make[2]: Entering directory '/home/davis/dev2/SuiteSparse/CSparse/build'
45+
make[3]: Entering directory '/home/davis/dev2/SuiteSparse/CSparse/build'
46+
make[3]: Entering directory '/home/davis/dev2/SuiteSparse/CSparse/build'
47+
Consolidate compiler generated dependencies of target csparse_static
48+
make[3]: Leaving directory '/home/davis/dev2/SuiteSparse/CSparse/build'
49+
Consolidate compiler generated dependencies of target csparse
50+
make[3]: Leaving directory '/home/davis/dev2/SuiteSparse/CSparse/build'
51+
[ 47%] Built target csparse_static
52+
[ 93%] Built target csparse
53+
make[3]: Entering directory '/home/davis/dev2/SuiteSparse/CSparse/build'
54+
make[3]: Entering directory '/home/davis/dev2/SuiteSparse/CSparse/build'
55+
make[3]: Entering directory '/home/davis/dev2/SuiteSparse/CSparse/build'
56+
Consolidate compiler generated dependencies of target cs_demo3
57+
make[3]: Leaving directory '/home/davis/dev2/SuiteSparse/CSparse/build'
58+
Consolidate compiler generated dependencies of target cs_demo2
59+
make[3]: Leaving directory '/home/davis/dev2/SuiteSparse/CSparse/build'
60+
Consolidate compiler generated dependencies of target cs_demo1
61+
make[3]: Leaving directory '/home/davis/dev2/SuiteSparse/CSparse/build'
62+
[ 95%] Built target cs_demo3
63+
[ 97%] Built target cs_demo1
3164
[100%] Built target cs_demo2
32-
gmake[1]: Leaving directory '/home/faculty/d/davis/dev2/SuiteSparse/CSparse/build'
65+
make[2]: Leaving directory '/home/davis/dev2/SuiteSparse/CSparse/build'
66+
make[1]: Leaving directory '/home/davis/dev2/SuiteSparse/CSparse/build'
3367
./build/cs_demo1 < ./Matrix/t1
3468
T:
35-
CSparse Version 4.2.0, Sept 8, 2023. Copyright (c) Timothy A. Davis, 2006-2022
69+
CSparse Version 4.3.0, Dec 30, 2023. Copyright (c) Timothy A. Davis, 2006-2022
3670
triplet: 4-by-4, nzmax: 16 nnz: 10
3771
2 2 : 3
3872
1 0 : 3.1
@@ -45,7 +79,7 @@ triplet: 4-by-4, nzmax: 16 nnz: 10
4579
0 0 : 4.5
4680
2 1 : 1.7
4781
A:
48-
CSparse Version 4.2.0, Sept 8, 2023. Copyright (c) Timothy A. Davis, 2006-2022
82+
CSparse Version 4.3.0, Dec 30, 2023. Copyright (c) Timothy A. Davis, 2006-2022
4983
4-by-4, nzmax: 10 nnz: 10, 1-norm: 11.1
5084
col 0 : locations 0 to 2
5185
1 : 3.1
@@ -62,7 +96,7 @@ CSparse Version 4.2.0, Sept 8, 2023. Copyright (c) Timothy A. Davis, 2006-2022
6296
3 : 1
6397
1 : 0.9
6498
AT:
65-
CSparse Version 4.2.0, Sept 8, 2023. Copyright (c) Timothy A. Davis, 2006-2022
99+
CSparse Version 4.3.0, Dec 30, 2023. Copyright (c) Timothy A. Davis, 2006-2022
66100
4-by-4, nzmax: 10 nnz: 10, 1-norm: 7.7
67101
col 0 : locations 0 to 1
68102
0 : 4.5
@@ -79,7 +113,7 @@ CSparse Version 4.2.0, Sept 8, 2023. Copyright (c) Timothy A. Davis, 2006-2022
79113
1 : 0.4
80114
3 : 1
81115
D:
82-
CSparse Version 4.2.0, Sept 8, 2023. Copyright (c) Timothy A. Davis, 2006-2022
116+
CSparse Version 4.3.0, Dec 30, 2023. Copyright (c) Timothy A. Davis, 2006-2022
83117
4-by-4, nzmax: 16 nnz: 16, 1-norm: 139.58
84118
col 0 : locations 0 to 3
85119
1 : 13.95
@@ -135,7 +169,7 @@ Chol amd(A+A') time: 0.00 resid: 2.55e-19
135169
zero entries dropped: 71
136170
tiny entries dropped: 10
137171
blocks: 38 singletons: 37 structural rank: 183
138-
QR natural time: 0.00 resid: 6.84e-28
172+
QR natural time: 0.01 resid: 6.84e-28
139173
QR amd(A'*A) time: 0.00 resid: 9.38e-28
140174
LU natural time: 0.00 resid: 6.20e-28
141175
LU amd(A+A') time: 0.00 resid: 1.55e-27
@@ -145,8 +179,8 @@ LU amd(A'*A) time: 0.00 resid: 6.98e-28
145179

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

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

168202
--- Matrix: 4884-by-4884, nnz: 147631 (sym: -1: nnz 290378), norm: 7.01e+09
169203
blocks: 75 singletons: 74 structural rank: 4884
170-
QR amd(A'*A) time: 0.68 resid: 1.39e-22
171-
LU amd(A+A') time: 0.33 resid: 1.10e-22
172-
LU amd(S'*S) time: 0.34 resid: 1.28e-22
173-
LU amd(A'*A) time: 0.34 resid: 1.78e-22
174-
Chol amd(A+A') time: 0.11 resid: 1.19e-22
204+
QR amd(A'*A) time: 1.41 resid: 1.39e-22
205+
LU amd(A+A') time: 0.81 resid: 1.10e-22
206+
LU amd(S'*S) time: 0.79 resid: 1.28e-22
207+
LU amd(A'*A) time: 0.83 resid: 1.78e-22
208+
Chol amd(A+A') time: 0.25 resid: 1.19e-22
175209
./build/cs_demo3 < ./Matrix/bcsstk01
176210

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

193227
chol then update/downdate amd(A+A')
194-
symbolic chol time 0.01
195-
numeric chol time 0.10
228+
symbolic chol time 0.02
229+
numeric chol time 0.22
196230
solve chol time 0.00
197231
original: resid: 1.19e-22
198232
update: time: 0.00
199233
update: time: 0.00 (incl solve) resid: 1.12e-23
200-
rechol: time: 0.10 (incl solve) resid: 1.17e-23
234+
rechol: time: 0.23 (incl solve) resid: 1.17e-23
201235
downdate: time: 0.00
202-
downdate: time: 0.00 (incl solve) resid: 4.09e-22
236+
downdate: time: 0.01 (incl solve) resid: 4.09e-22

‎CSparse/Doc/ChangeLog‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
Dec 30, 2023: version 4.3.0
2+
3+
* major change to build system: by Markus Mützel
4+
15
Sept 8, 2023: version 4.2.0
26

37
* cmake updates: SuiteSparse:: namespace by Markus Muetzel

‎CSparse/Include/cs.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
#include "mex.h"
1414
#endif
1515
#define CS_VER 4 /* CSparse Version */
16-
#define CS_SUBVER 2
16+
#define CS_SUBVER 3
1717
#define CS_SUBSUB 0
18-
#define CS_DATE "Sept 8, 2023" /* CSparse release date */
18+
#define CS_DATE "Dec 30, 2023" /* CSparse release date */
1919
#define CS_COPYRIGHT "Copyright (c) Timothy A. Davis, 2006-2022"
2020

2121
#ifndef csi

0 commit comments

Comments
 (0)