Skip to content

Commit df93c9e

Browse files
DrTimothyAldenDavisDrTimothyAldenDavis
committed
SPQR: SPDX comments
1 parent 9d7d4c5 commit df93c9e

File tree

100 files changed

+418
-21
lines changed

Some content is hidden

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

100 files changed

+418
-21
lines changed

‎CHOLMOD/Doc/ChangeLog

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ Oct FIXME, 2022: version 4.0.0
33
* using CMake build system
44
* integers: int (32-bit) and SuiteSparse_long (nominally 64-bit) replaced
55
with int32_t and int64_t.
6+
* cholmod.h: single include file for all Modules
67

78
June 30, 2020: no change to version number
89

‎CSparse/MATLAB/ssget/Doc/ChangeLog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
Sept 18, 2022: ssget 2.2.1
2+
3+
* added SPDX license identifiers
4+
15
May 2020: ssget 2.2.0
26

37
* update to URL redirects in ssgui

‎CXSparse/MATLAB/ssget/Doc/ChangeLog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
Sept 18, 2022: ssget 2.2.1
2+
3+
* added SPDX license identifiers
4+
15
May 2020: ssget 2.2.0
26

37
* update to URL redirects in ssgui

‎ChangeLog

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
Oct FIXME, 2022: SuiteSparse 6.0.0
2+
3+
* using CMake build system for (nearly) all packages:
4+
SLIP_LU has not been modified. It will be updated with a
5+
new package, SPEX, in a future release of SuiteSparse.
6+
* integers: int (32-bit) and SuiteSparse_long (nominally 64-bit) replaced
7+
with int32_t and int64_t. This is likely compatible with all prior
8+
usage of SuiteSparse, but it requires the major version numbers of all
9+
packages to be bumped up by one, since it's a change to the C API that
10+
potentially affects the binary interface, for systems where
11+
SuiteSparse_long was actually just 32 bits.
12+
* UMFPACK: new options to support ParU. Single umfpack.h include file.
13+
* CHOLMOD: Single cholmod.h include file.
14+
115
Aug 25, 2022, SuiteSparse 5.13.0
216

317
* GraphBLAS v7.2.0: see GraphBLAS/Doc/ChangeLog for details.

‎SPQR/Demo/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
# SuiteSparseQR/Demo/Makefile
33
#===============================================================================
44

5+
# SPQR, Copyright (c) 2008-2022, Timothy A Davis. All Rights Reserved.
6+
# SPDX-License-Identifier: GPL-2.0+
7+
58
default: all
69

710
ccode: all

‎SPQR/Demo/README.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,5 @@ qrdemo_gpu.out output of qrdemo_gpu.cpp
3535

3636
--------------------------------------------------------------------------------
3737

38-
Timothy A. Davis, http://www.suitesparse.com
38+
SPQR, Copyright (c) 2008-2022, Timothy A Davis. All Rights Reserved.
39+
SPDX-License-Identifier: GPL-2.0+

‎SPQR/Demo/demo_colamd.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1+
#!/bin/sh
2+
# SPQR, Copyright (c) 2008-2022, Timothy A Davis. All Rights Reserved.
3+
# SPDX-License-Identifier: GPL-2.0+
14
./qrdemo_gpu A.mtx 2

‎SPQR/Demo/demo_colamd2.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1+
#!/bin/sh
2+
# SPQR, Copyright (c) 2008-2022, Timothy A Davis. All Rights Reserved.
3+
# SPDX-License-Identifier: GPL-2.0+
14
./qrdemo_gpu2 A.mtx 2 > o_colamd_withgpu

‎SPQR/Demo/demo_colamd3.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1+
#!/bin/sh
2+
# SPQR, Copyright (c) 2008-2022, Timothy A Davis. All Rights Reserved.
3+
# SPDX-License-Identifier: GPL-2.0+
14
./qrdemo_gpu3 A.mtx 2 > o_colamd_nogpu

‎SPQR/Demo/demo_metis.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1+
#!/bin/sh
2+
# SPQR, Copyright (c) 2008-2022, Timothy A Davis. All Rights Reserved.
3+
# SPDX-License-Identifier: GPL-2.0+
14
./qrdemo_gpu A.mtx 6

‎SPQR/Demo/demo_metis2.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1+
#!/bin/sh
2+
# SPQR, Copyright (c) 2008-2022, Timothy A Davis. All Rights Reserved.
3+
# SPDX-License-Identifier: GPL-2.0+
14
./qrdemo_gpu2 A.mtx 6 > o_metis_withgpu

‎SPQR/Demo/demo_metis3.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1+
#!/bin/sh
2+
# SPQR, Copyright (c) 2008-2022, Timothy A Davis. All Rights Reserved.
3+
# SPDX-License-Identifier: GPL-2.0+
14
./qrdemo_gpu3 A.mtx 6 > o_metis_nogpu

