Skip to content

Commit

Permalink
v4.5.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@DrTimothyAldenDavis
DrTimothyAldenDavis committed Oct 19, 2019
1 parent 0f867d1 commit f76868e
Show file tree
Hide file tree
Showing 136 changed files with 1,452 additions and 1,042 deletions.
184 changes: 184 additions & 0 deletions .gitignore
View file
@@ -0,0 +1,184 @@
# Ignore these files:
*.o
*.so.*
*.so
*.dylib
*.a
*.obj
*.ln
*.bb
*.bbg
*.da
*.tcov
*.gcov
gmon.out
*.bak
*.d
*.gcda
*.gcno
*.aux
*.bbl
*.blg
*.log
*.toc
*.dvi
*.lof
*.lot
*.dll
*.dSYM
my_*.out
*.gcda
*.gcno
*.mex*
*.profile
*.swp

# ignore these specific programs in the Package/Demo directories
AMD/Demo/amd_demo
AMD/Demo/amd_demo2
AMD/Demo/amd_l_demo
AMD/Demo/amd_simple
CAMD/Demo/camd_demo
CAMD/Demo/camd_demo2
CAMD/Demo/camd_l_demo
CAMD/Demo/camd_simple
CCOLAMD/Demo/ccolamd_example
CCOLAMD/Demo/ccolamd_l_example
CHOLMOD/Demo/cholmod_demo
CHOLMOD/Demo/cholmod_l_demo
CHOLMOD/Demo/cholmod_simple
CHOLMOD/Demo/timelog.m
COLAMD/Demo/colamd_example
COLAMD/Demo/colamd_l_example
CSparse/Demo/cs_demo1
CSparse/Demo/cs_demo2
CSparse/Demo/cs_demo3
CXSparse/Demo/cs_ci_demo1
CXSparse/Demo/cs_ci_demo2
CXSparse/Demo/cs_ci_demo3
CXSparse/Demo/cs_cl_demo1
CXSparse/Demo/cs_cl_demo2
CXSparse/Demo/cs_cl_demo3
CXSparse/Demo/cs_demo1
CXSparse/Demo/cs_demo2
CXSparse/Demo/cs_demo3
CXSparse/Demo/cs_di_demo1
CXSparse/Demo/cs_di_demo2
CXSparse/Demo/cs_di_demo3
CXSparse/Demo/cs_dl_demo1
CXSparse/Demo/cs_dl_demo2
CXSparse/Demo/cs_dl_demo3
CXSparse/Demo/cs_idemo
CXSparse/Demo/cs_ldemo
KLU/Demo/klu_simple
KLU/Demo/kludemo
KLU/Demo/kluldemo
LDL/Demo/ldlamd
LDL/Demo/ldllamd
LDL/Demo/ldllmain
LDL/Demo/ldllsimple
LDL/Demo/ldlmain
LDL/Demo/ldlsimple
RBio/Demo/RBdemo
RBio/Demo/temp.rb
SPQR/Demo/qrdemo
SPQR/Demo/qrsimple
SPQR/Demo/qrsimplec
SPQR/Demo/C.mtx
SPQR/Demo/E.txt
SPQR/Demo/R.mtx
SPQR/Demo/X.mtx
SPQR/Demo/gpu_results.txt
SPQR/Demo/qrdemo_gpu
SPQR/Demo/qrdemo_gpu2
SPQR/Demo/qrdemo_gpu3
UMFPACK/Demo/numeric.umf
UMFPACK/Demo/symbolic.umf
UMFPACK/Demo/umfpack_di_demo
UMFPACK/Demo/umfpack_dl_demo
UMFPACK/Demo/umfpack_simple
UMFPACK/Demo/umfpack_zi_demo
UMFPACK/Demo/umfpack_zl_demo

