Skip to content

Commit

Permalink
v5.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@DrTimothyAldenDavis
DrTimothyAldenDavis committed Oct 19, 2019
1 parent e927f7a commit 62d1da9
Show file tree
Hide file tree
Showing 1,857 changed files with 389,984 additions and 431,456 deletions.
11 changes: 0 additions & 11 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,17 +202,6 @@ 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
Expand Down
4 changes: 4 additions & 0 deletions CHOLMOD/Core/cholmod_common.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@
#include "cholmod_internal.h"
#include "cholmod_core.h"

#ifdef GPU_BLAS
#include "cholmod_gpu.h"
#endif

/* ========================================================================== */
/* === cholmod_start ======================================================== */
/* ========================================================================== */
Expand Down
7 changes: 3 additions & 4 deletions CHOLMOD/Demo/README.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,9 @@ Demos for CHOLMOD

To compile and run the demos on the CPU, do "make" in this directory.
To run the demos on the GPU, you must first download the ND/ND6k matrix
from the UF Sparse Matrix Collection, currently hosted at
http://www.cise.ufl.edu/research/sparse/matrices
(note that the will move soon to Texas A&M, but the plan is for it to
still be mirrored at UF). Unpack the nd6k.mtx to your home directory.
from the SuiteSparse Matrix Collection, hosted at https://sparse.tamu.edu

Unpack the nd6k.mtx to your home directory.
Then do "make big" in this directory. If you want to put the nd6k.mtx
file somewhere else, then simply edit the gpu.sh file.

7 changes: 3 additions & 4 deletions CHOLMOD/Demo/gpu.sh
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
setenv CHOLMOD_USE_GPU 1
./cholmod_l_demo < ~/nd6k.mtx
setenv CHOLMOD_USE_GPU 0
./cholmod_l_demo < ~/nd6k.mtx
#!/bin/bash
CHOLMOD_USE_GPU=1 ./cholmod_l_demo < ~/nd6k.mtx
CHOLMOD_USE_GPU=0 ./cholmod_l_demo < ~/nd6k.mtx
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.12, Mar 12, 2018}
\date{VERSION 3.0.13, Dec 20, 2018}
\maketitle

%-------------------------------------------------------------------------------
Expand Down
5 changes: 5 additions & 0 deletions CHOLMOD/Doc/ChangeLog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
Dec 20, 2018: version 3.0.13

* bug fix to cholmod_core.h: so that a CUDA include file is properly
included in a C++ caller; also required for SPQR.

Mar 12, 2018: version 3.0.12

* bug fix to cholmod_rowcolcounts.c (int overflow was possible)
Expand Down
1 change: 1 addition & 0 deletions CHOLMOD/GPU/cholmod_gpu.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include "cholmod_gpu.h"
#include "stdio.h"
#ifdef GPU_BLAS
#include <cuda.h>
#include <cuda_runtime.h>
#endif

Expand Down
4 changes: 4 additions & 0 deletions CHOLMOD/GPU/t_cholmod_gpu.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@

#include <string.h>
#include "cholmod_template.h"
#include "cholmod_gpu_kernels.h"
#include <fenv.h>
#include <cuda.h>
#include <cuda_runtime.h>

#undef L_ENTRY
#ifdef REAL
Expand Down
6 changes: 4 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 "Mar 12, 2018"
#define CHOLMOD_DATE "Dec 20, 2018"
#define CHOLMOD_VER_CODE(main,sub) ((main) * 1000 + (sub))
#define CHOLMOD_MAIN_VERSION 3
#define CHOLMOD_SUB_VERSION 0
#define CHOLMOD_SUBSUB_VERSION 12
#define CHOLMOD_SUBSUB_VERSION 13
#define CHOLMOD_VERSION \
CHOLMOD_VER_CODE(CHOLMOD_MAIN_VERSION,CHOLMOD_SUB_VERSION)

Expand Down Expand Up @@ -278,9 +278,11 @@
#endif