‎SPQR/Demo/go4.m

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
% compares SPQR with SPQR+GPU on lots of sparse matrices
22

3+
% SPQR, Copyright (c) 2008-2022, Timothy A Davis. All Rights Reserved.
4+
% SPDX-License-Identifier: GPL-2.0+
5+
36
clear
47
index = UFget ;
58
f = find ((index.isReal == 1) & (index.isBinary == 0) & (index.isGraph == 0)) ;

‎SPQR/Demo/go5.m

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
% compares SPQR with SPQR+GPU on lots of sparse matrices
22

3+
% SPQR, Copyright (c) 2008-2022, Timothy A Davis. All Rights Reserved.
4+
% SPDX-License-Identifier: GPL-2.0+
5+
36
clear
47
index = UFget ;
58
f = find ((index.isReal == 1) & (index.isBinary == 0) & (index.isGraph == 0)) ;

‎SPQR/Demo/qrdemo.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
// === qrdemo.cpp ==============================================================
33
// =============================================================================
44

5+
// SPQR, Copyright (c) 2008-2022, Timothy A Davis. All Rights Reserved.
6+
// SPDX-License-Identifier: GPL-2.0+
7+
58
// A simple C++ demo of SuiteSparseQR. The comments give the MATLAB equivalent
69
// statements. See also qrdemo.m
710

‎SPQR/Demo/qrdemo.m

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ function qrdemo (matrix_name)
1010
%
1111
% See also spqr, spqr_solve, mldivide
1212

13-
% Copyright 2008, Timothy A. Davis, http://www.suitesparse.com
13+
% SPQR, Copyright (c) 2008-2022, Timothy A Davis. All Rights Reserved.
14+
% SPDX-License-Identifier: GPL-2.0+
1415

1516
if (nargin == 0)
1617

‎SPQR/Demo/qrdemo_gpu.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
// === qrdemo_gpu.cpp ==========================================================
33
// =============================================================================
44

5+
// SPQR, Copyright (c) 2008-2022, Timothy A Davis. All Rights Reserved.
6+
// SPDX-License-Identifier: GPL-2.0+
7+
58
// A simple C++ demo of SuiteSparseQR. The comments give the MATLAB equivalent
69
// statements. See also qrdemo.m
710

‎SPQR/Demo/qrdemo_gpu2.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
// === qrdemo_gpu2.cpp =========================================================
33
// =============================================================================
44

5+
// SPQR, Copyright (c) 2008-2022, Timothy A Davis. All Rights Reserved.
6+
// SPDX-License-Identifier: GPL-2.0+
7+
58
// A simple C++ demo of SuiteSparseQR. The comments give the MATLAB equivalent
69
// statements. See also qrdemo.m
710
//

‎SPQR/Demo/qrdemo_gpu3.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
// === qrdemo_gpu3.cpp =========================================================
33
// =============================================================================
44

5+
// SPQR, Copyright (c) 2008-2022, Timothy A Davis. All Rights Reserved.
6+
// SPDX-License-Identifier: GPL-2.0+
7+
58
// A simple C++ demo of SuiteSparseQR. The comments give the MATLAB equivalent
69
// statements. See also qrdemo.m
710
//

‎SPQR/Demo/qrdemoc.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
/* === qrdemo.c ============================================================= */
33
/* ========================================================================== */
44

5+
// SPQR, Copyright (c) 2008-2022, Timothy A Davis. All Rights Reserved.
6+
// SPDX-License-Identifier: GPL-2.0+
7+
58
/* A simple C demo of SuiteSparseQR. The comments give the MATLAB equivalent
69
statements. See also qrdemo.m
710
*/

‎SPQR/Demo/qrsimple.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
// === qrsimple.cpp ============================================================
33
// =============================================================================
44

5+
// SPQR, Copyright (c) 2008-2022, Timothy A Davis. All Rights Reserved.
6+
// SPDX-License-Identifier: GPL-2.0+
7+
58
// A very simple example of the use of SuiteSparseQR by a C++ main program.
69
// Usage: qrsimple < Matrix_in_MatrixMarket_format
710

‎SPQR/Demo/qrsimplec.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
/* === qrsimplec.c ========================================================== */
33
/* ========================================================================== */
44

5+
// SPQR, Copyright (c) 2008-2022, Timothy A Davis. All Rights Reserved.
6+
// SPDX-License-Identifier: GPL-2.0+
7+
58
/* A very simple example of the use of SuiteSparseQR by a C main program.
69
Usage: qrsimplec < Matrix_in_MatrixMarket_format */
710

