v4.5.0

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
 

AMD/Demo/amd_demo.out

@@ -1,7 +1,7 @@
-AMD version 2.4.2, date: Jan 1, 2016
+AMD version 2.4.3, date: Jan 30, 2016
 AMD demo, with the 24-by-24 Harwell/Boeing matrix, can_24:
 
-AMD version 2.4.2, Jan 1, 2016: approximate minimum degree ordering
+AMD version 2.4.3, Jan 30, 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.2, Jan 1, 2016, results:
+AMD version 2.4.3, Jan 30, 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.2, Jan 1, 2016: approximate minimum degree ordering
+AMD version 2.4.3, Jan 30, 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.2, Jan 1, 2016, results:
+AMD version 2.4.3, Jan 30, 2016, results:
     status: OK, but jumbled
     n, dimension of A:                                  24
     nz, number of nonzeros in A:                        102

AMD/Demo/amd_l_demo.out

@@ -1,7 +1,7 @@
-AMD version 2.4.2, date: Jan 1, 2016
+AMD version 2.4.3, date: Jan 30, 2016
 AMD demo, with the 24-by-24 Harwell/Boeing matrix, can_24:
 
-AMD version 2.4.2, Jan 1, 2016: approximate minimum degree ordering
+AMD version 2.4.3, Jan 30, 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.2, Jan 1, 2016, results:
+AMD version 2.4.3, Jan 30, 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.2, Jan 1, 2016}
+\date{VERSION 2.4.3, Jan 30, 2016}
 \maketitle
 
 %------------------------------------------------------------------------------
@@ -692,8 +692,7 @@ \section{Installation}
 
 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},
-and a dynamic library is placed in
+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.
@@ -714,15 +713,20 @@ \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.
 
-Alternatively, you can install the shared library (libamd.so)
-and include files in /usr/local/lib and /usr/local/include.
+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.
 

AMD/Doc/ChangeLog

@@ -1,3 +1,7 @@
+Jan 30, 2016: version 2.4.3
+
+    * modifications to Makefiles
+
 Jan 1, 2016: version 2.4.2
 
     * modified Makefile to create shared libraries

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

AMD/Lib/Makefile

@@ -3,9 +3,12 @@
 #-------------------------------------------------------------------------------
 
 LIBRARY = libamd
-VERSION = 2.4.2
+VERSION = 2.4.3
+SO_VERSION = 2
 
 default: library
+	$(MAKE) install INSTALL=$(CURDIR)/../.. \
+		INSTALL_DOC=$(CURDIR)/../../doc
 
 include ../../SuiteSparse_config/SuiteSparse_config.mk
 
@@ -17,12 +20,12 @@ C = $(CC) $(CF) -I../Include -I../../SuiteSparse_config
 # source files
 #-------------------------------------------------------------------------------
 
-AMD = amd_aat amd_1 amd_2 amd_dump amd_postorder amd_post_tree amd_defaults \
+AMD = amd_aat amd_1 amd_2 amd_dump amd_postorder amd_defaults \
+        amd_post_tree  \
 	amd_order amd_control amd_info amd_valid amd_preprocess
 
-CONFIG = ../../SuiteSparse_config/SuiteSparse_config.h
-
-INC = ../Include/amd.h ../Include/amd_internal.h $(CONFIG)
+INC = ../Include/amd.h ../Include/amd_internal.h \
+      ../../SuiteSparse_config/SuiteSparse_config.h
 
 #-------------------------------------------------------------------------------
 # object files for each version
@@ -75,19 +78,32 @@ libamdf77.a: $(AMDF77)
 #-------------------------------------------------------------------------------
 
 # install AMD
-install: uninstall $(SO_TARGET)
+install: $(INSTALL_LIB)/$(SO_TARGET)
+
+$(INSTALL_LIB)/$(SO_TARGET): $(SO_TARGET)
+	@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)
 	( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_PLAIN) )
+	( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_MAIN) )
 	$(CP) ../Include/amd.h $(INSTALL_INCLUDE)
-	chmod 644 $(INSTALL_LIB)/$(SO_TARGET)
-	chmod 644 $(INSTALL_LIB)/$(SO_PLAIN)
+	$(CP) ../Doc/AMD_UserGuide.pdf $(INSTALL_DOC)
+	$(CP) ../README.txt $(INSTALL_DOC)/AMD_README.txt
+	chmod 755 $(INSTALL_LIB)/$(SO_TARGET)
 	chmod 644 $(INSTALL_INCLUDE)/amd.h
+	chmod 644 $(INSTALL_DOC)/AMD_UserGuide.pdf
+	chmod 644 $(INSTALL_DOC)/AMD_README.txt
 
 # uninstall AMD
 uninstall:
 	$(RM) $(INSTALL_LIB)/$(SO_TARGET)
 	$(RM) $(INSTALL_LIB)/$(SO_PLAIN)
+	$(RM) $(INSTALL_LIB)/$(SO_MAIN)
 	$(RM) $(INSTALL_INCLUDE)/amd.h
+	$(RM) $(INSTALL_DOC)/AMD_UserGuide.pdf
+	$(RM) $(INSTALL_DOC)/AMD_README.txt
 
 #-------------------------------------------------------------------------------
 # Remove all but the files in the original distribution
@@ -100,3 +116,4 @@ purge: distclean
 
 distclean: clean
 	- $(RM) -r $(PURGE)
+

AMD/Makefile

@@ -6,9 +6,6 @@ default: all
 
 include ../SuiteSparse_config/SuiteSparse_config.mk
 
