v4.4.0

AMD/Demo/amd_demo.out

@@ -1,7 +1,7 @@
-AMD version 2.4.0, date: July 31, 2013
+AMD version 2.4.1, date: Oct 10, 2014
 AMD demo, with the 24-by-24 Harwell/Boeing matrix, can_24:
 
-AMD version 2.4.0, July 31, 2013: approximate minimum degree ordering
+AMD version 2.4.1, Oct 10, 2014: 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.0, July 31, 2013, results:
+AMD version 2.4.1, Oct 10, 2014, 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.0, July 31, 2013: approximate minimum degree ordering
+AMD version 2.4.1, Oct 10, 2014: 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.0, July 31, 2013, results:
+AMD version 2.4.1, Oct 10, 2014, 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.0, date: July 31, 2013
+AMD version 2.4.1, date: Oct 10, 2014
 AMD demo, with the 24-by-24 Harwell/Boeing matrix, can_24:
 
-AMD version 2.4.0, July 31, 2013: approximate minimum degree ordering
+AMD version 2.4.1, Oct 10, 2014: 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.0, July 31, 2013, results:
+AMD version 2.4.1, Oct 10, 2014, 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.0, July 31, 2013}
+\date{VERSION 2.4.1, Oct 10, 2014}
 \maketitle
 
 %------------------------------------------------------------------------------

AMD/Doc/ChangeLog

@@ -1,3 +1,7 @@
+Oct 10, 2014: version 2.4.1
+
+    modified MATLAB/amd_make.m.  No change to C code except version number.
+
 July 31, 2013: version 2.4.0
 
     * changed malloc and printf pointers to use SuiteSparse_config

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 "July 31, 2013"
+#define AMD_DATE "Oct 10, 2014"
 #define AMD_VERSION_CODE(main,sub) ((main) * 1000 + (sub))
 #define AMD_MAIN_VERSION 2
 #define AMD_SUB_VERSION 4
-#define AMD_SUBSUB_VERSION 0
+#define AMD_SUBSUB_VERSION 1
 #define AMD_VERSION AMD_VERSION_CODE(AMD_MAIN_VERSION,AMD_SUB_VERSION)
 
 #ifdef __cplusplus

AMD/MATLAB/amd_make.m

@@ -15,6 +15,11 @@
     d = '-largeArrayDims' ;
 end
 
+% MATLAB 8.3.0 now has a -silent option to keep 'mex' from burbling too much
+if (~verLessThan ('matlab', '8.3.0'))
+    d = ['-silent ' d] ;
+end
+
 i = sprintf ('-I../Include -I../../SuiteSparse_config') ;
 cmd = sprintf ('mex -O %s -DDLONG -output amd2 %s amd_mex.c %s', d, i, ...
     '../../SuiteSparse_config/SuiteSparse_config.c') ;

AMD/Makefile

@@ -2,7 +2,7 @@
 # AMD Makefile (for GNU Make or original make)
 #------------------------------------------------------------------------------
 
-VERSION = 2.4.0
+VERSION = 2.4.1
 
 default: all
 

BTF/Doc/ChangeLog

@@ -1,3 +1,7 @@
+Oct 10, 2014: version 1.2.1
+
+    modified MATLAB/btf_make.m.  No change to C code except version number.
+
 Jun 1, 2012: version 1.2.0
 
     * changed from UFconfig to SuiteSparse_config

BTF/Include/btf.h

