v4.0.1

DrTimothyAldenDavis · Oct 19, 2019 · b0ad3c5 · b0ad3c5
1 parent 430586d
commit b0ad3c5
Show file tree

Hide file tree

Showing 111 changed files with 842 additions and 865 deletions.
diff --git a/AMD/Doc/AMD_UserGuide.pdf b/AMD/Doc/AMD_UserGuide.pdf
diff --git a/AMD/Doc/AMD_UserGuide.tex b/AMD/Doc/AMD_UserGuide.tex
@@ -32,7 +32,7 @@
 This work was supported by the EPSRC under grant GR/R46441.
 }}
 
-\date{VERSION 2.3.0, Jun 1, 2012}
+\date{VERSION 2.3.1, Jun 20, 2012}
 \maketitle
 
 %------------------------------------------------------------------------------

diff --git a/AMD/Doc/ChangeLog b/AMD/Doc/ChangeLog
@@ -1,3 +1,7 @@
+Jun 20, 2012: verison 2.3.1
+
+    * minor update for Windows (removed filesep)
+
 Jun 1, 2012: version 2.3.0
 
     * changed from UFconfig to SuiteSparse_config

diff --git a/AMD/Include/amd.h b/AMD/Include/amd.h
@@ -397,11 +397,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 "Jun 1, 2012"
+#define AMD_DATE "Jun 20, 2012"
 #define AMD_VERSION_CODE(main,sub) ((main) * 1000 + (sub))
 #define AMD_MAIN_VERSION 2
 #define AMD_SUB_VERSION 3
-#define AMD_SUBSUB_VERSION 0
+#define AMD_SUBSUB_VERSION 1
 #define AMD_VERSION AMD_VERSION_CODE(AMD_MAIN_VERSION,AMD_SUB_VERSION)
 
 #ifdef __cplusplus

diff --git a/AMD/MATLAB/amd_make.m b/AMD/MATLAB/amd_make.m
@@ -15,14 +15,13 @@
     d = '-largeArrayDims' ;
 end
 
-i = sprintf ('-I..%sInclude -I..%s..%sSuiteSparse_config', ...
-    filesep, filesep, filesep) ;
+i = sprintf ('-I../Include -I../../SuiteSparse_config') ;
 cmd = sprintf ('mex -O %s -DDLONG -output amd2 %s amd_mex.c', d, i) ;
 files = {'amd_order', 'amd_dump', 'amd_postorder', 'amd_post_tree', ...
     'amd_aat', 'amd_2', 'amd_1', 'amd_defaults', 'amd_control', ...
     'amd_info', 'amd_valid', 'amd_global', 'amd_preprocess' } ;
 for i = 1 : length (files)
-    cmd = sprintf ('%s ..%sSource%s%s.c', cmd, filesep, filesep, files {i}) ;
+    cmd = sprintf ('%s ../Source/%s.c', cmd, files {i}) ;
 end
 if (details)
     fprintf ('%s\n', cmd) ;

diff --git a/AMD/Makefile b/AMD/Makefile
@@ -2,7 +2,7 @@
 # AMD Makefile (for GNU Make or original make)
 #------------------------------------------------------------------------------
 
-VERSION = 2.3.0
+VERSION = 2.3.1
 
 default: all
 

diff --git a/CAMD/Doc/CAMD_UserGuide.pdf b/CAMD/Doc/CAMD_UserGuide.pdf
diff --git a/CAMD/Doc/CAMD_UserGuide.tex b/CAMD/Doc/CAMD_UserGuide.tex
@@ -34,7 +34,7 @@
 This work was supported by the EPSRC under grant GR/R46441.
 }}
 
-\date{VERSION 2.3.0, Jun 1, 2012}
+\date{VERSION 2.3.1, Jun 20, 2012}
 \maketitle
 
 %------------------------------------------------------------------------------

diff --git a/CAMD/Doc/ChangeLog b/CAMD/Doc/ChangeLog
@@ -1,3 +1,7 @@
+Jun 20, 2012: verison 2.3.1
+
+    * minor update for Windows (removed filesep)
+
 Jun 1, 2012: version 2.3.0
 
     * changed from UFconfig to SuiteSparse_config

diff --git a/CAMD/Include/camd.h b/CAMD/Include/camd.h
@@ -404,11 +404,11 @@ void camd_l_info     (double Info [ ]) ;
  *      #endif
  */
 
-#define CAMD_DATE "Jun 1, 2012"
+#define CAMD_DATE "Jun 20, 2012"
 #define CAMD_VERSION_CODE(main,sub) ((main) * 1000 + (sub))
 #define CAMD_MAIN_VERSION 2
 #define CAMD_SUB_VERSION 3
-#define CAMD_SUBSUB_VERSION 0
+#define CAMD_SUBSUB_VERSION 1
 #define CAMD_VERSION CAMD_VERSION_CODE(CAMD_MAIN_VERSION,CAMD_SUB_VERSION)
 
 #ifdef __cplusplus

