v4.4.2

DrTimothyAldenDavis · Oct 19, 2019 · b94f119 · b94f119
1 parent 5bd9288
commit b94f119
Show file tree

Hide file tree

Showing 14 changed files with 30,988 additions and 15 deletions.
diff --git a/CHOLMOD/Doc/ChangeLog b/CHOLMOD/Doc/ChangeLog
@@ -1,3 +1,9 @@
+Jan 7, 2017: version 3.0.4
+
+    * serious bug fix to supernodal factorization.  The bug was introduced in
+	CHOLMOD v3.0.0 when the GPU acceleration was given a major update.
+	The bug can cause a segfault, whether or not the GPU is used.
+
 Oct 23, 2014: version 3.0.3
 
     * minor fix for CHOLMOD/Supernodal/cholmod_super_symbolic.c (was using a

diff --git a/CHOLMOD/Doc/UserGuide.pdf b/CHOLMOD/Doc/UserGuide.pdf
diff --git a/CHOLMOD/Doc/UserGuide.tex b/CHOLMOD/Doc/UserGuide.tex
@@ -21,7 +21,7 @@
 \title{User Guide for CHOLMOD: a sparse Cholesky factorization and
 modification package}
 
-\date{VERSION 3.0.3, Oct 23, 2014}
+\date{VERSION 3.0.4, Jan 7, 2015}
 \maketitle
 
 %-------------------------------------------------------------------------------

diff --git a/CHOLMOD/Include/cholmod_core.h b/CHOLMOD/Include/cholmod_core.h
@@ -246,11 +246,11 @@
 
 #define CHOLMOD_HAS_VERSION_FUNCTION
 
-#define CHOLMOD_DATE "Oct 23, 2014"
+#define CHOLMOD_DATE "Jan 7, 2015"
 #define CHOLMOD_VER_CODE(main,sub) ((main) * 1000 + (sub))
 #define CHOLMOD_MAIN_VERSION 3
 #define CHOLMOD_SUB_VERSION 0
-#define CHOLMOD_SUBSUB_VERSION 3
+#define CHOLMOD_SUBSUB_VERSION 4
 #define CHOLMOD_VERSION \
     CHOLMOD_VER_CODE(CHOLMOD_MAIN_VERSION,CHOLMOD_SUB_VERSION)
 

diff --git a/CHOLMOD/Supernodal/cholmod_super_numeric.c b/CHOLMOD/Supernodal/cholmod_super_numeric.c
@@ -45,7 +45,7 @@
  * diagonal entry is set to zero (this includes columns to the left of L->minor
  * in the same supernode), as are all subsequent supernodes.
  *
- * workspace: Flag (nrow), Head (nrow+1), Iwork (2*nrow + 4*nsuper).
+ * workspace: Flag (nrow), Head (nrow+1), Iwork (2*nrow + 5*nsuper).
  *	Allocates temporary space of size L->maxcsize * sizeof(double)
  *	(twice that for the complex/zomplex case).
  *
@@ -188,9 +188,9 @@ int CHOLMOD(super_numeric)
     PRINT1 (("nsuper "ID" maxcsize %g\n", nsuper, (double) maxcsize)) ;
     ASSERT (nsuper >= 0 && maxcsize > 0) ;
 
-    /* w = 2*n + 4*nsuper */
+    /* w = 2*n + 5*nsuper */
     w = CHOLMOD(mult_size_t) (n, 2, &ok) ;
-    t = CHOLMOD(mult_size_t) (nsuper, 4, &ok) ;
+    t = CHOLMOD(mult_size_t) (nsuper, 5, &ok) ;
     w = CHOLMOD(add_size_t) (w, t, &ok) ;
     if (!ok)
     {

diff --git a/CHOLMOD/Supernodal/t_cholmod_super_numeric.c b/CHOLMOD/Supernodal/t_cholmod_super_numeric.c
@@ -154,8 +154,11 @@ static int TEMPLATE (cholmod_super_numeric)
     zero [0] = 0. ;     /* BETA for *syrk, *herk, and *gemm */
     zero [1] = 0. ;
 
-    /* ensure there is sufficient integer workspace */
-    CHOLMOD(allocate_work)(0, 2*n+5*nsuper, 0, Common);
+    /* Iwork must be of size 2n + 5*nsuper, allocated in the caller,
+     * cholmod_super_numeric.  The memory cannot be allocated here because the
+     * cholmod_super_numeric initializes SuperMap, and cholmod_allocate_work
+     * does not preserve existing workspace if the space needs to be increase
+     * in size. */
 
     /* allocate integer workspace */
     Iwork = Common->Iwork ;

diff --git a/CHOLMOD/Tcov/Makefile b/CHOLMOD/Tcov/Makefile
@@ -506,6 +506,9 @@ go: zdemo ldemo cmread clread cm cl
 	$(V) ./cm    < Matrix/c30lo                 > tmp/c30lo.out
 	$(V) ./cl    < Matrix/c30lo                 > tmp/l_c30lo.out
 	- $(COVER)
+	$(V) ./cm    < Matrix/C9840                 > tmp/C9840.out
+	$(V) ./cl    < Matrix/C9840                 > tmp/l_C9840.out
+	- $(COVER)
 	$(V) ./cm -m < Matrix/c30up                 > tmp/c30up.out
 	$(V) ./cl -m < Matrix/c30up                 > tmp/l_c30up.out
 	$(V) ./cm    < Matrix/pi                    > tmp/pi.out