Skip to content

Commit

Permalink
v5.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@DrTimothyAldenDavis
DrTimothyAldenDavis committed Oct 19, 2019
1 parent f5e8be9 commit 6e253c6
Show file tree
Hide file tree
Showing 1,491 changed files with 5,330 additions and 2,108 deletions.
222 changes: 222 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,222 @@
# Ignore these files:
*.o
*.so.*
*.so
*.dylib
*.a
*.obj
*.ln
*.bb
*.bbg
*.da
*.tcov
*.gcov
gmon.out
*.bak
*.d
*.gcda
*.gcno
*.aux
*.bbl
*.blg
*.log
*.toc
*.dvi
*.lof
*.lot
*.dll
*.dSYM
my_*.out
*.gcda
*.gcno
*.mex*
*.profile
*.swp
.DS_Store
.nfs*
.pyc

# ignore these specific programs in the Package/Demo directories
AMD/Demo/amd_demo
AMD/Demo/amd_demo2
AMD/Demo/amd_l_demo
AMD/Demo/amd_simple
CAMD/Demo/camd_demo
CAMD/Demo/camd_demo2
CAMD/Demo/camd_l_demo
CAMD/Demo/camd_simple
CCOLAMD/Demo/ccolamd_example
CCOLAMD/Demo/ccolamd_l_example
CHOLMOD/Demo/cholmod_demo
CHOLMOD/Demo/cholmod_l_demo
CHOLMOD/Demo/cholmod_simple
CHOLMOD/Demo/timelog.m
COLAMD/Demo/colamd_example
COLAMD/Demo/colamd_l_example
CSparse/Demo/cs_demo1
CSparse/Demo/cs_demo2
CSparse/Demo/cs_demo3
CXSparse/Demo/cs_ci_demo1
CXSparse/Demo/cs_ci_demo2
CXSparse/Demo/cs_ci_demo3
CXSparse/Demo/cs_cl_demo1
CXSparse/Demo/cs_cl_demo2
CXSparse/Demo/cs_cl_demo3
CXSparse/Demo/cs_demo1
CXSparse/Demo/cs_demo2
CXSparse/Demo/cs_demo3
CXSparse/Demo/cs_di_demo1
CXSparse/Demo/cs_di_demo2
CXSparse/Demo/cs_di_demo3
CXSparse/Demo/cs_dl_demo1
CXSparse/Demo/cs_dl_demo2
CXSparse/Demo/cs_dl_demo3
CXSparse/Demo/cs_idemo
CXSparse/Demo/cs_ldemo
KLU/Demo/klu_simple
KLU/Demo/kludemo
KLU/Demo/kluldemo
LDL/Demo/ldlamd
LDL/Demo/ldllamd
LDL/Demo/ldllmain
LDL/Demo/ldllsimple
LDL/Demo/ldlmain
LDL/Demo/ldlsimple
RBio/Demo/RBdemo
RBio/Demo/temp.rb
SPQR/Demo/qrdemo
SPQR/Demo/qrsimple
SPQR/Demo/qrsimplec
SPQR/Demo/C.mtx
SPQR/Demo/E.txt
SPQR/Demo/R.mtx
SPQR/Demo/X.mtx
SPQR/Demo/gpu_results.txt
SPQR/Demo/qrdemo_gpu
SPQR/Demo/qrdemo_gpu2
SPQR/Demo/qrdemo_gpu3
UMFPACK/Demo/numeric.umf
UMFPACK/Demo/symbolic.umf
UMFPACK/Demo/umfpack_di_demo
UMFPACK/Demo/umfpack_dl_demo
UMFPACK/Demo/umfpack_simple
UMFPACK/Demo/umfpack_zi_demo
UMFPACK/Demo/umfpack_zl_demo

# ignore these specific programs in the Package/Tcov directories
CHOLMOD/Tcov/cl
CHOLMOD/Tcov/clread
CHOLMOD/Tcov/cm
CHOLMOD/Tcov/cmread
CHOLMOD/Tcov/covs.out
CHOLMOD/Tcov/ldemo
CHOLMOD/Tcov/ldemo.c
CHOLMOD/Tcov/temp*.mtx
CHOLMOD/Tcov/timelog.m
CHOLMOD/Tcov/l_*.c
CHOLMOD/Tcov/z_*.c
CHOLMOD/Tcov/zz_*.c
CHOLMOD/Tcov/zl_*.c
CHOLMOD/Tcov/zdemo
CHOLMOD/Tcov/zdemo.c

