Skip to content

Commit

Permalink
Merge pull request #281 from DrTimothyAldenDavis/dev2
Browse files Browse the repository at this point in the history
SuiteSparse v7.0.0.beta2
  • Loading branch information
DrTimothyAldenDavis authored Jan 17, 2023
2 parents 1a82bab + 48f946f commit 1d37915
Show file tree
Hide file tree
Showing 106 changed files with 328 additions and 429 deletions.
2 changes: 1 addition & 1 deletion AMD/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

cmake_minimum_required ( VERSION 3.19 )

set ( AMD_DATE "Jan 9, 2023" )
set ( AMD_DATE "Jan 17, 2023" )
set ( AMD_VERSION_MAJOR 3 )
set ( AMD_VERSION_MINOR 0 )
set ( AMD_VERSION_SUB 3 )
Expand Down
6 changes: 3 additions & 3 deletions AMD/Demo/amd_demo.out
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
AMD version 3.0.3, date: Jan 9, 2023
AMD version 3.0.3, date: Jan 17, 2023
AMD demo, with the 24-by-24 Harwell/Boeing matrix, can_24:

AMD version 3.0.3, Jan 9, 2023: approximate minimum degree ordering
AMD version 3.0.3, Jan 17, 2023: approximate minimum degree ordering
dense row parameter: 10
(rows with more than max (10 * sqrt (n), 16) entries are
considered "dense", and placed last in output permutation)
Expand Down Expand Up @@ -115,7 +115,7 @@ Plot of input matrix pattern:
23: . . . . . . X . . . . X X . . . . . . . . . . X
return value from amd_order: 0 (should be 0)

AMD version 3.0.3, Jan 9, 2023, results:
AMD version 3.0.3, Jan 17, 2023, results:
status: OK
n, dimension of A: 24
nz, number of nonzeros in A: 160
Expand Down
4 changes: 2 additions & 2 deletions AMD/Demo/amd_demo2.out
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
AMD demo, with a jumbled version of the 24-by-24
Harwell/Boeing matrix, can_24:

AMD version 3.0.3, Jan 9, 2023: approximate minimum degree ordering
AMD version 3.0.3, Jan 17, 2023: approximate minimum degree ordering
dense row parameter: 10
(rows with more than max (10 * sqrt (n), 16) entries are
considered "dense", and placed last in output permutation)
Expand Down Expand Up @@ -144,7 +144,7 @@ Plot of symmetric matrix to be ordered by amd_order:
23: . . . . . . X . . . . X X . . . . . . . . . . X
return value from amd_order: 1 (should be 1)

AMD version 3.0.3, Jan 9, 2023, results:
AMD version 3.0.3, Jan 17, 2023, results:
status: OK, but jumbled
n, dimension of A: 24
nz, number of nonzeros in A: 102
Expand Down
6 changes: 3 additions & 3 deletions AMD/Demo/amd_l_demo.out
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
AMD version 3.0.3, date: Jan 9, 2023
AMD version 3.0.3, date: Jan 17, 2023
AMD demo, with the 24-by-24 Harwell/Boeing matrix, can_24:

AMD version 3.0.3, Jan 9, 2023: approximate minimum degree ordering
AMD version 3.0.3, Jan 17, 2023: approximate minimum degree ordering
dense row parameter: 10
(rows with more than max (10 * sqrt (n), 16) entries are
considered "dense", and placed last in output permutation)
Expand Down Expand Up @@ -115,7 +115,7 @@ Plot of input matrix pattern:
23: . . . . . . X . . . . X X . . . . . . . . . . X
return value from amd_l_order: 0 (should be 0)

AMD version 3.0.3, Jan 9, 2023, results:
AMD version 3.0.3, Jan 17, 2023, results:
status: OK
n, dimension of A: 24
nz, number of nonzeros in A: 160
Expand Down
Binary file modified AMD/Doc/AMD_UserGuide.pdf
Binary file not shown.
2 changes: 1 addition & 1 deletion AMD/Doc/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Jan 9, 2023: version 3.0.3
Jan 17, 2023: version 3.0.3

