v5.8.1

DrTimothyAldenDavis · Jul 14, 2020 · 1869379 · 1869379
1 parent 616e501
commit 1869379
Show file tree

Hide file tree

Showing 19 changed files with 46 additions and 21 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+July 14, 2020, SuiteSparse 5.8.1
+
+    * SLIP_LU v1.0.2: resolved issue #51
+    * GraphBLAS v3.3.3: bug fix (GraphBLAS issue #13)
+
 July 2, 2020, SuiteSparse 5.8.0
 
     * SLIP_LU v1.0.1 added: for solving Ax=b exactly.  Requires

diff --git a/GraphBLAS/CMakeLists.txt b/GraphBLAS/CMakeLists.txt
@@ -59,10 +59,10 @@ endif ( )
 set ( CMAKE_MACOSX_RPATH TRUE )
 
 # version of SuiteSparse:GraphBLAS
-set ( GraphBLAS_DATE "July 3, 2020" )
+set ( GraphBLAS_DATE "July 14, 2020" )
 set ( GraphBLAS_VERSION_MAJOR 3 )
 set ( GraphBLAS_VERSION_MINOR 3 )
-set ( GraphBLAS_VERSION_SUB   2 )
+set ( GraphBLAS_VERSION_SUB   3 )
 
 # GraphBLAS C API Specification version, at graphblas.org
 set ( GraphBLAS_API_DATE "Sept 25, 2019" )

diff --git a/GraphBLAS/Doc/ChangeLog b/GraphBLAS/Doc/ChangeLog
@@ -5,11 +5,17 @@ Version 4.0.0, FUTURE, 2020 (this list is tentative):
     * GrB_*_nvals: will no longer guarantee completion; use GrB_wait(&object)
         or non-polymorphic GrB_*_wait (&object) instead
     * GrB_error: will have two inputs: a string (char **) and an object
-    * V4.0.0 will otherwise be identical to V3.3.0.
+
+Version 3.3.3, July 14, 2020
+
+    * (20) bug fix: w<mask>=A*u with mask non-empty and u empty (issue #13).
+        affects mxm (A*B when B is a vector), vxm, and mxv.
+    * GraphBLAS v3.3.3 released as part of SuiteSparse v5.8.1
 
 Version 3.3.2, July 3, 2020
 
     * minor changes to build system
+    * GraphBLAS v3.3.2 released as part of SuiteSparse v5.8.0
 
 Version 3.3.1, June 30, 2020
 

diff --git a/GraphBLAS/Doc/GraphBLAS_UserGuide.pdf b/GraphBLAS/Doc/GraphBLAS_UserGuide.pdf
diff --git a/GraphBLAS/Doc/GraphBLAS_version.tex b/GraphBLAS/Doc/GraphBLAS_version.tex
@@ -1,5 +1,5 @@
 % version of SuiteSparse:GraphBLAS
 \date{VERSION
-3.3.2,
-July 3, 2020}
+3.3.3,
+July 14, 2020}
 
diff --git a/GraphBLAS/Include/GraphBLAS.h b/GraphBLAS/Include/GraphBLAS.h
@@ -112,10 +112,10 @@
 
 // The version of this implementation, and the GraphBLAS API version:
 #define GxB_IMPLEMENTATION_NAME "SuiteSparse:GraphBLAS"
-#define GxB_IMPLEMENTATION_DATE "July 3, 2020"
+#define GxB_IMPLEMENTATION_DATE "July 14, 2020"
 #define GxB_IMPLEMENTATION_MAJOR 3
 #define GxB_IMPLEMENTATION_MINOR 3
-#define GxB_IMPLEMENTATION_SUB   2
+#define GxB_IMPLEMENTATION_SUB   3
 #define GxB_SPEC_DATE "Sept 25, 2019"
 #define GxB_SPEC_MAJOR 1
 #define GxB_SPEC_MINOR 3

diff --git a/GraphBLAS/README.md b/GraphBLAS/README.md
@@ -3,7 +3,7 @@
 SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2020, All Rights Reserved.
 http://suitesparse.com   See GraphBLAS/Doc/License.txt for license.
 
-VERSION 3.3.2, July 3, 2020
+VERSION 3.3.3, July 14, 2020
 
 SuiteSparse:GraphBLAS is an full implementation of the GraphBLAS standard,
 which defines a set of sparse matrix operations on an extended algebra of

diff --git a/GraphBLAS/Source/GB_AxB_saxpy3_symbolic.c b/GraphBLAS/Source/GB_AxB_saxpy3_symbolic.c
@@ -118,6 +118,10 @@ void GB_AxB_saxpy3_symbolic
             //------------------------------------------------------------------
 
             int64_t kk = TaskList [taskid].vector ;
+            int64_t bjnz = Bp [kk+1] - Bp [kk] ;
+            // no work to do if B(:,j) is empty
+            if (bjnz == 0) continue ;
+
             // partition M(:,j)
             GB_GET_M_j ;        // get M(:,j)
             int team_size = TaskList [taskid].team_size ;
@@ -164,6 +168,7 @@ void GB_AxB_saxpy3_symbolic
                 int64_t *GB_RESTRICT
                     Hf = (int64_t *GB_RESTRICT) TaskList [taskid].Hf ;
                 int64_t hash_bits = (hash_size-1) ;
+                ASSERT (hash_size >= mjnz) ;
                 for (int64_t pM = mystart ; pM < myend ; pM++) // scan my M(:,j)
                 {
                     GB_GET_M_ij ;                   // get M(i,j)
@@ -553,6 +558,9 @@ void GB_AxB_saxpy3_symbolic
         {
             int64_t kk = TaskList [taskid].vector ;
             ASSERT (kk >= 0 && kk < B->nvec) ;
+            int64_t bjnz = Bp [kk+1] - Bp [kk] ;
+            // no work to do if B(:,j) is empty
+            if (bjnz == 0) continue ;
             int64_t hash_size = TaskList [taskid].hsize ;
             bool use_Gustavson = (hash_size == cvlen) ;
             int master = TaskList [taskid].master ;

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 SuiteSparse:  A Suite of Sparse matrix packages at http://suitesparse.com
 -----------------------------------------------------------------------------
 
-July 3, 2020.  SuiteSparse VERSION 5.8.0
+July 14, 2020.  SuiteSparse VERSION 5.8.1
 
     Now includes GraphBLAS, SLIP_LU, and a new interface to the SuiteSparse
     Matrix Collection (ssget), via MATLAB and a Java GUI, to

diff --git a/SLIP_LU/Demo/Makefile b/SLIP_LU/Demo/Makefile
@@ -13,7 +13,7 @@ default: all
 include ../../SuiteSparse_config/SuiteSparse_config.mk
 
 # uncomment for extra error checking:
-CFLAGS += -Wall -Wextra -Wpedantic -Werror
+# CFLAGS += -Wall -Wextra -Wpedantic -Werror
 
 # CF = $(CFLAGS) $(CPPFLAGS) $(TARGET_ARCH) -O
 I = -I../Include -I../Source -I../../SuiteSparse_config -I../../COLAMD/Include -I../../AMD/Include

diff --git a/SLIP_LU/Doc/ChangeLog b/SLIP_LU/Doc/ChangeLog
@@ -1,3 +1,9 @@
+July 14, 2020: version 1.0.2
+
+    * resolved issue #51, on SuiteSparse github:
+        removed pedantic CFLAGS in Lib/Makefile and Demo/Makefile,
+        added explicit typecast to slip_cast_double_to_int64
+
 July 3, 2020: version 1.0.1
 
     * minor change to MATLAB install process

diff --git a/SLIP_LU/Doc/SLIP_LU_UserGuide.pdf b/SLIP_LU/Doc/SLIP_LU_UserGuide.pdf
diff --git a/SLIP_LU/Doc/SLIP_LU_UserGuide.tex b/SLIP_LU/Doc/SLIP_LU_UserGuide.tex
@@ -35,7 +35,7 @@
 \textbf{User Guide for SLIP LU, A Sparse Left-Looking Integer
 Preserving LU Factorization} \\
 \vspace{5mm}
-Version 1.0.1, July 2020 % VERSION
+Version 1.0.2, July 14, 2020 % VERSION
 \vspace{20mm}
 
 Christopher Lourenco, Jinhao Chen, \\ Erick Moreno-Centeno, Timothy A. Davis \\

diff --git a/SLIP_LU/Include/SLIP_LU.h b/SLIP_LU/Include/SLIP_LU.h
@@ -159,10 +159,10 @@
 //------------------------------------------------------------------------------
 
 // Current version of the code
-#define SLIP_LU_VERSION "1.0.1"
+#define SLIP_LU_VERSION "1.0.2"
 #define SLIP_LU_VERSION_MAJOR 1
 #define SLIP_LU_VERSION_MINOR 0
-#define SLIP_LU_VERSION_SUB   1
+#define SLIP_LU_VERSION_SUB   2
 
 //------------------------------------------------------------------------------
 // Error codes

diff --git a/SLIP_LU/Lib/Makefile b/SLIP_LU/Lib/Makefile
@@ -9,15 +9,15 @@
 #       cd ../Demo ; make
 
 LIBRARY = libsliplu
-VERSION = 1.0.1
+VERSION = 1.0.2
 SO_VERSION = 1
 
 default: library
 
 include ../../SuiteSparse_config/SuiteSparse_config.mk
 
 # uncomment for extra error checking:
-CFLAGS += -Wall -Wextra -Wpedantic -Werror
+# CFLAGS += -Wall -Wextra -Wpedantic -Werror
 
 # SLIP_LU depends on SuiteSparse_config, AMD, COLAMD, M, GMP, and MPFR
 LDLIBS += -lsuitesparseconfig -lamd -lcolamd -lm -lgmp -lmpfr

diff --git a/SLIP_LU/Source/slip_internal.h b/SLIP_LU/Source/slip_internal.h
@@ -660,11 +660,11 @@ static inline int64_t slip_cast_double_to_int64 (double x)
     {
         return (0) ;
     }
-    else if (x > INT64_MAX)
+    else if (x >= (double) INT64_MAX)
     {
         return (INT64_MAX) ;
     }
-    else if (x < INT64_MIN)
+    else if (x <= (double) INT64_MIN)
     {
         return (INT64_MIN) ;
     }

diff --git a/SuiteSparse_config/Makefile b/SuiteSparse_config/Makefile
@@ -7,7 +7,7 @@ export SUITESPARSE
 
 # version of SuiteSparse_config is also version of SuiteSparse meta-package
 LIBRARY = libsuitesparseconfig
-VERSION = 5.8.0
+VERSION = 5.8.1
 SO_VERSION = 5
 
 default: library

diff --git a/SuiteSparse_config/SuiteSparse_config.h b/SuiteSparse_config/SuiteSparse_config.h
@@ -202,11 +202,11 @@ int SuiteSparse_version     /* returns SUITESPARSE_VERSION */
 */
 #define SUITESPARSE_HAS_VERSION_FUNCTION
 
-#define SUITESPARSE_DATE "July 2, 2020"
+#define SUITESPARSE_DATE "July 14, 2020"
 #define SUITESPARSE_VER_CODE(main,sub) ((main) * 1000 + (sub))
 #define SUITESPARSE_MAIN_VERSION 5
 #define SUITESPARSE_SUB_VERSION 8
-#define SUITESPARSE_SUBSUB_VERSION 0
+#define SUITESPARSE_SUBSUB_VERSION 1
 #define SUITESPARSE_VERSION \
     SUITESPARSE_VER_CODE(SUITESPARSE_MAIN_VERSION,SUITESPARSE_SUB_VERSION)
 

diff --git a/SuiteSparse_config/SuiteSparse_config.mk b/SuiteSparse_config/SuiteSparse_config.mk
@@ -7,7 +7,7 @@
 # and GraphBLAS.  The configuration settings for GraphBLAS are determined by
 # GraphBLAS/CMakeLists.txt
 
-SUITESPARSE_VERSION = 5.8.0
+SUITESPARSE_VERSION = 5.8.1
 
     #---------------------------------------------------------------------------
     # determine what system we are on