v4.2.1

CHOLMOD/Cholesky/cholmod_solve.c

@@ -1053,7 +1053,7 @@ int CHOLMOD(solve2)         /* returns TRUE on success, FALSE on failure */
     cholmod_dense *Y = NULL, *X = NULL ;
     cholmod_sparse *C, *Yset, C_header, Yset_header, *Xset ;
     Int *Perm = NULL, *IPerm = NULL ;
-    Int n, nrhs, ncols, ctype, xtype, k1, nr, ytype, k, blen, p, i ;
+    Int n, nrhs, ncols, ctype, xtype, k1, nr, ytype, k, blen, p, i, d, nrow ;
     Int Cp [2], Ysetp [2], *Ci, *Yseti, ysetlen ;
     Int *Bsetp, *Bseti, *Bsetnz, *Xseti, *Xsetp, *Iwork ;
 
@@ -1074,8 +1074,10 @@ int CHOLMOD(solve2)         /* returns TRUE on success, FALSE on failure */
     DEBUG (CHOLMOD(dump_factor) (L, "L", Common)) ;
     DEBUG (CHOLMOD(dump_dense) (B, "B", Common)) ;
     nrhs = B->ncol ;
-    n = L->n ;
-    if (B->d < n || B->nrow != n)
+    n = (Int) L->n ;
+    d = (Int) B->d ;
+    nrow = (Int) B->nrow ;
+    if (d < n || nrow != n)
     {
 	ERROR (CHOLMOD_INVALID, "dimensions of L and B do not match") ;
 	return (FALSE) ;
@@ -1235,8 +1237,8 @@ int CHOLMOD(solve2)         /* returns TRUE on success, FALSE on failure */
 
         /* Xset is n-by-1, nzmax >= n, pattern-only, packed, unsorted */
         Xset = *Xset_Handle ;
-        if (Xset == NULL || Xset->nrow != n || Xset->ncol != 1 ||
-            Xset->nzmax < n || Xset->itype != CHOLMOD_PATTERN)
+        if (Xset == NULL || (Int) Xset->nrow != n || (Int) Xset->ncol != 1 ||
+            (Int) Xset->nzmax < n || Xset->itype != CHOLMOD_PATTERN)
         {
             /* this is done only once, for the 1st call to cholmod_solve */
             CHOLMOD(free_sparse) (Xset_Handle, Common) ;

CHOLMOD/Cholesky/t_cholmod_lsolve.c

@@ -773,7 +773,7 @@ static void LSOLVE (PREFIX,k)
     Int *Li = L->i ;
     Int *Lp = L->p ;
     Int *Lnz = L->nz ;
-    Int i, j, n = L->n, jj, jjiters ;
+    Int n = L->n, jj, jjiters ;
 
     ASSERT (L->xtype == Y->xtype) ; /* L and Y must have the same xtype */
     ASSERT (L->n == Y->ncol) ;	    /* dimensions must match */
@@ -815,7 +815,7 @@ static void LSOLVE (PREFIX,k)
 
         for (jj = 0 ; jj < jjiters ; jj++)
         {
-            j = Yseti ? Yseti [jj] : jj ;
+            Int j = Yseti ? Yseti [jj] : jj ;
 
             /* get the start, end, and length of column j */
             Int p = Lp [j] ;
@@ -838,7 +838,7 @@ static void LSOLVE (PREFIX,k)
             for (p++ ; p < pend ; p++)
             {
                 /* X [Li [p]] -= Lx [p] * y ; */
-                i = Li [p] ;
+                Int i = Li [p] ;
                 MULTSUB (Xx,Xz,i, Lx,Lz,p, yx,yz,0) ;
             }
         }

CHOLMOD/Cholesky/t_cholmod_ltsolve.c

@@ -764,7 +764,7 @@ static void LSOLVE (PREFIX,k)
     Int *Li = L->i ;
     Int *Lp = L->p ;
     Int *Lnz = L->nz ;
-    Int i, j, n = L->n, jj, jjiters ;
+    Int n = L->n, jj, jjiters ;
 
     ASSERT (L->xtype == Y->xtype) ; /* L and Y must have the same xtype */
     ASSERT (L->n == Y->ncol) ;	    /* dimensions must match */
@@ -806,7 +806,7 @@ static void LSOLVE (PREFIX,k)
         for (jj = jjiters-1 ; jj >= 0 ; jj--)
         {
 
-            j = Yseti ? Yseti [jj] : jj ;
+            Int j = Yseti ? Yseti [jj] : jj ;
 
             /* get the start, end, and length of column j */
             Int p = Lp [j] ;
@@ -828,7 +828,7 @@ static void LSOLVE (PREFIX,k)
             for (p++ ; p < pend ; p++)
             {
                 /* y -= conj (Lx [p]) * X [Li [p]] ; */
-                i = Li [p] ;
+                Int i = Li [p] ;
                 MULTSUBCONJ (yx,yz,0, Lx,Lz,p, Xx,Xz,i) ;
             }
 

CHOLMOD/Doc/ChangeLog

@@ -1,3 +1,8 @@
+Apr 25, 2013: version 2.1.2
+
+    * minor update for CHOLMOD/Cholesky/*solve*.c:
+        version 2.1.0 broke the Microsoft Visual C/C++ compiler
+
 Apr 16, 2013: version 2.1.1
 
     * bug fix to Lib/Makefile and Demo/Makefile, to handle -DNCAMD correctly.

CHOLMOD/Doc/UserGuide.tex

@@ -21,7 +21,7 @@
 \title{User Guide for CHOLMOD: a sparse Cholesky factorization and
 modification package}
 
-\date{VERSION 2.1.1, April 16, 2013}
+\date{VERSION 2.1.2, April 25, 2013}
 \maketitle
 
 %-------------------------------------------------------------------------------

CHOLMOD/Include/cholmod_core.h

@@ -246,11 +246,11 @@
 
 #define CHOLMOD_HAS_VERSION_FUNCTION
 
-#define CHOLMOD_DATE "April 16, 2013"
+#define CHOLMOD_DATE "April 25, 2013"
 #define CHOLMOD_VER_CODE(main,sub) ((main) * 1000 + (sub))
 #define CHOLMOD_MAIN_VERSION 2
 #define CHOLMOD_SUB_VERSION 1
-#define CHOLMOD_SUBSUB_VERSION 1
+#define CHOLMOD_SUBSUB_VERSION 2
 #define CHOLMOD_VERSION \
     CHOLMOD_VER_CODE(CHOLMOD_MAIN_VERSION,CHOLMOD_SUB_VERSION)
 

CHOLMOD/Makefile

@@ -2,7 +2,7 @@
 # CHOLMOD Makefile
 #-------------------------------------------------------------------------------
 
-VERSION = 2.1.1
+VERSION = 2.1.2
 
 # Note: If you do not have METIS, or do not wish to use it in CHOLMOD, you must
 # compile CHOLMOD with the -DNPARTITION flag.

MATLAB_Tools/sparseinv/sparseinv.m

@@ -59,7 +59,7 @@
     d = diag (L) ;
     L = tril (L / diag (d), -1) ;
     U = L' ;
-    d = full (d.^2) ;
+    d = d.^2 ;
     D = diag (d) ;
 else
     % Cholesky failed, or wasn't attempted.  Use LU instead.
@@ -71,8 +71,8 @@
     D = diag (d) ;
     U = triu (D \ U, 1) ;
     L = tril (L, -1) ;
-    d = full (d) ;
 end
+d = full (d) ;
 
 % find the symbolic Cholesky of C+C'
 S = spones (P*A*Q) ;

README.txt

@@ -20,7 +20,7 @@ file, and then remove "_Mac" from the *Mac.mk file in that directory.  Then
 continue as the 'QUICK START FOR LINUX' above.
 ================================================================================
 
-April 16, 2013.  SuiteSparse VERSION 4.2.0
+April 25, 2013.  SuiteSparse VERSION 4.2.1
 
     spqr_rank   MATLAB toolbox for rank deficient sparse matrices: null spaces,
                 reliable factorizations, etc.  With Leslie Foster, San Jose

SuiteSparse_config/Makefile

@@ -2,7 +2,7 @@
 # SuiteSparse_config Makefile
 #-------------------------------------------------------------------------------
 
-VERSION = 4.2.0
+VERSION = 4.2.1
 
 default: ccode
 

SuiteSparse_config/SuiteSparse_config.h

@@ -143,20 +143,20 @@ double SuiteSparse_time  /* returns current wall clock time in seconds */
  *
  * SuiteSparse contains the following packages:
  *
- *  SuiteSparse_config version 4.2.0 (version always the same as SuiteSparse)
+ *  SuiteSparse_config version 4.2.1 (version always the same as SuiteSparse)
  *  AMD             version 2.3.1
  *  BTF             version 1.2.0
  *  CAMD            version 2.3.1
  *  CCOLAMD         version 2.8.0
- *  CHOLMOD         version 2.1.1
+ *  CHOLMOD         version 2.1.2
  *  COLAMD          version 2.8.0
  *  CSparse         version 3.1.2
  *  CXSparse        version 3.1.2
  *  KLU             version 1.2.1
  *  LDL             version 2.1.0
  *  RBio            version 2.1.1
  *  SPQR            version 1.3.1 (full name is SuiteSparseQR)
- *  UMFPACK         version 5.6.1
+ *  UMFPACK         version 5.6.2
  *  MATLAB_Tools    various packages & M-files
  *
  * Other package dependencies:
@@ -188,11 +188,11 @@ int SuiteSparse_version     /* returns SUITESPARSE_VERSION */
 */
 #define SUITESPARSE_HAS_VERSION_FUNCTION
 
-#define SUITESPARSE_DATE "April 16, 2013"
+#define SUITESPARSE_DATE "April 25, 2013"
 #define SUITESPARSE_VER_CODE(main,sub) ((main) * 1000 + (sub))
 #define SUITESPARSE_MAIN_VERSION 4
 #define SUITESPARSE_SUB_VERSION 2
-#define SUITESPARSE_SUBSUB_VERSION 0
+#define SUITESPARSE_SUBSUB_VERSION 1
 #define SUITESPARSE_VERSION \
     SUITESPARSE_VER_CODE(SUITESPARSE_MAIN_VERSION,SUITESPARSE_SUB_VERSION)
 

UMFPACK/Demo/Makefile

@@ -218,7 +218,7 @@ umf4_f77wrapper64.o: umf4_f77wrapper.c $(INC)
 	$(C) -DDLONG -c umf4_f77wrapper.c -o umf4_f77wrapper64.o
 
 umf4_f77zwrapper64.o: umf4_f77zwrapper.c $(INC)
-	$(C) -DDLONG -c umf4_f77zwrapper.c -o umf4_f77zwrapper64.o
+	$(C) -DZLONG -c umf4_f77zwrapper.c -o umf4_f77zwrapper64.o
 
 #-------------------------------------------------------------------------------
 # Remove all but the files in the original distribution

UMFPACK/Doc/ChangeLog

@@ -1,3 +1,7 @@
+April 25, 2013: version 5.6.2
+
+    * bug fix in Demo/Makefile for Fortran interface
+
 Jun 20, 2012: verison 5.6.1
 
     * minor update for Windows (removed filesep)

UMFPACK/Doc/QuickStart.tex

@@ -18,7 +18,7 @@
 \author{Timothy A. Davis \\
 [email protected], http://www.suitesparse.com}
 \title{UMFPACK Quick Start Guide}
-\date{VERSION 5.6.1, Jun 20, 2012}
+\date{VERSION 5.6.2, Apr 25, 2013}
 \maketitle
 
 %-------------------------------------------------------------------------------

UMFPACK/Doc/UserGuide.stex

@@ -20,7 +20,7 @@
 \author{Timothy A. Davis \\
 [email protected], http://www.suitesparse.com}
 \title{UMFPACK User Guide}
-\date{VERSION 5.6.1, Jun 20, 2012}
+\date{VERSION 5.6.2, Apr 25, 2013}
 \maketitle
 
 %-------------------------------------------------------------------------------

UMFPACK/Include/umfpack.h

@@ -95,7 +95,7 @@ extern "C" {
 /* Version, copyright, and license */
 /* -------------------------------------------------------------------------- */
 
-#define UMFPACK_VERSION "UMFPACK V5.6.1 (Jun 20, 2012)"
+#define UMFPACK_VERSION "UMFPACK V5.6.2 (Apr 25, 2013)"
 
 #define UMFPACK_COPYRIGHT \
 "UMFPACK:  Copyright (c) 2005-2012 by Timothy A. Davis.  All Rights Reserved.\n"
@@ -161,11 +161,11 @@ extern "C" {
  * above.
  */
 
-#define UMFPACK_DATE "Jun 20, 2012"
+#define UMFPACK_DATE "Apr 25, 2013"
 #define UMFPACK_VER_CODE(main,sub) ((main) * 1000 + (sub))
 #define UMFPACK_MAIN_VERSION 5
 #define UMFPACK_SUB_VERSION 6
-#define UMFPACK_SUBSUB_VERSION 1
+#define UMFPACK_SUBSUB_VERSION 2
 #define UMFPACK_VER UMFPACK_VER_CODE(UMFPACK_MAIN_VERSION,UMFPACK_SUB_VERSION)
 
 /* -------------------------------------------------------------------------- */

UMFPACK/Makefile

@@ -2,7 +2,7 @@
 # UMFPACK Makefile
 #-------------------------------------------------------------------------------
 
-VERSION = 5.6.1
+VERSION = 5.6.2
 
 # UMFPACK requires the AMD package to be in ../AMD