‎SPQR/Demo/spqr_gpu.m

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
% ordering: 1 colamd
44
% ordering: 2 metis
55

6+
% SPQR, Copyright (c) 2008-2022, Timothy A Davis. All Rights Reserved.
7+
% SPDX-License-Identifier: GPL-2.0+
8+
69
if (nargin > 1)
710
% write the matrix to a file
811
mwrite ('A.mtx', A) ;

‎SPQR/Demo/spqr_gpu2.m

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
% ordering: 1 colamd
44
% ordering: 2 metis
55

6+
% SPQR, Copyright (c) 2008-2022, Timothy A Davis. All Rights Reserved.
7+
% SPDX-License-Identifier: GPL-2.0+
8+
69
% write the matrix to a file
710
mwrite ('A.mtx', A) ;
811

‎SPQR/Demo/spqr_gpu3.m

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
% ordering: 1 colamd
44
% ordering: 2 metis
55

6+
% SPQR, Copyright (c) 2008-2022, Timothy A Davis. All Rights Reserved.
7+
% SPDX-License-Identifier: GPL-2.0+
8+
69
% write the matrix to a file
710
mwrite ('A.mtx', A) ;
811

‎SPQR/Doc/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# SPQR/Doc/Makefile
2+
# SPQR, Copyright (c) 2008-2022, Timothy A Davis. All Rights Reserved.
3+
# SPDX-License-Identifier: GPL-2.0+
14

25
default: spqr_user_guide.pdf
36

‎SPQR/Doc/README.txt

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
SPQR/Doc directory for SuiteSparseQR
22

3+
SPQR (SuiteSparseQR), Copyright (c) 2008-2022, Timothy A Davis.
4+
All Rights Reserved.
5+
SPDX-License-Identifier: GPL-2.0+
6+
7+
The GPU modules in SPQRGPU are under a different copyright:
8+
9+
SPQRGPU, Copyright (c) 2008-2022, Timothy A Davis, Sanjay Ranka,
10+
Sencer Nuri Yeralan, and Wissam Sid-Lakhdar, All Rights Reserved.
11+
312
Please read the spqr_user_guide.pdf first.
413

514
For additional documentation of the MATLAB user interface, type:
@@ -27,7 +36,3 @@ spqr_user_guide.tex
2736

2837
README.txt this file
2938

30-
Timothy A. Davis, http://www.suitesparse.com
31-
32-
GPU acceleration in collaboration with Nuri Yeralan,
33-
Sanjay Ranka, and Wissam Sid-Lakhdar.

‎SPQR/Doc/spqr_user_guide.tex

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,15 @@ \section{Introduction}
6060
\cite{Davis08b}. This document gives detailed information on the installation
6161
and use of SuiteSparseQR.
6262

63+
SPQR, Copyright (c) 2008-2022, Timothy A Davis. All Rights Reserved.
64+
65+
SPDX-License-Identifier: GPL-2.0+
66+
67+
The GPU modules in SPQRGPU are under a different copyright:
68+
69+
SPQRGPU, Copyright (c) 2008-2022, Timothy A Davis, Sanjay Ranka,
70+
Sencer Nuri Yeralan, and Wissam Sid-Lakhdar, All Rights Reserved.
71+
6372
%-------------------------------------------------------------------------------
6473
\section{Using SuiteSparseQR in MATLAB}
6574
%-------------------------------------------------------------------------------

‎SPQR/Include/SuiteSparseQR.hpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
// === SuiteSparseQR.hpp =======================================================
33
// =============================================================================
44

5+
// SPQR, Copyright (c) 2008-2022, Timothy A Davis. All Rights Reserved.
6+
// SPDX-License-Identifier: GPL-2.0+
7+
58
// User include file for C++ programs.
69

710
#ifndef SUITESPARSEQR_H

‎SPQR/Include/SuiteSparseQR_C.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
/* === SuiteSparseQR_C.h ==================================================== */
33
/* ========================================================================== */
44

5+
// SPQR, Copyright (c) 2008-2022, Timothy A Davis. All Rights Reserved.
6+
// SPDX-License-Identifier: GPL-2.0+
7+
58
/* For inclusion in a C or C++ program. */
69

710
#ifndef SUITESPARSEQR_C_H

‎SPQR/Include/SuiteSparseQR_definitions.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
/* === SuiteSparseQR_definitions.h ========================================== */
33
/* ========================================================================== */
44

5+
// SPQR, Copyright (c) 2008-2022, Timothy A Davis. All Rights Reserved.
6+
// SPDX-License-Identifier: GPL-2.0+
7+
58
/* Core definitions for both C and C++ programs. */
69

710
#ifndef SUITESPARSEQR_DEFINITIONS_H

‎SPQR/Include/spqr.hpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
// === spqr.hpp ================================================================
33
// =============================================================================
44