# ignore these specific programs in the Package/Tcov directories
CHOLMOD/Tcov/cl
CHOLMOD/Tcov/clread
CHOLMOD/Tcov/cm
CHOLMOD/Tcov/cmread
CHOLMOD/Tcov/covs.out
CHOLMOD/Tcov/ldemo
CHOLMOD/Tcov/ldemo.c
CHOLMOD/Tcov/temp*.mtx
CHOLMOD/Tcov/timelog.m
CHOLMOD/Tcov/l_*.c
CHOLMOD/Tcov/z_*.c
CHOLMOD/Tcov/zz_*.c
CHOLMOD/Tcov/zl_*.c
CHOLMOD/Tcov/zdemo
CHOLMOD/Tcov/zdemo.c

CSparse/Tcov/cov.out
CSparse/Tcov/cov.sort
CSparse/Tcov/cover.out
CSparse/Tcov/covs.out
CSparse/Tcov/cs_*.c
CSparse/Tcov/cstcov_test
CSparse/Tcov/*.out
CSparse/Tcov/cs_demo1
CSparse/Tcov/cs_demo2
CSparse/Tcov/cs_demo3

CXSparse/Tcov/cov.out
CXSparse/Tcov/cov.sort
CXSparse/Tcov/cover.out
CXSparse/Tcov/covs.out
CXSparse/Tcov/cs_*.c
CXSparse/Tcov/cs*_ci.c
CXSparse/Tcov/cs*_cl.c
CXSparse/Tcov/cs*_di.c
CXSparse/Tcov/cs*_dl.c
CXSparse/Tcov/*.out
CXSparse/Tcov/cs_demo1_ci
CXSparse/Tcov/cs_demo1_cl
CXSparse/Tcov/cs_demo1_di
CXSparse/Tcov/cs_demo1_dl
CXSparse/Tcov/cs_demo2_ci
CXSparse/Tcov/cs_demo2_cl
CXSparse/Tcov/cs_demo2_di
CXSparse/Tcov/cs_demo2_dl
CXSparse/Tcov/cs_demo3_ci
CXSparse/Tcov/cs_demo3_cl
CXSparse/Tcov/cs_demo3_di
CXSparse/Tcov/cs_demo3_dl
CXSparse/Tcov/cs_idemo
CXSparse/Tcov/cs_ldemo
CXSparse/Tcov/cstcov_test_ci
CXSparse/Tcov/cstcov_test_cl
CXSparse/Tcov/cstcov_test_di
CXSparse/Tcov/cstcov_test_dl

KLU/Tcov/cov_*.c
KLU/Tcov/klutest
KLU/Tcov/klultest
KLU/Tcov/*.out

SPQR/Tcov/X.mtx
SPQR/Tcov/gpu_results.txt
SPQR/Tcov/gpuqrengine_demo
SPQR/Tcov/qrdemo_gpu
SPQR/Tcov/qrtest
SPQR/Tcov/qrtest_out.txt
SPQR/Tcov/troll.m
SPQR/Tcov/cov.out

UMFPACK/Tcov/covall_err.out
UMFPACK/Tcov/cover.out

# ignore these specific files in the Package/MATLAB directories
MATLAB_Tools/spqr_rank/save_samples_demo_spqr_rank.mat
CXSparse/MATLAB/CSparse/cs_cl_*.c
CXSparse/MATLAB/Test/cs_*.c

# Do not ignore this file
!.gitignore

6 changes: 3 additions & 3 deletions AMD/Demo/amd_demo.out
View file
@@ -1,7 +1,7 @@
AMD version 2.4.3, date: Jan 30, 2016
AMD version 2.4.4, date: Feb 1, 2016
AMD demo, with the 24-by-24 Harwell/Boeing matrix, can_24:

AMD version 2.4.3, Jan 30, 2016: approximate minimum degree ordering
AMD version 2.4.4, Feb 1, 2016: approximate minimum degree ordering
dense row parameter: 10
(rows with more than max (10 * sqrt (n), 16) entries are
considered "dense", and placed last in output permutation)
Expand Down Expand Up @@ -115,7 +115,7 @@ Plot of input matrix pattern:
23: . . . . . . X . . . . X X . . . . . . . . . . X
return value from amd_order: 0 (should be 0)

AMD version 2.4.3, Jan 30, 2016, results:
AMD version 2.4.4, Feb 1, 2016, results:
status: OK
n, dimension of A: 24
nz, number of nonzeros in A: 160
Expand Down
4 changes: 2 additions & 2 deletions AMD/Demo/amd_demo2.out
View file
@@ -1,7 +1,7 @@
AMD demo, with a jumbled version of the 24-by-24
Harwell/Boeing matrix, can_24:

AMD version 2.4.3, Jan 30, 2016: approximate minimum degree ordering
AMD version 2.4.4, Feb 1, 2016: approximate minimum degree ordering
dense row parameter: 10
(rows with more than max (10 * sqrt (n), 16) entries are
considered "dense", and placed last in output permutation)
Expand Down Expand Up @@ -144,7 +144,7 @@ Plot of symmetric matrix to be ordered by amd_order:
23: . . . . . . X . . . . X X . . . . . . . . . . X
return value from amd_order: 1 (should be 1)

AMD version 2.4.3, Jan 30, 2016, results:
AMD version 2.4.4, Feb 1, 2016, results:
status: OK, but jumbled
n, dimension of A: 24
nz, number of nonzeros in A: 102
Expand Down
6 changes: 3 additions & 3 deletions AMD/Demo/amd_l_demo.out
View file
@@ -1,7 +1,7 @@
AMD version 2.4.3, date: Jan 30, 2016
AMD version 2.4.4, date: Feb 1, 2016
AMD demo, with the 24-by-24 Harwell/Boeing matrix, can_24:

AMD version 2.4.3, Jan 30, 2016: approximate minimum degree ordering
AMD version 2.4.4, Feb 1, 2016: approximate minimum degree ordering
dense row parameter: 10
(rows with more than max (10 * sqrt (n), 16) entries are
considered "dense", and placed last in output permutation)
Expand Down Expand Up @@ -115,7 +115,7 @@ Plot of input matrix pattern:
23: . . . . . . X . . . . X X . . . . . . . . . . X
return value from amd_l_order: 0 (should be 0)

AMD version 2.4.3, Jan 30, 2016, results:
AMD version 2.4.4, Feb 1, 2016, results:
status: OK
n, dimension of A: 24
nz, number of nonzeros in A: 160
Expand Down
Binary file modified AMD/Doc/AMD_UserGuide.pdf
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion AMD/Doc/AMD_UserGuide.tex
View file
Expand Up @@ -32,7 +32,7 @@
This work was supported by the EPSRC under grant GR/R46441.
}}

\date{VERSION 2.4.3, Jan 30, 2016}
\date{VERSION 2.4.4, Feb 1, 2016}
\maketitle

%------------------------------------------------------------------------------
Expand Down
4 changes: 4 additions & 0 deletions AMD/Doc/ChangeLog
View file
@@ -1,3 +1,7 @@
Feb 1, 2016: version 2.4.4

* update to Makefiles

Jan 30, 2016: version 2.4.3

* modifications to Makefiles
Expand Down
4 changes: 2 additions & 2 deletions AMD/Include/amd.h
View file
Expand Up @@ -386,11 +386,11 @@ void amd_l_info (double Info [ ]) ;
* Versions 1.1 and earlier of AMD do not include a #define'd version number.
*/

