Skip to content

Commit

Permalink
v5.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
DrTimothyAldenDavis committed Oct 19, 2019
1 parent 6e253c6 commit e927f7a
Show file tree
Hide file tree
Showing 1,234 changed files with 1,052,066 additions and 68,337 deletions.
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,15 @@ GraphBLAS/Tcov/errlog.txt
GraphBLAS/Tcov/log.txt
GraphBLAS/Tcov/gbstat.mat

tri/tri_main
ktruss/allktruss_graphblas_main
ktruss/allktruss_main
ktruss/ktruss_graphblas_main
ktruss/ktruss_main

ssget/files/ss_index_old.mat
ssget/files/ssstats_old.csv

# Do not ignore this file
!.gitignore

166 changes: 166 additions & 0 deletions CONTRIBUTOR-LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,166 @@
SuiteSparse Individual Contributor License Agreement

Thank you for your interest in contributing to SuiteSparse ("We" or "Us").

This contributor agreement ("Agreement") documents the rights granted by
contributors to Us. To make this document effective, please sign it and send it
to Us by electronic submission. This is a legally binding document, so please
read it carefully before agreeing to it. The Agreement may cover more than one
software project managed by Us.

1. Definitions

"You" means the individual who Submits a Contribution to Us.

"Contribution" means any work of authorship that is Submitted by You to Us
in which You own or assert ownership of the Copyright.

"Copyright" means all rights protecting works of authorship owned or
controlled by You, including copyright, moral and neighboring rights, as
appropriate, for the full term of their existence including any extensions
by You.

"Material" means the work of authorship which is made available by Us to
third parties. When this Agreement covers more than one software project,
the Material means the work of authorship to which the Contribution was
Submitted. After You Submit the Contribution, it may be included in the
Material.

"Submit" means any form of electronic, verbal, or written communication
sent to Us or our representatives, including but not limited to electronic
mailing lists, source code control systems, and issue tracking systems that
are managed by, or on behalf of, Us for the purpose of discussing and
improving the Material, but excluding communication that is conspicuously
marked or otherwise designated in writing by You as "Not a Contribution."

"Submission Date" means the date on which You Submit a Contribution to Us.

"Effective Date" means the date You execute this Agreement or the date You
first Submit a Contribution to Us, whichever is earlier.

2. Grant of Rights

2.1 Copyright License

(a) You retain ownership of the Copyright in Your Contribution and have
the same rights to use or license the Contribution which You would have
had without entering into the Agreement.

(b) To the maximum extent permitted by the relevant law, You grant to
Us a perpetual, worldwide, non-exclusive, transferable, royalty-free,
irrevocable license under the Copyright covering the Contribution, with
the right to sublicense such rights through multiple tiers of
sublicensees, to reproduce, modify, display, perform and distribute the
Contribution as part of the Material; provided that this license is
conditioned upon compliance with Section 2.3.

2.2 Patent License

For patent claims including, without limitation, method, process, and
apparatus claims which You own, control or have the right to grant, now
or in the future, You grant to Us a perpetual, worldwide,
non-exclusive, transferable, royalty-free, irrevocable patent license,
with the right to sublicense these rights to multiple tiers of
sublicensees, to make, have made, use, sell, offer for sale, import and
otherwise transfer the Contribution and the Contribution in combination
with the Material (and portions of such combination). This license is
granted only to the extent that the exercise of the licensed rights
infringes such patent claims; and provided that this license is
conditioned upon compliance with Section 2.3.

2.3 Outbound License

Based on the grant of rights in Sections 2.1 and 2.2, if We include
Your Contribution in a Material, We may license the Contribution under
any license, including copyleft, permissive, commercial, or proprietary
licenses.

2.4 Moral Rights.

If moral rights apply to the Contribution, to the maximum extent
permitted by law, You waive and agree not to assert such moral rights
against Us or our successors in interest, or any of our licensees,
either direct or indirect.

2.5 Our Rights.

You acknowledge that We are not obligated to use Your Contribution as
part of the Material and may decide to include any Contribution We
consider appropriate.

2.6 Reservation of Rights.

Any rights not expressly licensed under this section are expressly
reserved by You.

3. Agreement

You confirm that:

(a) You have the legal authority to enter into this Agreement.

(b) You own the Copyright and patent claims covering the Contribution which
are required to grant the rights under Section 2.

(c) The grant of rights under Section 2 does not violate any grant of
rights which You have made to third parties, including Your employer. If
You are an employee, You have had Your employer approve this Agreement or
sign the Entity version of this document. If You are less than eighteen
years old, please have Your parents or guardian sign the Agreement.

4. Disclaimer