* NFORTRAN: option added to disable Fortran entirely
* SuiteSparse_config: now v7.0.0
Expand Down
2 changes: 1 addition & 1 deletion AMD/Doc/amd_version.tex
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
% version of SuiteSparse/AMD
\date{VERSION 3.0.3, Jan 9, 2023}
\date{VERSION 3.0.3, Jan 17, 2023}
2 changes: 1 addition & 1 deletion AMD/Include/amd.h
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ void amd_l_info (double Info [ ]) ;
* Versions 1.1 and earlier of AMD do not include a #define'd version number.
*/

#define AMD_DATE "Jan 9, 2023"
#define AMD_DATE "Jan 17, 2023"
#define AMD_MAIN_VERSION 3
#define AMD_SUB_VERSION 0
#define AMD_SUBSUB_VERSION 3
Expand Down
2 changes: 1 addition & 1 deletion BTF/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

cmake_minimum_required ( VERSION 3.19 )

set ( BTF_DATE "Jan 9, 2023" )
set ( BTF_DATE "Jan 17, 2023" )
set ( BTF_VERSION_MAJOR 2 )
set ( BTF_VERSION_MINOR 0 )
set ( BTF_VERSION_SUB 3 )
Expand Down
2 changes: 1 addition & 1 deletion BTF/Doc/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Jan 9, 2023: version 2.0.3
Jan 17, 2023: version 2.0.3

* SuiteSparse_config: now v7.0.0

