Update SP 4.5.1

SuiteSparse/AMD/Demo/Makefile

@@ -4,13 +4,14 @@
 
 default: amd_simple amd_demo amd_demo2 amd_l_demo
 
-include ../../SuiteSparse_config/SuiteSparse_config.mk
+gak:
+	echo $(SUITESPARSE)
 
-C = $(CC) $(CF) -I../Include -I../../SuiteSparse_config
+include ../../SuiteSparse_config/SuiteSparse_config.mk
 
-INC = ../Include/amd.h ../../SuiteSparse_config/SuiteSparse_config.h
+C = $(CC) $(CF) -I../../include
 
-LIB2 = ../../SuiteSparse_config/libsuitesparseconfig.a $(LIB)
+LIB2 = $(LDFLAGS) -L../../lib -lamd -lsuitesparseconfig $(LDLIBS)
 
 library:
 	( cd ../../SuiteSparse_config ; $(MAKE) )
@@ -25,23 +26,24 @@ f77lib:
 
 dist:
 
-amd_demo: amd_demo.c library $(INC)
-	$(C) -o amd_demo amd_demo.c ../Lib/libamd.a $(LIB2)
+amd_demo: amd_demo.c library
+	$(C) -o amd_demo amd_demo.c $(LIB2)
 	./amd_demo > my_amd_demo.out
 	- diff amd_demo.out my_amd_demo.out
 
-amd_l_demo: amd_l_demo.c library $(INC)
-	$(C) -o amd_l_demo amd_l_demo.c ../Lib/libamd.a $(LIB2)
+amd_l_demo: amd_l_demo.c library
+	$(C) -o amd_l_demo amd_l_demo.c $(LIB2)
 	./amd_l_demo > my_amd_l_demo.out
 	- diff amd_l_demo.out my_amd_l_demo.out
 
-amd_demo2: amd_demo2.c library $(INC)
-	$(C) -o amd_demo2 amd_demo2.c ../Lib/libamd.a $(LIB2)
+amd_demo2: amd_demo2.c library
+	$(C) -o amd_demo2 amd_demo2.c $(LIB2)
 	./amd_demo2 > my_amd_demo2.out
 	- diff amd_demo2.out my_amd_demo2.out
 
-amd_simple: amd_simple.c library $(INC)
-	$(C) -o amd_simple amd_simple.c ../Lib/libamd.a $(LIB2)
+amd_simple: amd_simple.c library
+	echo $(LD_LIBRARY_PATH)
+	$(C) -o amd_simple amd_simple.c $(LIB2)
 	./amd_simple > my_amd_simple.out
 	- diff amd_simple.out my_amd_simple.out
 
@@ -79,7 +81,7 @@ amd_f77cross:  amd_f77cross.f amd_f77wrapper.o ../Lib/libamd.a
 #------------------------------------------------------------------------------
 
 clean:
-	- $(RM) $(CLEAN)
+	- $(RM) -r $(CLEAN)
 
 purge: distclean
 
@@ -91,4 +93,5 @@ distclean: clean
 	- $(RM) amd_f77demo my_amd_f77demo.out
 	- $(RM) amd_f77simple my_amd_f77simple.out
 	- $(RM) amd_f77cross my_amd_f77cross.out
-	- $(RM) -r *.dSYM
+	- $(RM) -r $(PURGE)
+

SuiteSparse/AMD/Demo/amd_demo.out

@@ -1,7 +1,7 @@
-AMD version 2.4.1, date: Oct 10, 2014
+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.1, Oct 10, 2014: 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)
@@ -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.1, Oct 10, 2014, results:
+AMD version 2.4.4, Feb 1, 2016, results:
     status: OK
     n, dimension of A:                                  24
     nz, number of nonzeros in A:                        160

SuiteSparse/AMD/Demo/amd_demo2.out

@@ -1,7 +1,7 @@
 AMD demo, with a jumbled version of the 24-by-24
 Harwell/Boeing matrix, can_24:
 
-AMD version 2.4.1, Oct 10, 2014: 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)
@@ -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.1, Oct 10, 2014, 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

SuiteSparse/AMD/Demo/amd_l_demo.out

@@ -1,7 +1,7 @@
-AMD version 2.4.1, date: Oct 10, 2014
+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.1, Oct 10, 2014: 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)
@@ -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.1, Oct 10, 2014, results:
+AMD version 2.4.4, Feb 1, 2016, results:
     status: OK
     n, dimension of A:                                  24
     nz, number of nonzeros in A:                        160

SuiteSparse/AMD/Doc/AMD_UserGuide.tex

@@ -32,7 +32,7 @@
 This work was supported by the EPSRC under grant GR/R46441.
 }}
 
-\date{VERSION 2.4.1, Oct 10, 2014}
+\date{VERSION 2.4.4, Feb 1, 2016}
 \maketitle
 
 %------------------------------------------------------------------------------
@@ -50,33 +50,30 @@
 AMD is available under alternate licences; contact T. Davis for details.
 
 {\bf AMD License:}