EXCEPT FOR THE EXPRESS WARRANTIES IN SECTION 3, THE CONTRIBUTION IS
PROVIDED "AS IS". MORE PARTICULARLY, ALL EXPRESS OR IMPLIED WARRANTIES
INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTY OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE EXPRESSLY
DISCLAIMED BY YOU TO US. TO THE EXTENT THAT ANY SUCH WARRANTIES CANNOT BE
DISCLAIMED, SUCH WARRANTY IS LIMITED IN DURATION TO THE MINIMUM PERIOD
PERMITTED BY LAW.

5. Consequential Damage Waiver

TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT WILL YOU BE
LIABLE FOR ANY LOSS OF PROFITS, LOSS OF ANTICIPATED SAVINGS, LOSS OF DATA,
INDIRECT, SPECIAL, INCIDENTAL, CONSEQUENTIAL AND EXEMPLARY DAMAGES ARISING
OUT OF THIS AGREEMENT REGARDLESS OF THE LEGAL OR EQUITABLE THEORY
(CONTRACT, TORT OR OTHERWISE) UPON WHICH THE CLAIM IS BASED.

6. Miscellaneous

6.1 This Agreement will be governed by and construed in accordance with the
laws of the State of Texas excluding its conflicts of law provisions. Under
certain circumstances, the governing law in this section might be
superseded by the United Nations Convention on Contracts for the
International Sale of Goods ("UN Convention") and the parties intend to
avoid the application of the UN Convention to this Agreement and, thus,
exclude the application of the UN Convention in its entirety to this
Agreement.

6.2 This Agreement sets out the entire agreement between You and Us for
Your Contributions to Us and overrides all other agreements or
understandings.

6.3 If You or We assign the rights or obligations received through this
Agreement to a third party, as a condition of the assignment, that third
party must agree in writing to abide by all the rights and obligations in
the Agreement.

6.4 The failure of either party to require performance by the other party
of any provision of this Agreement in one situation shall not affect the
right of a party to require such performance at any time in the future. A
waiver of performance under a provision in one situation shall not be
considered a waiver of the performance of the provision in the future or a
waiver of the provision in its entirety.

6.5 If any provision of this Agreement is found void and unenforceable,
such provision will be replaced to the extent possible with a provision
that comes closest to the meaning of the original provision and which is
enforceable. The terms and conditions set forth in this Agreement shall
apply notwithstanding any failure of essential purpose of this Agreement or
any limited remedy to the maximum extent possible under law.

Us
Timothy A. Davis, and all SuiteSparse co-authors (varies according to
the SuiteSparse package)

11 changes: 10 additions & 1 deletion ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
July 5, 2018: SuiteSparse 5.3.0

* GraphBLAS 2.0.3: bug fix to GxB_resize, better cmake script
* new package: Mongoose (version 2.0.2)
* fixed metis gk_arch.h for Windows
* UMFPACK 5.7.7: modified comments in umfpack*symbolic.h
* added contributor license for all of SuiteSparse
* updated and renamed MATLAB_Tools/UFcollection to SuiteSparseCollection

Mar 15, 2018: SuiteSparse 5.2.0

* GraphBLAS 2.0.1: bug fix to GxB_kron
Expand All @@ -11,7 +20,7 @@ Mar 12, 2018:
* 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
Dec 28, 2017: SuiteSparse 5.1.2

* improved build process for GraphBLAS
* minor change to CSparse/Lib/Makefile, no change in CSparse version
Expand Down
7 changes: 4 additions & 3 deletions Contents.m
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
% compiles and installs all of SuiteSparse, and runs several demos and tests.
%
%-------------------------------------------------------------------------------
% Ordering methods:
% Ordering methods and graph partitioners:
%-------------------------------------------------------------------------------
%
% amd2 - approximate minimum degree ordering.
Expand All @@ -16,6 +16,7 @@
% camd - constrained amd.
% ccolamd - constrained colamd.
% csymamd - constrained symamd.
% edgecut - Mongoose graph partitioner
%
%-------------------------------------------------------------------------------
% CHOLMOD: a sparse supernodal Cholesky update/downdate package:
Expand Down Expand Up @@ -134,7 +135,7 @@
% sparseinv sparse inverse subset
% spqr_rank toolbox for sparse rank-deficient matrices
%
% UFcollection for managing the SuiteSparse Matrix Collection
% SuiteSparseCollection for managing the SuiteSparse Matrix Collection
% RBio for reading/writing Rutherford/Boeing sparse matrices
% ssget MATLAB interface to the SuiteSparse Matrix Collection
% GraphBLAS graph algorithms via sparse linear algebra (graphblas.org),
Expand All @@ -145,6 +146,6 @@
% For help on compiling SuiteSparse or the demos, testing functions, etc.,
% please see the help for each individual package.
%
% Copyright 2017, Timothy A. Davis, http://www.suitesparse.com.
% Copyright 2018, Timothy A. Davis, http://www.suitesparse.com.