5+
// SPQR, Copyright (c) 2008-2022, Timothy A Davis. All Rights Reserved.
6+
// SPDX-License-Identifier: GPL-2.0+
7+
58
// Internal definitions and non-user-callable routines. This should not be
69
// included in the user's code.
710

‎SPQR/Include/spqrgpu.hpp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
//------------------------------------------------------------------------------
2+
// SPQR/Include/spqrgpu.hpp
3+
//------------------------------------------------------------------------------
4+
5+
// SPQR, Copyright (c) 2008-2022, Timothy A Davis. All Rights Reserved.
6+
// SPDX-License-Identifier: GPL-2.0+
7+
8+
//------------------------------------------------------------------------------
9+
110
#ifndef SPQRGPU_HPP_
211
#define SPQRGPU_HPP_
312

‎SPQR/MATLAB/Contents.m

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@
1313
% Example:
1414
% x = spqr_solve (A,b) ; % solves a least-squares problem (like x=A\b)
1515

16-
% Copyright 2008-2012, Timothy A. Davis, http://www.suitesparse.com
16+
% SPQR, Copyright (c) 2008-2022, Timothy A Davis. All Rights Reserved.
17+
% SPDX-License-Identifier: GPL-2.0+

‎SPQR/MATLAB/spqr.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
// === spqr mexFunction ========================================================
33
// =============================================================================
44

5+
// SPQR, Copyright (c) 2008-2022, Timothy A Davis. All Rights Reserved.
6+
// SPDX-License-Identifier: GPL-2.0+
7+
58
#include "spqr_mx.hpp"
69

710
// This function mimics the existing MATLAB QR syntax, with extensions.

‎SPQR/MATLAB/spqr.m

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@
107107
% See also SPQR_QMULT, SPQR_SOLVE, LU, NULL, ORTH, QRDELETE, QRINSERT,
108108
% QRUPDATE, SPQR_SINGLETONS.
109109

110-
% Copyright 2008, Timothy A. Davis, http://www.suitesparse.com
110+
% SPQR, Copyright (c) 2008-2022, Timothy A Davis. All Rights Reserved.
111+
% SPDX-License-Identifier: GPL-2.0+
111112

112113
error ('spqr mexFunction not found') ;

‎SPQR/MATLAB/spqr_demo.m

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
%
77
% See also SPQR, SPQR_SOLVE, SPQR_QMULT, SPQR_MAKE, SPQR_INSTALL.
88

9-
% Copyright 2008, Timothy A. Davis, http://www.suitesparse.com
9+
% SPQR, Copyright (c) 2008-2022, Timothy A Davis. All Rights Reserved.
10+
% SPDX-License-Identifier: GPL-2.0+
1011

1112
help spqr
1213
help spqr_solve

‎SPQR/MATLAB/spqr_install.m

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ function spqr_install (tbb)
1313
%
1414
% See also spqr, spqr_solve, spqr_qmult.
1515

16-
% Copyright 2008, Timothy A. Davis, http://www.suitesparse.com
16+
% SPQR, Copyright (c) 2008-2022, Timothy A Davis. All Rights Reserved.
17+
% SPDX-License-Identifier: GPL-2.0+
1718

1819
if (nargin < 1)
1920
tbb = 0 ;

‎SPQR/MATLAB/spqr_make.m

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ function spqr_make (opt1)
1717
%
1818
% See also spqr, spqr_solve, spqr_qmult, qr, mldivide
1919

20-
% Copyright 2008, Timothy A. Davis, http://www.suitesparse.com
20+
% SPQR, Copyright (c) 2008-2022, Timothy A Davis. All Rights Reserved.
21+
% SPDX-License-Identifier: GPL-2.0+
2122

2223
details = 0 ; % 1 if details of each command are to be printed, 0 if not
2324

‎SPQR/MATLAB/spqr_mx.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
// === spqr_mx =================================================================
33
// =============================================================================
44

5+
// SPQR, Copyright (c) 2008-2022, Timothy A Davis. All Rights Reserved.
6+
// SPDX-License-Identifier: GPL-2.0+
7+
58
// Utility routines used by the SuiteSparseQR mexFunctions
69

710
#include "spqr_mx.hpp"

‎SPQR/MATLAB/spqr_mx.hpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
// === spqr_mx_matlab.hpp ======================================================
33
// =============================================================================
44

5+
// SPQR, Copyright (c) 2008-2022, Timothy A Davis. All Rights Reserved.
6+
// SPDX-License-Identifier: GPL-2.0+
7+
58
// utility functions and definitions solely for use in a MATLAB mexFunction
69

710
#ifndef SPQR_MX_MATLAB_H

0 commit comments

Comments
 (0)