@@ -254,11 +254,11 @@ SuiteSparse_long btf_l_order (SuiteSparse_long, SuiteSparse_long *,
  *      #endif
  */
 
-#define BTF_DATE "Jun 1, 2012"
+#define BTF_DATE "Oct 10, 2014"
 #define BTF_VERSION_CODE(main,sub) ((main) * 1000 + (sub))
 #define BTF_MAIN_VERSION 1
 #define BTF_SUB_VERSION 2
-#define BTF_SUBSUB_VERSION 0
+#define BTF_SUBSUB_VERSION 1
 #define BTF_VERSION BTF_VERSION_CODE(BTF_MAIN_VERSION,BTF_SUB_VERSION)
 
 #ifdef __cplusplus

BTF/MATLAB/btf_make.m

@@ -16,6 +16,11 @@
     mexcmd = [mexcmd '-largeArrayDims '] ;
 end
 
+% MATLAB 8.3.0 now has a -silent option to keep 'mex' from burbling too much
+if (~verLessThan ('matlab', '8.3.0'))
+    mexcmd = [mexcmd ' -silent '] ;
+end
+
 s = [mexcmd 'maxtrans.c ../Source/btf_maxtrans.c'] ;
 if (details)
     fprintf ('%s\n', s) ;

BTF/Makefile

@@ -2,7 +2,7 @@
 # BTF Makefile
 #------------------------------------------------------------------------------
 
-VERSION = 1.2.0
+VERSION = 1.2.1
 
 default: library
 

CAMD/Demo/camd_demo.out

@@ -1,7 +1,7 @@
-CAMD version 2.4, date: July 31, 2013
+CAMD version 2.4, date: Oct 10, 2014
 CAMD demo, with the 24-by-24 Harwell/Boeing matrix, can_24:
 
-camd version 2.4, July 31, 2013:  approximate minimum degree ordering:
+camd version 2.4, Oct 10, 2014:  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.0, July 31, 2013, results:
+CAMD version 2.4.1, Oct 10, 2014, results:
     status: OK
     n, dimension of A:                                  24
     nz, number of nonzeros in A:                        160

CAMD/Demo/camd_demo2.out

@@ -1,7 +1,7 @@
 CAMD demo, with a jumbled version of the 24-by-24
 Harwell/Boeing matrix, can_24:
 
-camd version 2.4, July 31, 2013:  approximate minimum degree ordering:
+camd version 2.4, Oct 10, 2014:  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 camd_order:
 23:  . . . . . . X . . . . X X . . . . . . . . . . X
 return value from camd_order: 1 (should be 1)
 
-CAMD version 2.4.0, July 31, 2013, results:
+CAMD version 2.4.1, Oct 10, 2014, results:
     status: OK, but jumbled
     n, dimension of A:                                  24
     nz, number of nonzeros in A:                        102

CAMD/Demo/camd_l_demo.out

@@ -1,7 +1,7 @@
-CAMD version 2.4, date: July 31, 2013
+CAMD version 2.4, date: Oct 10, 2014
 CAMD demo, with the 24-by-24 Harwell/Boeing matrix, can_24:
 
-camd version 2.4, July 31, 2013:  approximate minimum degree ordering:
+camd version 2.4, Oct 10, 2014:  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_l_order: 0 (should be 0)
 
-CAMD version 2.4.0, July 31, 2013, results:
+CAMD version 2.4.1, Oct 10, 2014, results:
     status: OK
     n, dimension of A:                                  24
     nz, number of nonzeros in A:                        160

CAMD/Doc/CAMD_UserGuide.tex

@@ -34,7 +34,7 @@
 This work was supported by the EPSRC under grant GR/R46441.
 }}
 
-\date{VERSION 2.4.0, July 31, 2013}
+\date{VERSION 2.4.1, Oct 10, 2014}
 \maketitle
 
 %------------------------------------------------------------------------------

CAMD/Doc/ChangeLog

@@ -1,3 +1,7 @@
+Oct 10, 2014: version 2.4.1
+
+    modified MATLAB/camd_make.m.  No change to C code except version number.
+
 July 31, 2013: version 2.4.0
 
     * changed malloc and printf pointers to use SuiteSparse_config

CAMD/Include/camd.h

@@ -393,11 +393,11 @@ void camd_l_info     (double Info [ ]) ;
  *      #endif
  */
 
-#define CAMD_DATE "July 31, 2013"
+#define CAMD_DATE "Oct 10, 2014"
 #define CAMD_VERSION_CODE(main,sub) ((main) * 1000 + (sub))
 #define CAMD_MAIN_VERSION 2
 #define CAMD_SUB_VERSION 4
-#define CAMD_SUBSUB_VERSION 0
+#define CAMD_SUBSUB_VERSION 1
 #define CAMD_VERSION CAMD_VERSION_CODE(CAMD_MAIN_VERSION,CAMD_SUB_VERSION)
 
 #ifdef __cplusplus

CAMD/MATLAB/camd_make.m

@@ -15,6 +15,11 @@
     d = '-largeArrayDims' ;
 end
 
+% MATLAB 8.3.0 now has a -silent option to keep 'mex' from burbling too much
+if (~verLessThan ('matlab', '8.3.0'))
+    d = ['-silent ' d] ;
+end
+
 i = sprintf ('-I../Include -I../../SuiteSparse_config') ;
 cmd = sprintf ('mex -O %s -DDLONG -output camd %s camd_mex.c %s', d, i, ...
     '../../SuiteSparse_config/SuiteSparse_config.c') ;

CAMD/Makefile

@@ -2,7 +2,7 @@
 # CAMD Makefile
 #------------------------------------------------------------------------------
 
-VERSION = 2.4.0
+VERSION = 2.4.1
 
 default: all
 

CCOLAMD/Doc/ChangeLog

@@ -1,3 +1,7 @@
+Oct 10, 2014: version 2.9.1
+
+    modified MATLAB/ccolamd_make.m.  No change to C code except version number.
+
 July 31, 2013: version 2.9.0
 
     * changed malloc and printf pointers to use SuiteSparse_config

CCOLAMD/Include/ccolamd.h