#define AMD_DATE "Jan 30, 2016"
#define AMD_DATE "Feb 1, 2016"
#define AMD_VERSION_CODE(main,sub) ((main) * 1000 + (sub))
#define AMD_MAIN_VERSION 2
#define AMD_SUB_VERSION 4
#define AMD_SUBSUB_VERSION 3
#define AMD_SUBSUB_VERSION 4
#define AMD_VERSION AMD_VERSION_CODE(AMD_MAIN_VERSION,AMD_SUB_VERSION)

#ifdef __cplusplus
Expand Down
26 changes: 13 additions & 13 deletions AMD/Lib/Makefile
View file
Expand Up @@ -3,16 +3,19 @@
#-------------------------------------------------------------------------------

LIBRARY = libamd
VERSION = 2.4.3
VERSION = 2.4.4
SO_VERSION = 2

default: library
$(MAKE) install INSTALL=$(CURDIR)/../.. \
INSTALL_DOC=$(CURDIR)/../../doc

include ../../SuiteSparse_config/SuiteSparse_config.mk

library: $(AR_TARGET) $(SO_TARGET)
# AMD depends on SuiteSparse_config
LDLIBS += -lsuitesparseconfig

# compile and install in SuiteSparse/lib
library:
$(MAKE) install INSTALL=$(SUITESPARSE)