-query:
-	echo $(MKLROOT)
-
 demos: all
 
 # Compile all C code.  Do not compile the FORTRAN versions.

BTF/Doc/ChangeLog

@@ -1,3 +1,7 @@
+Jan 30, 2016: version 1.2.3
+
+    * modifications to Makefiles
+
 Jan 1, 2016: version 1.2.2
 
     * modified Makefile to create shared libraries

BTF/Include/btf.h

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

BTF/Lib/Makefile

@@ -3,9 +3,12 @@
 #-------------------------------------------------------------------------------
 
 LIBRARY = libbtf
-VERSION = 1.2.2
+VERSION = 1.2.3
+SO_VERSION = 1
 
-default: all
+default: library
+	$(MAKE) install INSTALL=$(CURDIR)/../.. \
+		INSTALL_DOC=$(CURDIR)/../../doc
 
 ccode: all
 
@@ -60,18 +63,29 @@ btf_l_strongcomp.o: ../Source/btf_strongcomp.c
 
 #-------------------------------------------------------------------------------
 
-install: uninstall $(SO_TARGET)
+# install BTF
+install: $(INSTALL_LIB)/$(SO_TARGET)
+
+$(INSTALL_LIB)/$(SO_TARGET): $(SO_TARGET)
+	@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)
 	( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_PLAIN) )
+	( cd $(INSTALL_LIB) ; ln -sf $(SO_TARGET) $(SO_MAIN) )
 	$(CP) ../Include/btf.h $(INSTALL_INCLUDE)
-	chmod 644 $(INSTALL_LIB)/$(SO_TARGET)
-	chmod 644 $(INSTALL_LIB)/$(SO_PLAIN)
+	$(CP) ../README.txt $(INSTALL_DOC)/BTF_README.txt
+	chmod 755 $(INSTALL_LIB)/$(SO_TARGET)
 	chmod 644 $(INSTALL_INCLUDE)/btf.h
+	chmod 644 $(INSTALL_DOC)/BTF_README.txt
 
 uninstall:
 	$(RM) $(INSTALL_LIB)/$(SO_TARGET)
 	$(RM) $(INSTALL_LIB)/$(SO_PLAIN)
+	$(RM) $(INSTALL_LIB)/$(SO_MAIN)
 	$(RM) $(INSTALL_INCLUDE)/btf.h
+	$(RM) $(INSTALL_DOC)/BTF_README.txt
 
 #-------------------------------------------------------------------------------
 

CAMD/Demo/Makefile

@@ -6,11 +6,9 @@ default: camd_simple camd_demo camd_demo2 camd_l_demo
 
 include ../../SuiteSparse_config/SuiteSparse_config.mk
 
-C = $(CC) $(CF) -I../Include -I../../SuiteSparse_config
+C = $(CC) $(CF) -I../../include
 
-INC = ../Include/camd.h ../../SuiteSparse_config/SuiteSparse_config.h
-
-LIB2 = ../../SuiteSparse_config/libsuitesparseconfig.a $(LIB)
+LIB2 = $(LDFLAGS) -L../../lib -lcamd -lsuitesparseconfig $(LDLIBS) 
 
 library:
 	( cd ../../SuiteSparse_config ; $(MAKE) )
@@ -22,23 +20,23 @@ library:
 
 dist:
 
-camd_demo: camd_demo.c library $(INC)
-	$(C) -o camd_demo camd_demo.c ../Lib/libcamd.a $(LIB2)
+camd_demo: camd_demo.c library
+	$(C) -o camd_demo camd_demo.c $(LIB2)
 	./camd_demo > my_camd_demo.out
 	- diff camd_demo.out my_camd_demo.out
 
-camd_l_demo: camd_l_demo.c library $(INC)
-	$(C) -o camd_l_demo camd_l_demo.c ../Lib/libcamd.a $(LIB2)
+camd_l_demo: camd_l_demo.c library
+	$(C) -o camd_l_demo camd_l_demo.c $(LIB2)
 	./camd_l_demo > my_camd_l_demo.out
 	- diff camd_l_demo.out my_camd_l_demo.out
 
-camd_demo2: camd_demo2.c library $(INC)
-	$(C) -o camd_demo2 camd_demo2.c ../Lib/libcamd.a $(LIB2)
+camd_demo2: camd_demo2.c library
+	$(C) -o camd_demo2 camd_demo2.c $(LIB2)
 	./camd_demo2 > my_camd_demo2.out
 	- diff camd_demo2.out my_camd_demo2.out
 
-camd_simple: camd_simple.c library $(INC)
-	$(C) -o camd_simple camd_simple.c ../Lib/libcamd.a $(LIB2)
+camd_simple: camd_simple.c library
+	$(C) -o camd_simple camd_simple.c $(LIB2)
 	./camd_simple > my_camd_simple.out
 	- diff camd_simple.out my_camd_simple.out
 

CAMD/Demo/camd_demo.out

@@ -1,7 +1,7 @@
-CAMD version 2.4, date: Jan 1, 2016
+CAMD version 2.4, date: Jan 30, 2016
 CAMD demo, with the 24-by-24 Harwell/Boeing matrix, can_24:
 
-camd version 2.4, Jan 1, 2016:  approximate minimum degree ordering:
+camd version 2.4, Jan 30, 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 camd_order: 0 (should be 0)
 
-CAMD version 2.4.2, Jan 1, 2016, results:
+CAMD version 2.4.3, Jan 30, 2016, results:
     status: OK
     n, dimension of A:                                  24
     nz, number of nonzeros in A:                        160