-    Your use or distribution of AMD or any modified version of
-    AMD implies that you agree to this License.
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
-    USA
-
-    Permission is hereby granted to use or copy this program under the
-    terms of the GNU LGPL, provided that the Copyright, this License,
-    and the Availability of the original version is retained on all copies.
-    User documentation of any code that uses this code or any modified
-    version of this code must cite the Copyright, this License, the
-    Availability note, and "Used by permission." Permission to modify
-    the code and to distribute modified code is granted, provided the
-    Copyright, this License, and the Availability note are retained,
-    and a notice that the code was modified is included.
+At the user's option, you may use AMD under either the LGPL
+version 2.1 license, or the BSD 3-clause license.  You may not use both
+licenses, nor may you mix-and-match clauses from each license.  To use a
+license, in the documentation for your application simply state either of the
+following, replacing <YOUR APPLICATION> with the name of your application:
+
+    \begin{quote}
+    AMD, Copyright (c), 1996-2015, Timothy A. Davis,
+    Patrick R. Amestoy, and Iain S. Duff.  All Rights Reserved.
+    Used in <YOUR APPLICATION> under the BSD 3-clause license.
+    \end{quote}
+
+or
+
+    \begin{quote}
+    AMD, Copyright (c), 1996-2015, Timothy A. Davis,
+    Patrick R. Amestoy, and Iain S. Duff.  All Rights Reserved.
+    Used in <YOUR APPLICATION> under the LGPL v2.1 license.
+    \end{quote}
+
+In the event that your package <A> includes another package <B> by another
+author, and <A> and <B> use AMD under different licenses, you may select
+one license to apply to both uses of AMD in the combined application.
+See the Doc/License.txt file for the details of each license.
 
 {\bf Availability:}
     http://www.suitesparse.com
@@ -690,11 +687,13 @@ \section{Installation}
 file.  You can edit that file to customize the compilation.  The default
 settings will work on most systems.
 Sample configuration files are provided
-for Linux, Sun Solaris, SGI IRIX, IBM AIX, and the DEC/Compaq Alpha.
+for Mac, Linux, Sun Solaris, and IBM AIX.
+The system you are on is detected automatically.
 
 To compile and install the C-callable AMD library,
 go to the {\tt AMD} directory and type {\tt make}.
-The library will be placed in {\tt AMD/Lib/libamd.a}.
+A dynamic library is placed in
+in {\tt AMD/Lib/libamd.so.*}, ({\tt *.dylib} for the Mac).
 Three demo programs of the AMD ordering routine will be compiled and tested in
 the {\tt AMD/Demo} directory.
 The outputs of these demo programs will then be compared with output
@@ -714,13 +713,23 @@ \section{Installation}
 then you should type {\tt make purge} and then {\tt make} to recompile.
 
 When you compile your program that uses the C-callable AMD library,
-you need to add the {\tt AMD/Lib/libamd.a} library
+you need to add the {\tt AMD/Lib/libamd.*} library
 and you need to tell your compiler to look in the
 {\tt AMD/Include} directory for include
 files.   To compile a Fortran program that calls the Fortran AMD library,
 you need to add the {\tt AMD/Lib/libamdf77.a} library.
 See {\tt AMD/Demo/Makefile} for an example.
 
+By doing {\tt make}, all compiled dynamic libraries are also copied into {\tt
+SuiteSparse/lib} the include files are coped into {\tt SuiteSparse/include},
+and documentation is copied into {\tt SuiteSparse/doc}.
+
+Alternatively, you can install the shared library
+and include files in /usr/local/lib and /usr/local/include, and
+the documenation in /usr/local/doc.
+Just do {\tt make} then {\tt make install}.
+Now you can simply use {\tt -lamd} when you compile your own program.
+
 If all you want to use is the AMD2 mexFunction in MATLAB, you can skip
 the use of the {\tt make} command entirely.  Simply type
 {\tt amd\_make} in MATLAB while in the {\tt AMD/MATLAB} directory.

SuiteSparse/AMD/Doc/ChangeLog

@@ -1,3 +1,16 @@
+Feb 1, 2016: version 2.4.4
+
+    * update to Makefiles
+
+Jan 30, 2016: version 2.4.3
+
+    * modifications to Makefiles
+
+Jan 1, 2016: version 2.4.2
+
+    * modified Makefile to create shared libraries
+        No change to C code except version number
+
 Oct 10, 2014: version 2.4.1
 
     modified MATLAB/amd_make.m.  No change to C code except version number.

SuiteSparse/AMD/Doc/Makefile

@@ -11,19 +11,19 @@ include ../../SuiteSparse_config/SuiteSparse_config.mk
 #------------------------------------------------------------------------------
 
 clean:
-	- $(RM) $(CLEAN)
+	- $(RM) -r $(CLEAN)
 
 purge: distclean
 
 distclean: clean
-	- $(RM) *.aux *.bbl *.blg *.log *.toc
+	- $(RM) -r $(PURGE)
 
 #------------------------------------------------------------------------------
 # Create the User Guide and Quick Start Guide
 #------------------------------------------------------------------------------
 
 AMD_UserGuide.pdf: AMD_UserGuide.tex AMD_UserGuide.bib ../Include/amd.h
-	echo '\\begin{verbatim}' > amd_h.tex
+	echo '\begin{verbatim}' > amd_h.tex
 	expand -8 ../Include/amd.h >> amd_h.tex
 	echo '\end{verbatim}' >> amd_h.tex
 	pdflatex AMD_UserGuide

SuiteSparse/AMD/Include/amd.h

@@ -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 "Oct 10, 2014"
+#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 1
+#define AMD_SUBSUB_VERSION 4
 #define AMD_VERSION AMD_VERSION_CODE(AMD_MAIN_VERSION,AMD_SUB_VERSION)
 
 #ifdef __cplusplus