@@ -42,11 +42,11 @@ extern "C" {
  *	#endif
  */
 
-#define CCOLAMD_DATE "July 31, 2013"
+#define CCOLAMD_DATE "Oct 10, 2014"
 #define CCOLAMD_VERSION_CODE(main,sub) ((main) * 1000 + (sub))
 #define CCOLAMD_MAIN_VERSION 2
 #define CCOLAMD_SUB_VERSION 9
-#define CCOLAMD_SUBSUB_VERSION 0
+#define CCOLAMD_SUBSUB_VERSION 1
 #define CCOLAMD_VERSION \
 	CCOLAMD_VERSION_CODE(CCOLAMD_MAIN_VERSION,CCOLAMD_SUB_VERSION)
 

CCOLAMD/MATLAB/ccolamd_make.m

@@ -14,6 +14,12 @@
 if (~isempty (strfind (computer, '64')))
     d = '-largeArrayDims' ;
 end
+
+% MATLAB 8.3.0 now has a -silent option to keep 'mex' from burbling too much
+if (~verLessThan ('matlab', '8.3.0'))
+    d = ['-silent ' d] ;
+end
+
 src = '../Source/ccolamd.c ../../SuiteSparse_config/SuiteSparse_config.c' ;
 cmd = sprintf ( ...
     'mex -DDLONG -O %s -I../../SuiteSparse_config -I../Include -output ', d) ;

CCOLAMD/Makefile

@@ -2,7 +2,7 @@
 # CCOLAMD Makefile
 #------------------------------------------------------------------------------
 
-VERSION = 2.9.0
+VERSION = 2.9.1
 
 default: all
 

CHOLMOD/Check/cholmod_check.c

@@ -1504,7 +1504,7 @@ static int check_factor
 	count, precise, init_print, ilast, lnz, head, tail, jprev, plast,
 	jnext, examine_super, nsuper, s, k1, k2, psi, psend, psx, nsrow, nscol,
 	ps2, psxend, ssize, xsize, maxcsize, maxesize, nsrow2, jj, ii, xtype ;
-    Int for_cholesky ;
+    Int check_Lpx ;
     const char *type = "factor" ;
 
     /* ---------------------------------------------------------------------- */
@@ -1891,8 +1891,11 @@ static int check_factor
 		ERR ("invalid: L->pi invalid") ;
 	    }
 
-            for_cholesky = (Lpx [0] != 123456) ;
-	    if (for_cholesky && (Lpx [0] != 0 || MAX (1, Lpx[nsuper]) != xsize))
+            /* If Lpx [0] is 123456, then supernodes are present but
+               Lpx [0...nsuper] is not defined, so don't check it.  This is
+               used in the non-GPU accelerated SPQR */
+            check_Lpx = (Lpx [0] != 123456) ;
+	    if (check_Lpx && (Lpx [0] != 0 || MAX (1, Lpx[nsuper]) != xsize))
 	    {
 		ERR ("invalid: L->px invalid") ;
 	    }
@@ -1909,7 +1912,7 @@ static int check_factor
 		nsrow2 = nsrow - nscol ;
 		ps2 = psi + nscol ;
 
-                if (for_cholesky)
+                if (check_Lpx)
                 {
                     psx = Lpx [s] ;
                     psxend = Lpx [s+1] ;
@@ -1922,14 +1925,14 @@ static int check_factor
 		P4 ("to "ID". ", k2-1) ;
 		P4 ("nz in first col: "ID".\n", nsrow) ;
 
-                if (for_cholesky)
+                if (check_Lpx)
                 {
                     P4 ("  values start "ID", ", psx) ;
                     P4 ("end "ID"\n", psxend) ;
                 }
 
 		if (k1 > k2 || k1 < 0 || k2 > n || nsrow < nscol || nsrow2 < 0
-                    || (for_cholesky && psxend - psx != nsrow * nscol))
+                    || (check_Lpx && psxend - psx != nsrow * nscol))
 		{
 		    ERR ("invalid supernode") ;
 		}

CHOLMOD/Cholesky/cholmod_analyze.c

@@ -399,14 +399,14 @@ int CHOLMOD(analyze_ordering)
 /* === cholmod_analyze_p2 =================================================== */
 /* ========================================================================== */
 
-/* Ordering and analysis for sparse Cholesky or sparse QR.  CHOLMOD itself
- * always uses for_cholesky = TRUE.  The for_cholesky = FALSE option is
- * for SuiteSparseQR only. */
+/* Ordering and analysis for sparse Cholesky or sparse QR.  */
 
 cholmod_factor *CHOLMOD(analyze_p2)
 (
     /* ---- input ---- */
-    int for_cholesky,   /* if TRUE, then analyze for Cholesky; else for QR */
+    int for_whom,       /* FOR_SPQR     (0): for SPQR but not GPU-accelerated
+                           FOR_CHOLESKY (1): for Cholesky (GPU or not)
+                           FOR_SPQRGPU  (2): for SPQR with GPU acceleration */
     cholmod_sparse *A,	/* matrix to order and analyze */
     Int *UserPerm,	/* user-provided permutation, size A->nrow */
     Int *fset,		/* subset of 0:(A->ncol)-1 */
@@ -925,7 +925,7 @@ cholmod_factor *CHOLMOD(analyze_p2)
 		&A1, &A2, &S, &F, Common) ;
 
 	/* workspace: Flag (nrow), Head (nrow), Iwork (5*nrow) */
-	CHOLMOD(super_symbolic2) (for_cholesky, S, F, Lparent, L, Common) ;
+	CHOLMOD(super_symbolic2) (for_whom, S, F, Lparent, L, Common) ;
 	PRINT1 (("status %d\n", Common->status)) ;
 
 	CHOLMOD(free_sparse) (&A1, Common) ;