Skip to content

Commit

Permalink
fix AMD license
Browse files Browse the repository at this point in the history
  • Loading branch information
MarcelKoch committed Aug 15, 2023
1 parent ca7d605 commit e67aa43
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 22 deletions.
14 changes: 7 additions & 7 deletions third_party/SuiteSparse/AMD/Include/amd.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

// AMD, Copyright (c) 1996-2022, Timothy A. Davis, Patrick R. Amestoy, and
// Iain S. Duff. All Rights Reserved.
// SPDX-License-Identifier: BSD-3-clause
// SPDX-License-Identifier: BSD-3-Clause

//------------------------------------------------------------------------------

Expand Down Expand Up @@ -82,7 +82,7 @@ int amd_l_order /* see above for description */
* terms of time and memory usage. If this condition does not hold, a copy
* of the matrix is created (where these conditions do hold), and the copy is
* ordered.
*
*
* Row indices must be in the range 0 to
* n-1. Ap [0] must be zero, and thus nz = Ap [n] is the number of nonzeros
* in A. The array Ap is of size n+1, and the array Ai is of size nz = Ap [n].
Expand Down Expand Up @@ -149,7 +149,7 @@ int amd_l_order /* see above for description */
* The Info array provides statistics about the ordering on output. If it is
* not present, the statistics are not returned. This is not an error
* condition.
*
*
* Info [AMD_STATUS]: the return value of AMD, either AMD_OK,
* AMD_OK_BUT_JUMBLED, AMD_OUT_OF_MEMORY, or AMD_INVALID.
*
Expand Down Expand Up @@ -210,7 +210,7 @@ int amd_l_order /* see above for description */
*
* Info [14..19] are not used in the current version, but may be used in
* future versions.
*/
*/

/* ------------------------------------------------------------------------- */
/* direct interface to AMD */
Expand All @@ -233,7 +233,7 @@ void amd_2
int32_t iwlen,
int32_t pfree,
int32_t Nv [ ],
int32_t Next [ ],
int32_t Next [ ],
int32_t Last [ ],
int32_t Head [ ],
int32_t Elen [ ],
Expand All @@ -252,7 +252,7 @@ void amd_l2
int64_t iwlen,
int64_t pfree,
int64_t Nv [ ],
int64_t Next [ ],
int64_t Next [ ],
int64_t Last [ ],
int64_t Head [ ],
int64_t Elen [ ],
Expand Down Expand Up @@ -320,7 +320,7 @@ void amd_l_info (double Info [ ]) ;
/* contents of Info */
#define AMD_STATUS 0 /* return value of amd_order and amd_l_order */
#define AMD_N 1 /* A is n-by-n */
#define AMD_NZ 2 /* number of nonzeros in A */
#define AMD_NZ 2 /* number of nonzeros in A */
#define AMD_SYMMETRY 3 /* symmetry of pattern (1 is sym., 0 is unsym.) */
#define AMD_NZDIAG 4 /* # of entries on diagonal */
#define AMD_NZ_A_PLUS_AT 5 /* nz in A+A' */
Expand Down
3 changes: 1 addition & 2 deletions third_party/SuiteSparse/AMD/Include/amd_internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

// AMD, Copyright (c) 1996-2022, Timothy A. Davis, Patrick R. Amestoy, and
// Iain S. Duff. All Rights Reserved.
// SPDX-License-Identifier: BSD-3-clause
// SPDX-License-Identifier: BSD-3-Clause

//------------------------------------------------------------------------------

Expand Down Expand Up @@ -199,4 +199,3 @@ void AMD_preprocess
Int W [ ],
Int Flag [ ]
) ;

4 changes: 2 additions & 2 deletions third_party/SuiteSparse/AMD/Source/amd_2.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

// AMD, Copyright (c) 1996-2022, Timothy A. Davis, Patrick R. Amestoy, and
// Iain S. Duff. All Rights Reserved.
// SPDX-License-Identifier: BSD-3-clause
// SPDX-License-Identifier: BSD-3-Clause

//------------------------------------------------------------------------------

Expand Down Expand Up @@ -546,7 +546,7 @@ void AMD_2
* p1: Pe [i] for some variable i (start of element list)
* p2: Pe [i] + Elen [i] - 1 for some variable i
* p3: index of first supervariable in clean list
* p4:
* p4:
* pdst: destination pointer, for compression
* pend: end of memory to compress
* pj: pointer into an element or variable
Expand Down
2 changes: 1 addition & 1 deletion third_party/SuiteSparse/AMD/Source/amd_defaults.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

// AMD, Copyright (c) 1996-2022, Timothy A. Davis, Patrick R. Amestoy, and
// Iain S. Duff. All Rights Reserved.
// SPDX-License-Identifier: BSD-3-clause
// SPDX-License-Identifier: BSD-3-Clause

//------------------------------------------------------------------------------

Expand Down
3 changes: 1 addition & 2 deletions third_party/SuiteSparse/AMD/Source/amd_l2.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@

// AMD, Copyright (c) 1996-2022, Timothy A. Davis, Patrick R. Amestoy, and
// Iain S. Duff. All Rights Reserved.
// SPDX-License-Identifier: BSD-3-clause
// SPDX-License-Identifier: BSD-3-Clause

//------------------------------------------------------------------------------

#define DLONG
#include "amd_2.c"

3 changes: 1 addition & 2 deletions third_party/SuiteSparse/AMD/Source/amd_l_defaults.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@

// AMD, Copyright (c) 1996-2022, Timothy A. Davis, Patrick R. Amestoy, and
// Iain S. Duff. All Rights Reserved.
// SPDX-License-Identifier: BSD-3-clause
// SPDX-License-Identifier: BSD-3-Clause

//------------------------------------------------------------------------------


#define DLONG
#include "amd_defaults.c"

3 changes: 1 addition & 2 deletions third_party/SuiteSparse/AMD/Source/amd_l_post_tree.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@

// AMD, Copyright (c) 1996-2022, Timothy A. Davis, Patrick R. Amestoy, and
// Iain S. Duff. All Rights Reserved.
// SPDX-License-Identifier: BSD-3-clause
// SPDX-License-Identifier: BSD-3-Clause

//------------------------------------------------------------------------------

#define DLONG
#include "amd_post_tree.c"

3 changes: 1 addition & 2 deletions third_party/SuiteSparse/AMD/Source/amd_l_postorder.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@

// AMD, Copyright (c) 1996-2022, Timothy A. Davis, Patrick R. Amestoy, and
// Iain S. Duff. All Rights Reserved.
// SPDX-License-Identifier: BSD-3-clause
// SPDX-License-Identifier: BSD-3-Clause

//------------------------------------------------------------------------------

#define DLONG
#include "amd_postorder.c"

2 changes: 1 addition & 1 deletion third_party/SuiteSparse/AMD/Source/amd_post_tree.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

// AMD, Copyright (c) 1996-2022, Timothy A. Davis, Patrick R. Amestoy, and
// Iain S. Duff. All Rights Reserved.
// SPDX-License-Identifier: BSD-3-clause
// SPDX-License-Identifier: BSD-3-Clause

//------------------------------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion third_party/SuiteSparse/AMD/Source/amd_postorder.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

// AMD, Copyright (c) 1996-2022, Timothy A. Davis, Patrick R. Amestoy, and
// Iain S. Duff. All Rights Reserved.
// SPDX-License-Identifier: BSD-3-clause
// SPDX-License-Identifier: BSD-3-Clause

//------------------------------------------------------------------------------

Expand Down

0 comments on commit e67aa43

Please sign in to comment.