Expand Down
2 changes: 1 addition & 1 deletion BTF/Include/btf.h
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ int64_t btf_l_order (int64_t, int64_t *, int64_t *, double , double *,
* #endif
*/

#define BTF_DATE "Jan 9, 2023"
#define BTF_DATE "Jan 17, 2023"
#define BTF_MAIN_VERSION 2
#define BTF_SUB_VERSION 0
#define BTF_SUBSUB_VERSION 3
Expand Down
2 changes: 1 addition & 1 deletion CAMD/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

cmake_minimum_required ( VERSION 3.19 )

set ( CAMD_DATE "Jan 9, 2023" )
set ( CAMD_DATE "Jan 17, 2023" )
set ( CAMD_VERSION_MAJOR 3 )
set ( CAMD_VERSION_MINOR 0 )
set ( CAMD_VERSION_SUB 3 )
Expand Down
6 changes: 3 additions & 3 deletions CAMD/Demo/camd_demo.out
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
CAMD version 3.0, date: Jan 9, 2023
CAMD version 3.0, date: Jan 17, 2023
CAMD demo, with the 24-by-24 Harwell/Boeing matrix, can_24:

camd version 3.0.3, Jan 9, 2023: approximate minimum degree ordering:
camd version 3.0.3, Jan 17, 2023: approximate minimum degree ordering:
dense row parameter: 10
(rows with more than max (10 * sqrt (n), 16) entries are
considered "dense", and placed last in output permutation)
Expand Down Expand Up @@ -115,7 +115,7 @@ Plot of input matrix pattern:
23: . . . . . . X . . . . X X . . . . . . . . . . X
return value from camd_order: 0 (should be 0)

CAMD version 3.0.3, Jan 9, 2023, results:
CAMD version 3.0.3, Jan 17, 2023, results:
status: OK
n, dimension of A: 24
nz, number of nonzeros in A: 160
Expand Down
4 changes: 2 additions & 2 deletions CAMD/Demo/camd_demo2.out
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
CAMD demo, with a jumbled version of the 24-by-24
Harwell/Boeing matrix, can_24:

camd version 3.0.3, Jan 9, 2023: approximate minimum degree ordering:
camd version 3.0.3, Jan 17, 2023: approximate minimum degree ordering:
dense row parameter: 10
(rows with more than max (10 * sqrt (n), 16) entries are
considered "dense", and placed last in output permutation)
Expand Down Expand Up @@ -144,7 +144,7 @@ Plot of symmetric matrix to be ordered by camd_order:
23: . . . . . . X . . . . X X . . . . . . . . . . X
return value from camd_order: 1 (should be 1)

CAMD version 3.0.3, Jan 9, 2023, results:
CAMD version 3.0.3, Jan 17, 2023, results:
status: OK, but jumbled
n, dimension of A: 24
nz, number of nonzeros in A: 102
Expand Down
6 changes: 3 additions & 3 deletions CAMD/Demo/camd_l_demo.out
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
CAMD version 3.0, date: Jan 9, 2023
CAMD version 3.0, date: Jan 17, 2023
CAMD demo, with the 24-by-24 Harwell/Boeing matrix, can_24:

camd version 3.0.3, Jan 9, 2023: approximate minimum degree ordering:
camd version 3.0.3, Jan 17, 2023: approximate minimum degree ordering:
dense row parameter: 10
(rows with more than max (10 * sqrt (n), 16) entries are
considered "dense", and placed last in output permutation)
Expand Down Expand Up @@ -115,7 +115,7 @@ Plot of input matrix pattern:
23: . . . . . . X . . . . X X . . . . . . . . . . X
return value from camd_l_order: 0 (should be 0)

CAMD version 3.0.3, Jan 9, 2023, results:
CAMD version 3.0.3, Jan 17, 2023, results:
status: OK
n, dimension of A: 24
nz, number of nonzeros in A: 160
Expand Down
Binary file modified CAMD/Doc/CAMD_UserGuide.pdf
Binary file not shown.
2 changes: 1 addition & 1 deletion CAMD/Doc/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Jan 9, 2023: version 3.0.3
Jan 17, 2023: version 3.0.3

* SuiteSparse_config: now v7.0.0

Expand Down
2 changes: 1 addition & 1 deletion CAMD/Doc/camd_version.tex
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
% version of SuiteSparse/CAMD
\date{VERSION 3.0.3, Jan 9, 2023}
\date{VERSION 3.0.3, Jan 17, 2023}
2 changes: 1 addition & 1 deletion CAMD/Include/camd.h
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ void camd_l_info (double Info [ ]) ;
* #endif
*/

#define CAMD_DATE "Jan 9, 2023"
#define CAMD_DATE "Jan 17, 2023"
#define CAMD_MAIN_VERSION 3
#define CAMD_SUB_VERSION 0
#define CAMD_SUBSUB_VERSION 3
Expand Down
2 changes: 1 addition & 1 deletion CCOLAMD/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

cmake_minimum_required ( VERSION 3.19 )

set ( CCOLAMD_DATE "Jan 9, 2023" )
set ( CCOLAMD_DATE "Jan 17, 2023" )
set ( CCOLAMD_VERSION_MAJOR 3 )
set ( CCOLAMD_VERSION_MINOR 0 )
set ( CCOLAMD_VERSION_SUB 3 )
Expand Down
4 changes: 2 additions & 2 deletions CCOLAMD/Demo/ccolamd_example.out
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Column 3, with 2 entries:
row 1
row 3

ccolamd version 3.0.3, Jan 9, 2023: OK.
ccolamd version 3.0.3, Jan 17, 2023: OK.
ccolamd: number of dense or empty rows ignored: 0
ccolamd: number of dense or empty columns ignored: 0
ccolamd: number of garbage collections performed: 0
Expand All @@ -38,7 +38,7 @@ Column 3, with 1 entries:
row 4
Column 4, with 0 entries:

csymamd version 3.0.3, Jan 9, 2023: OK.
csymamd version 3.0.3, Jan 17, 2023: OK.
csymamd: number of dense or empty rows ignored: 0
csymamd: number of dense or empty columns ignored: 0
csymamd: number of garbage collections performed: 0
Expand Down
4 changes: 2 additions & 2 deletions CCOLAMD/Demo/ccolamd_l_example.out
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Column 3, with 2 entries:
row 1
row 3

ccolamd version 3.0.3, Jan 9, 2023: OK.
ccolamd version 3.0.3, Jan 17, 2023: OK.
ccolamd: number of dense or empty rows ignored: 0
ccolamd: number of dense or empty columns ignored: 0
ccolamd: number of garbage collections performed: 0
Expand All @@ -38,7 +38,7 @@ Column 3, with 1 entries:
row 4
Column 4, with 0 entries:

csymamd version 3.0.3, Jan 9, 2023: OK.
csymamd version 3.0.3, Jan 17, 2023: OK.
csymamd: number of dense or empty rows ignored: 0
csymamd: number of dense or empty columns ignored: 0
csymamd: number of garbage collections performed: 0
Expand Down
2 changes: 1 addition & 1 deletion CCOLAMD/Doc/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Jan 9, 2023: version 3.0.3
Jan 17, 2023: version 3.0.3

* SuiteSparse_config: now v7.0.0

Expand Down
2 changes: 1 addition & 1 deletion CCOLAMD/Include/ccolamd.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ extern "C" {
* #endif
*/

#define CCOLAMD_DATE "Jan 9, 2023"
#define CCOLAMD_DATE "Jan 17, 2023"
#define CCOLAMD_MAIN_VERSION 3
#define CCOLAMD_SUB_VERSION 0
#define CCOLAMD_SUBSUB_VERSION 3
Expand Down
2 changes: 1 addition & 1 deletion CHOLMOD/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# cmake 3.22 is required to find the BLAS/LAPACK
cmake_minimum_required ( VERSION 3.22 )

set ( CHOLMOD_DATE "Jan 9, 2023" )
set ( CHOLMOD_DATE "Jan 17, 2023" )
set ( CHOLMOD_VERSION_MAJOR 4 )
set ( CHOLMOD_VERSION_MINOR 0 )
set ( CHOLMOD_VERSION_SUB 3 )
Expand Down
Binary file modified CHOLMOD/Doc/CHOLMOD_UserGuide.pdf
Binary file not shown.
2 changes: 1 addition & 1 deletion CHOLMOD/Doc/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Jan 1, 2022: version 4.0.3
Jan 17, 2022: version 4.0.3

* NFORTRAN: option added to disable Fortran entirely
* SuiteSparse_config: now v7.0.0
Expand Down
2 changes: 1 addition & 1 deletion CHOLMOD/Doc/cholmod_version.tex
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
% version of SuiteSparse/CHOLMOD
\date{VERSION 4.0.3, Jan 9, 2023}
\date{VERSION 4.0.3, Jan 17, 2023}
2 changes: 1 addition & 1 deletion CHOLMOD/Include/cholmod.h
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
#ifndef CHOLMOD_H
#define CHOLMOD_H

#define CHOLMOD_DATE "Jan 9, 2023"
#define CHOLMOD_DATE "Jan 17, 2023"
#define CHOLMOD_MAIN_VERSION 4
#define CHOLMOD_SUB_VERSION 0
#define CHOLMOD_SUBSUB_VERSION 3
Expand Down
2 changes: 1 addition & 1 deletion COLAMD/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

cmake_minimum_required ( VERSION 3.19 )

set ( COLAMD_DATE "Jan 9, 2023" )
set ( COLAMD_DATE "Jan 17, 2023" )
set ( COLAMD_VERSION_MAJOR 3 )
set ( COLAMD_VERSION_MINOR 0 )
set ( COLAMD_VERSION_SUB 3 )
Expand Down
4 changes: 2 additions & 2 deletions COLAMD/Demo/colamd_example.out
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Column 3, with 2 entries:
row 1
row 3

colamd version 3.0.3, Jan 9, 2023: OK.
colamd version 3.0.3, Jan 17, 2023: OK.
colamd: number of dense or empty rows ignored: 0
colamd: number of dense or empty columns ignored: 0
colamd: number of garbage collections performed: 0
Expand All @@ -38,7 +38,7 @@ Column 3, with 1 entries:
row 4
Column 4, with 0 entries:

symamd version 3.0.3, Jan 9, 2023: OK.
symamd version 3.0.3, Jan 17, 2023: OK.
symamd: number of dense or empty rows ignored: 0
symamd: number of dense or empty columns ignored: 0
symamd: number of garbage collections performed: 0
Expand Down
4 changes: 2 additions & 2 deletions COLAMD/Demo/colamd_l_example.out
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Column 3, with 2 entries:
row 1
row 3

colamd version 3.0.3, Jan 9, 2023: OK.
colamd version 3.0.3, Jan 17, 2023: OK.
colamd: number of dense or empty rows ignored: 0
colamd: number of dense or empty columns ignored: 0
colamd: number of garbage collections performed: 0
Expand All @@ -38,7 +38,7 @@ Column 3, with 1 entries:
row 4
Column 4, with 0 entries:

symamd version 3.0.3, Jan 9, 2023: OK.
symamd version 3.0.3, Jan 17, 2023: OK.
symamd: number of dense or empty rows ignored: 0
symamd: number of dense or empty columns ignored: 0
symamd: number of garbage collections performed: 0
Expand Down
2 changes: 1 addition & 1 deletion COLAMD/Doc/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Jan 9, 2023: version 3.0.3
Jan 17, 2023: version 3.0.3

* SuiteSparse_config: now v7.0.0

Expand Down
2 changes: 1 addition & 1 deletion COLAMD/Include/colamd.h
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ extern "C" {
* Versions 2.3 and earlier of COLAMD do not include a #define'd version number.
*/

#define COLAMD_DATE "Jan 9, 2023"
#define COLAMD_DATE "Jan 17, 2023"
#define COLAMD_MAIN_VERSION 3
#define COLAMD_SUB_VERSION 0
#define COLAMD_SUBSUB_VERSION 3
Expand Down
2 changes: 1 addition & 1 deletion CSparse/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

cmake_minimum_required ( VERSION 3.13 )

set ( CSPARSE_DATE "Jan 9, 2023" )
set ( CSPARSE_DATE "Jan 17, 2023" )
set ( CSPARSE_VERSION_MAJOR 4 )
set ( CSPARSE_VERSION_MINOR 0 )
set ( CSPARSE_VERSION_SUB 1 )
Expand Down
2 changes: 1 addition & 1 deletion CSparse/Doc/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Jan 9, 2023: version 4.0.1
Jan 17, 2023: version 4.0.1

* minor revision to cmake: for Windows DLL

Expand Down
2 changes: 1 addition & 1 deletion CSparse/Include/cs.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#define CS_VER 4 /* CSparse Version */
#define CS_SUBVER 0
#define CS_SUBSUB 1
#define CS_DATE "Jan 9, 2023" /* CSparse release date */
#define CS_DATE "Jan 17, 2023" /* CSparse release date */
#define CS_COPYRIGHT "Copyright (c) Timothy A. Davis, 2006-2022"

#ifndef csi
Expand Down
2 changes: 1 addition & 1 deletion CXSparse/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

cmake_minimum_required ( VERSION 3.19 )

set ( CXSPARSE_DATE "Jan 9, 2023" )
set ( CXSPARSE_DATE "Jan 17, 2023" )
set ( CXSPARSE_VERSION_MAJOR 4 )
set ( CXSPARSE_VERSION_MINOR 0 )
set ( CXSPARSE_VERSION_SUB 3 )
Expand Down
2 changes: 1 addition & 1 deletion CXSparse/Doc/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Jan 9, 2023: version 4.0.3
Jan 17, 2023: version 4.0.3

* SuiteSparse_config: now v7.0.0

Expand Down
2 changes: 1 addition & 1 deletion CXSparse/Include/cs.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ extern "C" {
#define CS_VER 4 /* CXSparse Version */
#define CS_SUBVER 0
#define CS_SUBSUB 3
#define CS_DATE "Jan 9, 2023" /* CXSparse release date */
#define CS_DATE "Jan 17, 2023" /* CXSparse release date */
#define CS_COPYRIGHT "Copyright (c) Timothy A. Davis, 2006-2022"
#define CXSPARSE

Expand Down
2 changes: 1 addition & 1 deletion ChangeLog
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Jan 9, 2023: version 7.0.0
Jan 17, 2023: version 7.0.0

* SuiteSparse_config: now v7.0.0
* SuiteSparse_config struct: removed from external visibility to simplify
Expand Down
Loading

0 comments on commit 1d37915

Please sign in to comment.