help SuiteSparse
59 changes: 49 additions & 10 deletions GraphBLAS/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# 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.
# CMakeLists.txt: instructions for cmake to build GraphBLAS.
# An ANSI C11 compiler is required.
#
# To compile the GraphBLAS library and demo programs:
Expand Down Expand Up @@ -32,17 +32,53 @@
# cd build
# rm -rf *

# cmake 3.0 is prefered.
# cmake 3.0 is preferred.
cmake_minimum_required ( VERSION 2.8.12 )

project ( graphblas )

include ( GNUInstallDirs )

if ( CMAKE_VERSION VERSION_GREATER "3.0" )
cmake_policy ( SET CMP0042 NEW )
cmake_policy ( SET CMP0048 NEW )
endif ( )

# version of SuiteSparse:GraphBLAS
set ( GraphBLAS_DATE "July 4, 2018" )
set ( GraphBLAS_VERSION_MAJOR 2 )
set ( GraphBLAS_VERSION_MINOR 0 )
set ( GraphBLAS_VERSION_SUB 3 )

# GraphBLAS C API Specification version, at graphblas.org
set ( GraphBLAS_API_DATE "Nov 14, 2017" )
set ( GraphBLAS_API_VERSION_MAJOR 1 )
set ( GraphBLAS_API_VERSION_MINOR 1 )
set ( GraphBLAS_API_VERSION_SUB 0 )

if ( CMAKE_MAJOR_VERSION GREATER 2 )
project ( graphblas
VERSION "${GraphBLAS_VERSION_MAJOR}.${GraphBLAS_VERSION_MINOR}.${GraphBLAS_VERSION_SUB}" )
else ( )
project ( graphblas )
endif ( )

# Configure a header file to pass CMake information
configure_file (
"Version/GraphBLAS.h.in"
"${PROJECT_SOURCE_DIR}/Include/GraphBLAS.h"
)
configure_file (
"Version/GraphBLAS_version.tex.in"
"${PROJECT_SOURCE_DIR}/Doc/GraphBLAS_version.tex"
)
configure_file (
"Version/GraphBLAS_API_version.tex.in"
"${PROJECT_SOURCE_DIR}/Doc/GraphBLAS_API_version.tex"
)
configure_file (
"Version/README.txt.in"
"${PROJECT_SOURCE_DIR}/README.txt"
)

include ( GNUInstallDirs )

if (NOT CMAKE_BUILD_TYPE )
set ( CMAKE_BUILD_TYPE Release )
endif ( )
Expand Down Expand Up @@ -82,18 +118,21 @@ 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 2.0.1
SOVERSION 2
SET_TARGET_PROPERTIES ( graphblas PROPERTIES
VERSION ${GraphBLAS_VERSION_MAJOR}.${GraphBLAS_VERSION_MINOR}.${GraphBLAS_VERSION_SUB}
SOVERSION ${GraphBLAS_VERSION_MAJOR}
C_STANDARD_REQUIRED 11
PUBLIC_HEADER "Include/GraphBLAS.h" )
set_property ( TARGET graphblas PROPERTY C_STANDARD 11 )
target_link_libraries ( graphblas m )

# create the static graphblas library. Requires ANSI C11
add_library ( graphblas_static STATIC ${GRAPHBLAS_SOURCES} )
SET_TARGET_PROPERTIES ( graphblas_static PROPERTIES VERSION 2.0.1
SET_TARGET_PROPERTIES ( graphblas_static PROPERTIES
VERSION ${GraphBLAS_VERSION_MAJOR}.${GraphBLAS_VERSION_MINOR}.${GraphBLAS_VERSION_SUB}
OUTPUT_NAME graphblas
POSITION_INDEPENDENT_CODE OFF
SOVERSION 2
SOVERSION ${GraphBLAS_VERSION_MAJOR}
C_STANDARD_REQUIRED 11
PUBLIC_HEADER "Include/GraphBLAS.h" )
set_property ( TARGET graphblas_static PROPERTY C_STANDARD 11 )
Expand Down
2 changes: 1 addition & 1 deletion GraphBLAS/Demo/MATLAB/tricount.m
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
case 'Burkhardt'
%===========================================================================

% Burkhart, 'Graphing trillions of triangles', Information
% Burkhardt, 'Graphing trillions of triangles', Information
% Visualization, 16(3), Sept 2017,
% https://doi.org/10.1177%2F1473871616666393
%
Expand Down
Loading

0 comments on commit e927f7a

Please sign in to comment.