C = $(CC) $(CF) -I../Include -I../../SuiteSparse_config

Expand All @@ -33,6 +36,7 @@ INC = ../Include/amd.h ../Include/amd_internal.h \

AMDI = $(addsuffix .o, $(subst amd_,amd_i_,$(AMD)))
AMDL = $(addsuffix .o, $(subst amd_,amd_l_,$(AMD)))
OBJ = $(AMDI) $(AMDL)

#-------------------------------------------------------------------------------
# compile each int and long routine (with no real/complex version)
Expand All @@ -45,16 +49,13 @@ amd_l_%.o: ../Source/amd_%.c $(INC)
$(C) -DDLONG -c $< -o $@

#-------------------------------------------------------------------------------
# Create the static and shared libraries (C versions only)
# Create the static library (C versions only)
#-------------------------------------------------------------------------------

$(AR_TARGET): $(AMDI) $(AMDL)
$(AR_TARGET): $(OBJ)
$(ARCHIVE) $@ $^
- $(RANLIB) $@

$(SO_TARGET): $(AMDI) $(AMDL)
$(CC) $(SO_OPTS) $^ -o $@

#-------------------------------------------------------------------------------
# compile the Fortran versions and the libamdf77.a library (static only)
#-------------------------------------------------------------------------------
Expand All @@ -78,14 +79,13 @@ libamdf77.a: $(AMDF77)
#-------------------------------------------------------------------------------

# install AMD
install: $(INSTALL_LIB)/$(SO_TARGET)
install: $(AR_TARGET) $(INSTALL_LIB)/$(SO_TARGET)

$(INSTALL_LIB)/$(SO_TARGET): $(SO_TARGET)
$(INSTALL_LIB)/$(SO_TARGET): $(OBJ)
@mkdir -p $(INSTALL_LIB)
@mkdir -p $(INSTALL_INCLUDE)
@mkdir -p $(INSTALL_DOC)
$(CP) $(SO_TARGET) $(INSTALL_LIB)
$(SO_INSTALL_NAME) $(INSTALL_LIB)/$(SO_TARGET) $(INSTALL_LIB)/$(SO_TARGET)
$(CC) $(SO_OPTS) $^ -o $@ $(LDLIBS)
( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_PLAIN) )
( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_MAIN) )
$(CP) ../Include/amd.h $(INSTALL_INCLUDE)
Expand Down
3 changes: 3 additions & 0 deletions AMD/Makefile
View file
Expand Up @@ -2,6 +2,9 @@
# AMD Makefile
#------------------------------------------------------------------------------

SUITESPARSE ?= $(realpath $(CURDIR)/..)
export SUITESPARSE

default: all

include ../SuiteSparse_config/SuiteSparse_config.mk
Expand Down
4 changes: 4 additions & 0 deletions BTF/Doc/ChangeLog
View file
@@ -1,3 +1,7 @@
Feb 1, 2016: version 1.2.4

* update to Makefiles

Jan 30, 2016: version 1.2.3

* modifications to Makefiles
Expand Down
4 changes: 2 additions & 2 deletions BTF/Include/btf.h
View file
Expand Up @@ -254,11 +254,11 @@ SuiteSparse_long btf_l_order (SuiteSparse_long, SuiteSparse_long *,
* #endif
*/

#define BTF_DATE "Jan 30, 2016"
#define BTF_DATE "Feb 1, 2016"
#define BTF_VERSION_CODE(main,sub) ((main) * 1000 + (sub))
#define BTF_MAIN_VERSION 1
#define BTF_SUB_VERSION 2
#define BTF_SUBSUB_VERSION 3
#define BTF_SUBSUB_VERSION 4
#define BTF_VERSION BTF_VERSION_CODE(BTF_MAIN_VERSION,BTF_SUB_VERSION)

#ifdef __cplusplus
Expand Down

0 comments on commit f76868e

Please sign in to comment.