CSparse/Tcov/cov.out
CSparse/Tcov/cov.sort
CSparse/Tcov/cover.out
CSparse/Tcov/covs.out
CSparse/Tcov/cs_*.c
CSparse/Tcov/cstcov_test
CSparse/Tcov/*.out
CSparse/Tcov/cs_demo1
CSparse/Tcov/cs_demo2
CSparse/Tcov/cs_demo3

CXSparse/Tcov/cov.out
CXSparse/Tcov/cov.sort
CXSparse/Tcov/cover.out
CXSparse/Tcov/covs.out
CXSparse/Tcov/cs_*.c
CXSparse/Tcov/cs*_ci.c
CXSparse/Tcov/cs*_cl.c
CXSparse/Tcov/cs*_di.c
CXSparse/Tcov/cs*_dl.c
CXSparse/Tcov/*.out
CXSparse/Tcov/cs_demo1_ci
CXSparse/Tcov/cs_demo1_cl
CXSparse/Tcov/cs_demo1_di
CXSparse/Tcov/cs_demo1_dl
CXSparse/Tcov/cs_demo2_ci
CXSparse/Tcov/cs_demo2_cl
CXSparse/Tcov/cs_demo2_di
CXSparse/Tcov/cs_demo2_dl
CXSparse/Tcov/cs_demo3_ci
CXSparse/Tcov/cs_demo3_cl
CXSparse/Tcov/cs_demo3_di
CXSparse/Tcov/cs_demo3_dl
CXSparse/Tcov/cs_idemo
CXSparse/Tcov/cs_ldemo
CXSparse/Tcov/cstcov_test_ci
CXSparse/Tcov/cstcov_test_cl
CXSparse/Tcov/cstcov_test_di
CXSparse/Tcov/cstcov_test_dl

KLU/Tcov/cov_*.c
KLU/Tcov/klutest
KLU/Tcov/klultest
KLU/Tcov/*.out

SPQR/Tcov/X.mtx
SPQR/Tcov/gpu_results.txt
SPQR/Tcov/gpuqrengine_demo
SPQR/Tcov/qrdemo_gpu
SPQR/Tcov/qrtest
SPQR/Tcov/qrtest_out.txt
SPQR/Tcov/troll.m
SPQR/Tcov/cov.out

UMFPACK/Tcov/covall_err.out
UMFPACK/Tcov/cover.out

# ignore these specific files in the Package/MATLAB directories
MATLAB_Tools/spqr_rank/save_samples_demo_spqr_rank.mat
CXSparse/MATLAB/CSparse/cs_cl_*.c
CXSparse/MATLAB/Test/cs_*.c

RBio/Tcov/RBdemo
RBio/Tcov/RBdemo.c
RBio/Tcov/RBio.c
RBio/Tcov/RBio.h
RBio/Tcov/RBtest
RBio/Tcov/SuiteSparse_config.c
RBio/Tcov/SuiteSparse_config.h
RBio/Tcov/*.out
RBio/Tcov/*.rb

# GraphBLAS
GraphBLAS/Demo/bfs_demo.out
GraphBLAS/Demo/complex_demo.m
GraphBLAS/Demo/mis_demo.out
GraphBLAS/Demo/simple_demo.out
GraphBLAS/Demo/wildtype_demo.out
GraphBLAS/Demo/tri_demo.out
GraphBLAS/Test/errlog.txt
GraphBLAS/Test/log.txt
GraphBLAS/Doc/GraphBLAS_UserGuide.out
GraphBLAS/Tcov/cover_GB_2type_template.c
GraphBLAS/Tcov/cover_GB_AxB_compare_template.c
GraphBLAS/Tcov/cover_GB_AxB_factory.c
GraphBLAS/Tcov/cover_GB_AxB_template.c
GraphBLAS/Tcov/cover_GB_assoc_template.c
GraphBLAS/Tcov/cover_GB_ops_template.c
GraphBLAS/Tcov/cover_GB_qsort_template.c
GraphBLAS/Tcov/cover_GB_semiring_template.c
GraphBLAS/Tcov/cover_GB_subref_template.c
GraphBLAS/Tcov/cover_gb.c
GraphBLAS/Tcov/cover_gb_exp.c
GraphBLAS/Tcov/errlog.txt
GraphBLAS/Tcov/log.txt
GraphBLAS/Tcov/gbstat.mat

# Do not ignore this file
!.gitignore

2 changes: 1 addition & 1 deletion CHOLMOD/Cholesky/cholmod_rowcolcounts.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
/* === initialize_node ====================================================== */
/* ========================================================================== */