/* Define buffering parameters for GPU processing */
#ifndef SUITESPARSE_GPU_EXTERN_ON
#ifdef GPU_BLAS
#include <cublas_v2.h>
#endif
#endif

#define CHOLMOD_DEVICE_SUPERNODE_BUFFERS 6
#define CHOLMOD_HOST_SUPERNODE_BUFFERS 8
Expand Down
4 changes: 4 additions & 0 deletions CHOLMOD/Include/cholmod_gpu.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@
#ifdef GPU_BLAS
#include "omp.h"
#include <fenv.h>
#ifndef SUITESPARSE_GPU_EXTERN_ON
#include <cuda.h>
#include <cuda_runtime.h>
#endif
#endif

/* CHOLMOD_GPU_PRINTF: for printing GPU debug error messages */
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.12
VERSION = 3.0.13
SO_VERSION = 3

default: library
Expand Down
6 changes: 3 additions & 3 deletions CHOLMOD/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@ include ../SuiteSparse_config/SuiteSparse_config.mk

# Compile the C-callable libraries and the Demo programs.
all:
( cd Lib ; $(MAKE) )
( cd Lib ; $(MAKE) --jobs=$(JOBS) )
( cd Demo ; $(MAKE) )

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

# compile the static libraries only
static:
( cd Lib ; $(MAKE) static )
( cd Lib ; $(MAKE) static --jobs=$(JOBS) )

# Remove all files not in the original distribution
purge:
Expand Down
12 changes: 12 additions & 0 deletions ChangeLog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
Dec 28, 2018: SuiteSparse 5.4.0

* GraphBLAS 2.2.2: many upgrades and new features, a few bug fixes
* CHOLMOD 3.0.13: fix to cholmod_core.h (for latest CUDA)
* SPQR 2.0.9: fix to SuiteSparseQR.hpp (for latest CUDA)
* UMFPACK 5.7.8: minor change to umf_analyze.h (not a bug, but the
parameter names in the *.h did not match the *.c.
* ssget: new matrices
* Mongoose 2.0.3: simpler cmake
* SuiteSparse_config: added JOBS option for parallel make, also added to
GraphBLAS, CHOLMOD, SPQR, UMFPACK, Mongoose, and metis-5.1.0

July 5, 2018: SuiteSparse 5.3.0

* GraphBLAS 2.0.3: bug fix to GxB_resize, better cmake script
Expand Down
27 changes: 11 additions & 16 deletions GraphBLAS/.gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,34 +35,29 @@ my_*.out
.DS_Store
.nfs*
.pyc

*.tmp

Demo/bfs_demo.out
Demo/complex_demo_out.m
Demo/mis_demo.out
Demo/openmp_demo.out
Demo/pagerank_demo.out
Demo/pthread_demo.out
Demo/simple_demo.out
Demo/wildtype_demo.out
Demo/tri_demo.out
Demo/wildtype_demo.out
Demo/*.log
Demo/complex_demo_out.m

Test/*.log
Test/errlog.txt
Test/log.txt
Doc/GraphBLAS_UserGuide.log
Doc/GraphBLAS_UserGuide.out
Tcov/cover_GB_2type_template.c
Tcov/cover_GB_AxB.c
Tcov/cover_GB_AxB_compare_template.c
Tcov/cover_GB_AxB_factory.c
Tcov/cover_GB_AxB_template.c
Tcov/cover_GB_assoc_template.c
Tcov/cover_GB_ops_template.c
Tcov/cover_GB_qsort_template.c
Tcov/cover_GB_semiring_template.c
Tcov/cover_GB_subref_template.c
Tcov/cover_gb_report.c
Tcov/cover_gb.c
Tcov/cover_gb_exp.c
Tcov/errlog.txt
Tcov/log.txt
Tcov/gbstat.mat
Tcov/fprint.txt
Test/fprint.txt

# Do not ignore this file
!.gitignore
Expand Down
Loading

0 comments on commit 62d1da9

Please sign in to comment.