diff --git a/CAMD/MATLAB/camd_make.m b/CAMD/MATLAB/camd_make.m
@@ -15,14 +15,13 @@
     d = '-largeArrayDims' ;
 end
 
-i = sprintf ('-I..%sInclude -I..%s..%sSuiteSparse_config', ...
-    filesep, filesep, filesep) ;
+i = sprintf ('-I../Include -I../../SuiteSparse_config') ;
 cmd = sprintf ('mex -O %s -DDLONG -output camd %s camd_mex.c', d, i) ;
 files = {'camd_order', 'camd_dump', 'camd_postorder', ...
     'camd_aat', 'camd_2', 'camd_1', 'camd_defaults', 'camd_control', ...
     'camd_info', 'camd_valid', 'camd_global', 'camd_preprocess' } ;
 for i = 1 : length (files)
-    cmd = sprintf ('%s ..%sSource%s%s.c', cmd, filesep, filesep, files {i}) ;
+    cmd = sprintf ('%s ../Source/%s.c', cmd, files {i}) ;
 end
 if (details)
     fprintf ('%s\n', cmd) ;

diff --git a/CAMD/Makefile b/CAMD/Makefile
@@ -2,7 +2,7 @@
 # CAMD Makefile
 #------------------------------------------------------------------------------
 
-VERSION = 2.3.0
+VERSION = 2.3.1
 
 default: demos
 

diff --git a/CHOLMOD/Core/cholmod_common.c b/CHOLMOD/Core/cholmod_common.c
@@ -201,7 +201,7 @@ int CHOLMOD(start)
     Common->cudaStreamPotrf [1] = NULL ;
     Common->cudaStreamPotrf [2] = NULL ;
     Common->cublasEventPotrf [0] = NULL ;
-    Common->cublasEventPotrf [2] = NULL ;
+    Common->cublasEventPotrf [1] = NULL ;
     Common->HostPinnedMemory = NULL ;
     Common->devPotrfWork = NULL ;
     Common->devSyrkGemmPtrLx = NULL ;

diff --git a/CHOLMOD/Demo/Makefile b/CHOLMOD/Demo/Makefile
@@ -11,17 +11,23 @@ include ../../SuiteSparse_config/SuiteSparse_config.mk
 
 #-------------------------------------------------------------------------------
 # the optional Partition module requires METIS, CAMD, and CCOLAMD
+I_WITH_PARTITION = 
 LIB_WITH_PARTITION =
-CONFIG =
+CONFIG = -DNPARTITION
+# check if METIS is requested and available
 ifeq (,$(findstring -DNPARTITION, $(CHOLMOD_CONFIG)))
-    # check if METIS is available
-    ifeq (../../metis-4.0, $(wildcard ../../metis-4.0))
-        LIB_WITH_PARTITION = $(METIS) ../../CCOLAMD/Lib/libccolamd.a \
-            ../../CAMD/Lib/libcamd.a
-    else
-        # METIS is not available, but CHOLMOD_CONFIG does not specify
-        # -DNPARTITION.  Add it here so we can still compile CHOLMOD.
-        CONFIG = -DNPARTITION
+    # METIS is requested.  See if it is available
+    ifeq ($(METIS_PATH), $(wildcard $(METIS_PATH)))
+        ifeq (../../CAMD, $(wildcard ../../CAMD))
+            ifeq (../../CCOLAMD, $(wildcard ../../CCOLAMD))
+                # METIS, CAMD, and CCOLAMD are available
+                LIB_WITH_PARTITION = $(METIS) ../../CCOLAMD/Lib/libccolamd.a \
+                    ../../CAMD/Lib/libcamd.a
+                I_WITH_PARTITION = -I$(METIS_PATH)/Lib \
+                    -I../../CCOLAMD/Include -I../../CAMD/Include
+                CONFIG =
+            endif
+        endif
     endif
 endif
 #-------------------------------------------------------------------------------
@@ -74,10 +80,11 @@ library:
 	( cd ../Lib ; $(MAKE) )
 	( cd ../../AMD ; $(MAKE) library )
 	( cd ../../COLAMD ; $(MAKE) library )
-ifneq (,$(findstring -DNPARTITION, $(CHOLMOD_CONFIG)))
+ifneq (,$(findstring -DNPARTITION, $(CONFIG)))
 else
 	( cd ../../CCOLAMD ; $(MAKE) library )
 	( cd ../../CAMD ; $(MAKE) library )
+	( cd $(METIS_PATH) && $(MAKE) )
 endif
 #-------------------------------------------------------------------------------
 

diff --git a/CHOLMOD/Doc/ChangeLog b/CHOLMOD/Doc/ChangeLog
@@ -1,3 +1,9 @@
+Jun 20, 2012: verison 2.0.1
+
+    * minor update for Windows (removed filesep, compiler port fix)
+    * minor changes to format of User Guide
+    * bug fix for GPU code (singular case)
+
 Jun 1, 2012: version 2.0.0
 
     * changed from UFconfig to SuiteSparse_config

diff --git a/CHOLMOD/Doc/UserGuide.pdf b/CHOLMOD/Doc/UserGuide.pdf