static int initialize_node /* initial work for kth node in postordered etree */
static Int initialize_node /* initial work for kth node in postordered etree */
(
Int k, /* at the kth step of the algorithm (and kth node) */
Int Post [ ], /* Post [k] = i, the kth node in postordered etree */
Expand Down
Binary file modified CHOLMOD/Doc/CHOLMOD_UserGuide.pdf
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion CHOLMOD/Doc/CHOLMOD_UserGuide.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
\title{User Guide for CHOLMOD: a sparse Cholesky factorization and
modification package}

\date{VERSION 3.0.11, May 4, 2016}
\date{VERSION 3.0.12, Mar 12, 2018}
\maketitle

%-------------------------------------------------------------------------------
Expand Down
4 changes: 4 additions & 0 deletions CHOLMOD/Doc/ChangeLog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
Mar 12, 2018: version 3.0.12

* bug fix to cholmod_rowcolcounts.c (int overflow was possible)

May 4, 2016: version 3.0.11

* minor changes to Makefile
Expand Down
2 changes: 1 addition & 1 deletion CHOLMOD/Doc/getproto
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
#!/bin/bash
echo -n $1 > _temp.awk
cat rule.awk >> _temp.awk
cat header.tex
Expand Down
4 changes: 2 additions & 2 deletions CHOLMOD/Include/cholmod_core.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,11 +243,11 @@

#define CHOLMOD_HAS_VERSION_FUNCTION

#define CHOLMOD_DATE "May 4, 2016"
#define CHOLMOD_DATE "Mar 12, 2018"
#define CHOLMOD_VER_CODE(main,sub) ((main) * 1000 + (sub))
#define CHOLMOD_MAIN_VERSION 3
#define CHOLMOD_SUB_VERSION 0
#define CHOLMOD_SUBSUB_VERSION 11
#define CHOLMOD_SUBSUB_VERSION 12
#define CHOLMOD_VERSION \
CHOLMOD_VER_CODE(CHOLMOD_MAIN_VERSION,CHOLMOD_SUB_VERSION)

Expand Down
2 changes: 1 addition & 1 deletion CHOLMOD/Lib/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#===============================================================================

LIBRARY = libcholmod
VERSION = 3.0.11
VERSION = 3.0.12
SO_VERSION = 3

default: library
Expand Down
13 changes: 13 additions & 0 deletions ChangeLog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
Mar 15, 2018: SuiteSparse 5.2.0

* GraphBLAS 2.0.1: bug fix to GxB_kron
* SuiteSparse_config: corrected back to SO_VERSION 5

Mar 12, 2018:

* GraphBLAS 2.0.0: with changes to API to conform to the latest
specification. The SO_VERSION of GraphBLAS must change,
as a result, since this affects both the ABI and API interface.
* CHOLMOD 3.1.12: bug fix (no change to the CHOLMOD ABI or API)
* KLU 1.3.9: minor edit, not a bug fix, but code is more clear now

Dec 23, 2017: SuiteSparse 5.1.2

* improved build process for GraphBLAS
Expand Down
12 changes: 7 additions & 5 deletions GraphBLAS/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved.
# SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved.
# http://suitesparse.com See GraphBLAS/Doc/License.txt for license.
#
# CMakeLists.tx: instructions for cmake to build GraphBLAS.
Expand Down Expand Up @@ -82,18 +82,18 @@ endif ( )
# create the dynamic graphblas library. Requires ANSI C11
file ( GLOB GRAPHBLAS_SOURCES "Source/*.c" "Source/Generated/*.c" )
add_library ( graphblas SHARED ${GRAPHBLAS_SOURCES} )
SET_TARGET_PROPERTIES ( graphblas PROPERTIES VERSION 1.1.2
SOVERSION 1
SET_TARGET_PROPERTIES ( graphblas PROPERTIES VERSION 2.0.1
SOVERSION 2
C_STANDARD_REQUIRED 11
PUBLIC_HEADER "Include/GraphBLAS.h" )
set_property ( TARGET graphblas PROPERTY C_STANDARD 11 )

# create the static graphblas library. Requires ANSI C11
add_library ( graphblas_static STATIC ${GRAPHBLAS_SOURCES} )
SET_TARGET_PROPERTIES ( graphblas_static PROPERTIES VERSION 1.1.2
SET_TARGET_PROPERTIES ( graphblas_static PROPERTIES VERSION 2.0.1
OUTPUT_NAME graphblas
POSITION_INDEPENDENT_CODE OFF
SOVERSION 1
SOVERSION 2
C_STANDARD_REQUIRED 11
PUBLIC_HEADER "Include/GraphBLAS.h" )
set_property ( TARGET graphblas_static PROPERTY C_STANDARD 11 )
Expand Down Expand Up @@ -145,6 +145,7 @@ add_executable ( bfs_demo "Demo/Program/bfs_demo.c" )
add_executable ( tri_demo "Demo/Program/tri_demo.c" )
add_executable ( mis_demo "Demo/Program/mis_demo.c" )
add_executable ( complex_demo "Demo/Program/complex_demo.c" )
add_executable ( kron_demo "Demo/Program/kron_demo.c" )
add_executable ( simple_demo "Demo/Program/simple_demo.c" )
add_executable ( wildtype_demo "Demo/Program/wildtype_demo.c" )

Expand All @@ -153,6 +154,7 @@ target_link_libraries ( bfs_demo graphblas graphblasdemo )
target_link_libraries ( tri_demo graphblas graphblasdemo )
target_link_libraries ( mis_demo graphblas graphblasdemo )
target_link_libraries ( complex_demo graphblas graphblasdemo )
target_link_libraries ( kron_demo graphblas graphblasdemo )
target_link_libraries ( simple_demo graphblasdemo )
target_link_libraries ( wildtype_demo graphblas )

5 changes: 3 additions & 2 deletions GraphBLAS/Demo/Include/demos.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// GraphBLAS/Demo/demos.h: include file for all demo programs
//------------------------------------------------------------------------------

// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved.
// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved.
// http://suitesparse.com See GraphBLAS/Doc/License.txt for license.

//------------------------------------------------------------------------------
Expand Down Expand Up @@ -54,7 +54,8 @@ GrB_Info read_matrix // read a double-precision matrix
bool make_symmetric, // if true, return A as symmetric
bool no_self_edges, // if true, then remove self edges from A
bool one_based, // if true, input matrix is 1-based
bool boolean // if true, input is GrB_BOOL, otherwise GrB_FP64
bool boolean, // if true, input is GrB_BOOL, otherwise GrB_FP64
bool printstuff // if true, print status to stdout
) ;

GrB_Info mis // compute a maximal independent set
Expand Down
2 changes: 1 addition & 1 deletion GraphBLAS/Demo/Include/simple_rand.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/* GraphBLAS/Demo/simple_rand.h: a very simple random number generator */
/* -------------------------------------------------------------------------- */

/* SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. */
/* SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved*/
/* http://suitesparse.com See GraphBLAS/Doc/License.txt for license. */

/* -------------------------------------------------------------------------- */
Expand Down
2 changes: 1 addition & 1 deletion GraphBLAS/Demo/Include/simple_timer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/* GraphBLAS/Demo/simple_timer.h: a timer for performance measurements */
/* -------------------------------------------------------------------------- */

/* SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. */
/* SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved*/
/* http://suitesparse.com See GraphBLAS/Doc/License.txt for license. */

/* -------------------------------------------------------------------------- */
Expand Down
Loading

0 comments on commit 6e253c6

Please sign in to comment.