v4.5.3

AMD/Demo/Makefile

@@ -1,5 +1,5 @@
 #-----------------------------------------------------------------------------
-# compile the AMD demo (for both GNU make or original make)
+# compile the AMD demo
 #-----------------------------------------------------------------------------
 
 default: amd_simple amd_demo amd_demo2 amd_l_demo

AMD/Demo/amd_demo.out

@@ -1,7 +1,7 @@
-AMD version 2.4.4, date: Feb 1, 2016
+AMD version 2.4.6, date: May 4, 2016
 AMD demo, with the 24-by-24 Harwell/Boeing matrix, can_24:
 
-AMD version 2.4.4, Feb 1, 2016: approximate minimum degree ordering
+AMD version 2.4.6, May 4, 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.4, Feb 1, 2016, results:
+AMD version 2.4.6, May 4, 2016, results:
     status: OK
     n, dimension of A:                                  24
     nz, number of nonzeros in A:                        160

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.4, Feb 1, 2016: approximate minimum degree ordering
+AMD version 2.4.6, May 4, 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.4, Feb 1, 2016, results:
+AMD version 2.4.6, May 4, 2016, results:
     status: OK, but jumbled
     n, dimension of A:                                  24
     nz, number of nonzeros in A:                        102

AMD/Demo/amd_f77wrapper.c

@@ -21,14 +21,6 @@
  * after each routine name.  C doesn't do this, so the translation is made
  * here.  Some Fortran compilers don't append an underscore (xlf on IBM AIX,
  * for * example).
- *
- * Tested with the following compilers:
- * Solaris with cc and f77 from Sun WorkShop 6 update 1.
- * SGI Irix with MIPSpro cc and f77 compilers version 7.4
- * Linux with GNU gcc or Intel's icc, and GNU g77 Intel's ifc Fortran compiler.
- *	(any combination).  Note that with g77, a call to amd_order in Fortran
- *	gets translated to a call to amd_order__, with two underscores ("_").
- *	Thus, the Fortran names do not include an underscore.
  */
 
 #include "amd.h"

AMD/Demo/amd_l_demo.out

@@ -1,7 +1,7 @@
-AMD version 2.4.4, date: Feb 1, 2016
+AMD version 2.4.6, date: May 4, 2016
 AMD demo, with the 24-by-24 Harwell/Boeing matrix, can_24:
 
-AMD version 2.4.4, Feb 1, 2016: approximate minimum degree ordering
+AMD version 2.4.6, May 4, 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.4, Feb 1, 2016, results:
+AMD version 2.4.6, May 4, 2016, results:
     status: OK
     n, dimension of A:                                  24
     nz, number of nonzeros in A:                        160

AMD/Doc/AMD_UserGuide.tex

@@ -32,7 +32,7 @@
 This work was supported by the EPSRC under grant GR/R46441.
 }}
 
-\date{VERSION 2.4.4, Feb 1, 2016}
+\date{VERSION 2.4.6, May 4, 2016}
 \maketitle
 
 %------------------------------------------------------------------------------
@@ -49,31 +49,8 @@
 Davis, Patrick R. Amestoy, and Iain S. Duff.  All Rights Reserved.
 AMD is available under alternate licences; contact T. Davis for details.
 
-{\bf AMD License:}
-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 AMD License:} Refer to the AMD/Doc/License.txt file for the license
+for your particular copy of AMD.
 
 {\bf Availability:}
     http://www.suitesparse.com

AMD/Doc/ChangeLog

@@ -1,3 +1,11 @@
+May 4, 2016: version 2.4.6
+
+    * minor changes to Makefile
+
+Apr 1, 2016: version 2.4.5
+
+    * licensing simplified (no other change); refer to AMD/Doc/License.txt
+
 Feb 1, 2016: version 2.4.4
 
     * update to Makefiles
@@ -107,8 +115,6 @@ Aug. 30, 2005: AMD Version 1.2
 
     * Makefile modified to use UFconfig.mk.  "Make" directory removed.
 
