Skip to content

Commit 62d1da9

Browse files
DrTimothyAldenDavisDrTimothyAldenDavis
committed
v5.4.0
1 parent e927f7a commit 62d1da9

File tree

1,857 files changed

+389984
-431456
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,857 files changed

+389984
-431456
lines changed

‎.gitignore

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -202,17 +202,6 @@ GraphBLAS/Demo/tri_demo.out
202202
GraphBLAS/Test/errlog.txt
203203
GraphBLAS/Test/log.txt
204204
GraphBLAS/Doc/GraphBLAS_UserGuide.out
205-
GraphBLAS/Tcov/cover_GB_2type_template.c
206-
GraphBLAS/Tcov/cover_GB_AxB_compare_template.c
207-
GraphBLAS/Tcov/cover_GB_AxB_factory.c
208-
GraphBLAS/Tcov/cover_GB_AxB_template.c
209-
GraphBLAS/Tcov/cover_GB_assoc_template.c
210-
GraphBLAS/Tcov/cover_GB_ops_template.c
211-
GraphBLAS/Tcov/cover_GB_qsort_template.c
212-
GraphBLAS/Tcov/cover_GB_semiring_template.c
213-
GraphBLAS/Tcov/cover_GB_subref_template.c
214-
GraphBLAS/Tcov/cover_gb.c
215-
GraphBLAS/Tcov/cover_gb_exp.c
216205
GraphBLAS/Tcov/errlog.txt
217206
GraphBLAS/Tcov/log.txt
218207
GraphBLAS/Tcov/gbstat.mat

‎CHOLMOD/Core/cholmod_common.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@
3333
#include "cholmod_internal.h"
3434
#include "cholmod_core.h"
3535

36+
#ifdef GPU_BLAS
37+
#include "cholmod_gpu.h"
38+
#endif
39+
3640
/* ========================================================================== */
3741
/* === cholmod_start ======================================================== */
3842
/* ========================================================================== */

‎CHOLMOD/Demo/README.txt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,9 @@ Demos for CHOLMOD
2020

2121
To compile and run the demos on the CPU, do "make" in this directory.
2222
To run the demos on the GPU, you must first download the ND/ND6k matrix
23-
from the UF Sparse Matrix Collection, currently hosted at
24-
http://www.cise.ufl.edu/research/sparse/matrices
25-
(note that the will move soon to Texas A&M, but the plan is for it to
26-
still be mirrored at UF). Unpack the nd6k.mtx to your home directory.
23+
from the SuiteSparse Matrix Collection, hosted at https://sparse.tamu.edu
24+
25+
Unpack the nd6k.mtx to your home directory.
2726
Then do "make big" in this directory. If you want to put the nd6k.mtx
2827
file somewhere else, then simply edit the gpu.sh file.
2928

‎CHOLMOD/Demo/gpu.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
setenv CHOLMOD_USE_GPU 1
2-
./cholmod_l_demo < ~/nd6k.mtx
3-
setenv CHOLMOD_USE_GPU 0
4-
./cholmod_l_demo < ~/nd6k.mtx
1+
#!/bin/bash
2+
CHOLMOD_USE_GPU=1 ./cholmod_l_demo < ~/nd6k.mtx
3+
CHOLMOD_USE_GPU=0 ./cholmod_l_demo < ~/nd6k.mtx

‎CHOLMOD/Doc/CHOLMOD_UserGuide.pdf

-242 Bytes
Binary file not shown.

‎CHOLMOD/Doc/CHOLMOD_UserGuide.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
\title{User Guide for CHOLMOD: a sparse Cholesky factorization and
2222
modification package}
2323

24-
\date{VERSION 3.0.12, Mar 12, 2018}
24+
\date{VERSION 3.0.13, Dec 20, 2018}
2525
\maketitle
2626

2727
%-------------------------------------------------------------------------------

‎CHOLMOD/Doc/ChangeLog

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
Dec 20, 2018: version 3.0.13
2+
3+
* bug fix to cholmod_core.h: so that a CUDA include file is properly
4+
included in a C++ caller; also required for SPQR.
5+
16
Mar 12, 2018: version 3.0.12
27

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

‎CHOLMOD/GPU/cholmod_gpu.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include "cholmod_gpu.h"
2121
#include "stdio.h"
2222
#ifdef GPU_BLAS
23+
#include <cuda.h>
2324
#include <cuda_runtime.h>
2425
#endif
2526

‎CHOLMOD/GPU/t_cholmod_gpu.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@
1717

1818
#include <string.h>
1919
#include "cholmod_template.h"
20+
#include "cholmod_gpu_kernels.h"
21+
#include <fenv.h>
22+
#include <cuda.h>
23+
#include <cuda_runtime.h>
2024

2125
#undef L_ENTRY
2226
#ifdef REAL

‎CHOLMOD/Include/cholmod_core.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,11 +243,11 @@
243243

244244
#define CHOLMOD_HAS_VERSION_FUNCTION
245245