-    * License changed to GNU LGPL.
-
     * Easier inclusion in C++ programs.
 
     * option to allow compile-time redefinition of malloc and free

AMD/Doc/Makefile

@@ -1,5 +1,5 @@
 #------------------------------------------------------------------------------
-# AMD Makefile for compiling on Unix systems (for GNU or original make)
+# AMD Makefile for compiling on Unix systems
 #------------------------------------------------------------------------------
 
 default: dist

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 "Feb 1, 2016"
+#define AMD_DATE "May 4, 2016"
 #define AMD_VERSION_CODE(main,sub) ((main) * 1000 + (sub))
 #define AMD_MAIN_VERSION 2
 #define AMD_SUB_VERSION 4
-#define AMD_SUBSUB_VERSION 4
+#define AMD_SUBSUB_VERSION 6
 #define AMD_VERSION AMD_VERSION_CODE(AMD_MAIN_VERSION,AMD_SUB_VERSION)
 
 #ifdef __cplusplus

AMD/Lib/Makefile

@@ -3,7 +3,7 @@
 #-------------------------------------------------------------------------------
 
 LIBRARY = libamd
-VERSION = 2.4.4
+VERSION = 2.4.6
 SO_VERSION = 2
 
 default: library
@@ -52,6 +52,8 @@ amd_l_%.o: ../Source/amd_%.c $(INC)
 # Create the static library (C versions only)
 #-------------------------------------------------------------------------------
 
+static: $(AR_TARGET)
+
 $(AR_TARGET): $(OBJ)
 	$(ARCHIVE) $@ $^
 	- $(RANLIB) $@

AMD/Makefile

@@ -20,6 +20,10 @@ all:
 library:
 	( cd Lib    ; $(MAKE) )
 
+# compile the static libraries only
+static:
+	( cd Lib    ; $(MAKE) static )
+
 # compile the FORTRAN libraries and demo programs (not compiled by "make all")
 fortran:
 	( cd Lib    ; $(MAKE) fortran )

AMD/README.txt

@@ -28,35 +28,7 @@ Quick start (for MATLAB users);
 
 -------------------------------------------------------------------------------
 
-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.
+AMD License:  refer to the AMD/Doc/License.txt file for the license.
 
 Availability:
 
@@ -111,7 +83,7 @@ Files and directories in the AMD distribution:
     Files in the AMD directory:
     ---------------------------------------------------------------------------
 
-    Makefile	top-level Makefile for GNU make or original make.
+    Makefile	top-level Makefile
 		Windows users would require Cygwin to use "make"
 
     README.txt	this file
@@ -121,12 +93,11 @@ Files and directories in the AMD distribution:
     ---------------------------------------------------------------------------
 
     ChangeLog			change log
-    License			the AMD License
+    License.txt			the AMD License
     Makefile			for creating the documentation
     AMD_UserGuide.bib		AMD User Guide (references)
     AMD_UserGuide.tex		AMD User Guide (LaTeX)
     AMD_UserGuide.pdf		AMD User Guide (PDF)
-    lesser.txt			the GNU LGPL license
 
     ---------------------------------------------------------------------------
     Source directory:
@@ -162,8 +133,7 @@ Files and directories in the AMD distribution:
     Demo directory:
     ---------------------------------------------------------------------------
 
-    Makefile			for GNU make or original make
-
+    Makefile                    to compile the demos
     amd_demo.c			C demo program for AMD
     amd_demo.out		output of amd_demo.c
 

BTF/Doc/ChangeLog

@@ -1,3 +1,11 @@
+May 4, 2016: version 1.2.6
+
+    * minor changes to Makefile
+
+Apr 1, 2016: version 1.2.5
+
+    * licensing simplified (no other change); refer to BTF/Doc/License.txt
+
 Feb 1, 2016: version 1.2.4
 
     * update to Makefiles

CHOLMOD/Check/License.txt → BTF/Doc/License.txt