246-
#define CHOLMOD_DATE "Mar 12, 2018"
246+
#define CHOLMOD_DATE "Dec 20, 2018"
247247
#define CHOLMOD_VER_CODE(main,sub) ((main) * 1000 + (sub))
248248
#define CHOLMOD_MAIN_VERSION 3
249249
#define CHOLMOD_SUB_VERSION 0
250-
#define CHOLMOD_SUBSUB_VERSION 12
250+
#define CHOLMOD_SUBSUB_VERSION 13
251251
#define CHOLMOD_VERSION \
252252
CHOLMOD_VER_CODE(CHOLMOD_MAIN_VERSION,CHOLMOD_SUB_VERSION)
253253

@@ -278,9 +278,11 @@
278278
#endif
279279

280280
/* Define buffering parameters for GPU processing */
281+
#ifndef SUITESPARSE_GPU_EXTERN_ON
281282
#ifdef GPU_BLAS
282283
#include <cublas_v2.h>
283284
#endif
285+
#endif
284286

285287
#define CHOLMOD_DEVICE_SUPERNODE_BUFFERS 6
286288
#define CHOLMOD_HOST_SUPERNODE_BUFFERS 8

‎CHOLMOD/Include/cholmod_gpu.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@
1717
#ifdef GPU_BLAS
1818
#include "omp.h"
1919
#include <fenv.h>
20+
#ifndef SUITESPARSE_GPU_EXTERN_ON
21+
#include <cuda.h>
22+
#include <cuda_runtime.h>
23+
#endif
2024
#endif
2125

2226
/* CHOLMOD_GPU_PRINTF: for printing GPU debug error messages */

‎CHOLMOD/Lib/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#===============================================================================
44

55
LIBRARY = libcholmod
6-
VERSION = 3.0.12
6+
VERSION = 3.0.13
77
SO_VERSION = 3
88

99
default: library

‎CHOLMOD/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@ include ../SuiteSparse_config/SuiteSparse_config.mk
1111

1212
# Compile the C-callable libraries and the Demo programs.
1313
all:
14-
( cd Lib ; $(MAKE) )
14+
( cd Lib ; $(MAKE) --jobs=$(JOBS) )
1515
( cd Demo ; $(MAKE) )
1616

1717
# Compile the C-callable libraries only.
1818
library:
19-
( cd Lib ; $(MAKE) )
19+
( cd Lib ; $(MAKE) --jobs=$(JOBS) )
2020

2121
# compile the static libraries only
2222
static:
23-
( cd Lib ; $(MAKE) static )
23+
( cd Lib ; $(MAKE) static --jobs=$(JOBS) )
2424

2525
# Remove all files not in the original distribution
2626
purge:

‎ChangeLog

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
Dec 28, 2018: SuiteSparse 5.4.0
2+
3+
* GraphBLAS 2.2.2: many upgrades and new features, a few bug fixes
4+
* CHOLMOD 3.0.13: fix to cholmod_core.h (for latest CUDA)
5+
* SPQR 2.0.9: fix to SuiteSparseQR.hpp (for latest CUDA)
6+
* UMFPACK 5.7.8: minor change to umf_analyze.h (not a bug, but the
7+
parameter names in the *.h did not match the *.c.
8+
* ssget: new matrices
9+
* Mongoose 2.0.3: simpler cmake
10+
* SuiteSparse_config: added JOBS option for parallel make, also added to
11+
GraphBLAS, CHOLMOD, SPQR, UMFPACK, Mongoose, and metis-5.1.0
12+
113
July 5, 2018: SuiteSparse 5.3.0
214

315
* GraphBLAS 2.0.3: bug fix to GxB_resize, better cmake script

‎GraphBLAS/.gitignore

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -35,34 +35,29 @@ my_*.out
3535
.DS_Store
3636
.nfs*
3737
.pyc
38-
38+
*.tmp
3939

4040
Demo/bfs_demo.out
41-
Demo/complex_demo_out.m
4241
Demo/mis_demo.out
42+
Demo/openmp_demo.out
43+
Demo/pagerank_demo.out
44+
Demo/pthread_demo.out
4345
Demo/simple_demo.out
44-
Demo/wildtype_demo.out
4546
Demo/tri_demo.out
47+
Demo/wildtype_demo.out
48+
Demo/*.log
49+
Demo/complex_demo_out.m
50+
51+
Test/*.log
4652
Test/errlog.txt
4753
Test/log.txt
4854
Doc/GraphBLAS_UserGuide.log
4955
Doc/GraphBLAS_UserGuide.out
50-
Tcov/cover_GB_2type_template.c
51-
Tcov/cover_GB_AxB.c
52-
Tcov/cover_GB_AxB_compare_template.c
53-
Tcov/cover_GB_AxB_factory.c
54-
Tcov/cover_GB_AxB_template.c
55-
Tcov/cover_GB_assoc_template.c
56-
Tcov/cover_GB_ops_template.c
57-
Tcov/cover_GB_qsort_template.c
58-
Tcov/cover_GB_semiring_template.c
59-
Tcov/cover_GB_subref_template.c
60-
Tcov/cover_gb_report.c
61-
Tcov/cover_gb.c
62-
Tcov/cover_gb_exp.c
6356
Tcov/errlog.txt
6457
Tcov/log.txt
6558
Tcov/gbstat.mat
59+
Tcov/fprint.txt
60+
Test/fprint.txt
6661

6762
# Do not ignore this file
6863
!.gitignore

0 commit comments

Comments
 (0)