@@ -1,20 +1,16 @@
-CHOLMOD/Check Module.  Copyright (C) 2005-2006, Timothy A. Davis
-CHOLMOD is also available under other licenses; contact authors for details.
+BTF, Copyright (C) 2004-2013, University of Florida
+by Timothy A. Davis and Ekanathan Palamadai.
+BTF is also available under other licenses; contact authors for details.
 http://www.suitesparse.com
 
-Note that this license is for the CHOLMOD/Check module only.
-All CHOLMOD modules are licensed separately.
-
-
 --------------------------------------------------------------------------------
 
-
-This Module is free software; you can redistribute it and/or
+BTF 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 Module is distributed in the hope that it will be useful,
+BTF 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.

BTF/Include/btf.h

@@ -254,11 +254,11 @@ SuiteSparse_long btf_l_order (SuiteSparse_long, SuiteSparse_long *,
  *      #endif
  */
 
-#define BTF_DATE "Feb 1, 2016"
+#define BTF_DATE "May 4, 2016"
 #define BTF_VERSION_CODE(main,sub) ((main) * 1000 + (sub))
 #define BTF_MAIN_VERSION 1
 #define BTF_SUB_VERSION 2
-#define BTF_SUBSUB_VERSION 4
+#define BTF_SUBSUB_VERSION 6
 #define BTF_VERSION BTF_VERSION_CODE(BTF_MAIN_VERSION,BTF_SUB_VERSION)
 
 #ifdef __cplusplus

BTF/Lib/Makefile

@@ -3,7 +3,7 @@
 #-------------------------------------------------------------------------------
 
 LIBRARY = libbtf
-VERSION = 1.2.4
+VERSION = 1.2.6
 SO_VERSION = 1
 
 default: library
@@ -33,6 +33,8 @@ all: library
 OBJ = btf_order.o btf_maxtrans.o btf_strongcomp.o \
     btf_l_order.o btf_l_maxtrans.o btf_l_strongcomp.o
 
+static: $(AR_TARGET)
+
 $(AR_TARGET): $(OBJ)
 	$(ARCHIVE) $@ $^
 	- $(RANLIB) $@

BTF/Makefile

@@ -12,6 +12,10 @@ include ../SuiteSparse_config/SuiteSparse_config.mk
 library:
 	( cd Lib ; $(MAKE) )
 
+# compile the static libraries only
+static:
+	( cd Lib    ; $(MAKE) static )
+
 clean:
 	( cd Lib ; $(MAKE) clean )
 	( cd MATLAB ; $(RM) $(CLEAN) )

BTF/README.txt

@@ -2,6 +2,8 @@ BTF, by Timothy A. Davis, Copyright (C) 2004-2016, University of Florida
 BTF is also available under other licenses; contact the author for details.
 http://www.suitesparse.com
 
+See BTF/Doc/License.txt for the license.
+
 BTF is a software package for permuting a matrix into block upper triangular
 form.  It includes a maximum transversal algorithm, which finds a permutation
 of a square or rectangular matrix so that it has a zero-free diagonal (if one
@@ -35,26 +37,6 @@ relative to this directory.
 
 --------------------------------------------------------------------------------
 
-BTF 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 Module 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 Module; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
---------------------------------------------------------------------------------
-
-A full text of the license is in Doc/lesser.txt.  
-
---------------------------------------------------------------------------------
-
 Files and directories in the BTF package:
 
     Doc             documentation and license
@@ -68,7 +50,6 @@ Files and directories in the BTF package:
 ./Doc:
 
     ChangeLog       changes in BTF
-    lesser.txt      license
 
 ./Include:
 

CAMD/Demo/Makefile

@@ -1,5 +1,5 @@
 #-----------------------------------------------------------------------------
-# compile the CAMD demo (for both GNU make or original make)
+# compile the CAMD demo
 #-----------------------------------------------------------------------------
 
 default: camd_simple camd_demo camd_demo2 camd_l_demo