v5.1.0

Author: DrTimothyAldenDavis

ChangeLog

@@ -1,3 +1,9 @@
+Dec 1, 2017: SuiteSparse 5.1.0
+
+    * GraphBLAS 1.1.0
+    * minor update to SPQR Makefile (version remains unchanged;
+        no change to source)
+
 Nov 25, 2017: SuiteSparse 5.0.0
 
     * added GraphBLAS Version 1.0.0

GraphBLAS/CMakeLists.txt

@@ -59,19 +59,28 @@ if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU")
     # cmake 2.8 workaround: gcc needs to be told to do ANSI C11.
     # cmake 3.0 doesn't have this problem.
     set (CMAKE_C_FLAGS  "-std=c11 -lm")
+    if (CMAKE_C_COMPILER_VERSION VERSION_LESS 4.9)
+        message (FATAL_ERROR "gcc version must be at least 4.9")
+    endif ( )
 elseif ("${CMAKE_C_COMPILER_ID}" STREQUAL "Intel")
     # options for icc: also needs -std=c11
     set (CMAKE_C_FLAGS  "-std=c11")
+    if (CMAKE_C_COMPILER_VERSION VERSION_LESS 18.0)
+        message (FATAL_ERROR "icc version must be at least 18.0")
+    endif ( )
 elseif ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
     # options for clang
+    if (CMAKE_C_COMPILER_VERSION VERSION_LESS 3.3)
+        message (FATAL_ERROR "clang version must be at least 3.3")
+    endif ( )
 elseif ("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC")
     # options for MicroSoft Visual Studio
 endif ( )
 
 # create the graphblas library.  Requires ANSI C11
 file ( GLOB GRAPHBLAS_SOURCES "Source/*.c" )
 add_library ( graphblas SHARED ${GRAPHBLAS_SOURCES} )
-SET_TARGET_PROPERTIES ( graphblas PROPERTIES VERSION 1.0.0
+SET_TARGET_PROPERTIES ( graphblas PROPERTIES VERSION 1.1.0
     SOVERSION 1
     C_STANDARD_REQUIRED 11
     PUBLIC_HEADER "Include/GraphBLAS.h" )

GraphBLAS/Demo/Output/bfs_demo.out

@@ -112,7 +112,7 @@ must be identical to monoid operator z=or(x,y) of type [bool]
 =================================================================
 SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved.
 http://suitesparse.com  Dept of Computer Sci. & Eng, Texas A&M University
-SuiteSparse:GraphBLAS version: 1.0.0  Date: Nov 25, 2017
+SuiteSparse:GraphBLAS version: 1.1.0  Date: Dec 1, 2017
 SuiteSparse:GraphBLAS, Copyright 2017, Timothy A. Davis
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -178,7 +178,7 @@ must be identical to monoid operator z=or(x,y) of type [bool]
 =================================================================
 SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved.
 http://suitesparse.com  Dept of Computer Sci. & Eng, Texas A&M University
-SuiteSparse:GraphBLAS version: 1.0.0  Date: Nov 25, 2017
+SuiteSparse:GraphBLAS version: 1.1.0  Date: Dec 1, 2017
 SuiteSparse:GraphBLAS, Copyright 2017, Timothy A. Davis
 
 Licensed under the Apache License, Version 2.0 (the "License");

GraphBLAS/Demo/Program/bfs_demo.c

@@ -67,7 +67,7 @@ int main (int argc, char **argv)
     A2 = A ;
 
     GrB_Type atype ;
-    OK (GrB_Matrix_type (&atype, A)) ;
+    OK (GxB_Matrix_type (&atype, A)) ;
     if (atype != GrB_BOOL)
     {
         GrB_Matrix_new (&Abool, GrB_BOOL, n, n) ;
@@ -129,7 +129,7 @@ int main (int argc, char **argv)
 
         OK (GrB_Vector_new (&is_reachable, GrB_BOOL, n)) ;
         OK (GrB_apply (is_reachable, NULL, NULL, GrB_IDENTITY_BOOL, v, NULL)) ;
-        OK (GrB_reduce (&nreachable, NULL, GrB_PLUS_INT32_MONOID, is_reachable, NULL)) ;
+        OK (GrB_reduce (&nreachable, NULL, GxB_PLUS_INT32_MONOID, is_reachable, NULL)) ;
         OK (GrB_free (&is_reachable)) ;
         // OK (GrB_Vector_nvals (&nreachable, v)) ;
         printf ("nodes reachable from node %.16g: %.16g out of %.16g\n",
@@ -141,7 +141,7 @@ int main (int argc, char **argv)
 
         // find the max BFS level
         int64_t nlevels = -1 ;
-        OK (GrB_reduce (&nlevels, NULL, GrB_MAX_INT32_MONOID, v, NULL)) ;
+        OK (GrB_reduce (&nlevels, NULL, GxB_MAX_INT32_MONOID, v, NULL)) ;
         printf ("max BFS level: %.16g\n", (double) nlevels) ;
 
         fprintf (stderr, "nodes reached: %.16g of %.16g levels: %.16g "

GraphBLAS/Demo/Program/mis_demo.c

@@ -104,16 +104,16 @@ int main (int argc, char **argv)
     OK (GrB_eWiseAdd (e, NULL, NULL, GrB_EQ_BOOL, iset, iset2, NULL)) ;
 
     bool a ;
-    OK (GrB_reduce (&a, NULL, GrB_LAND_BOOL_MONOID, e, NULL)) ;
+    OK (GrB_reduce (&a, NULL, GxB_LAND_BOOL_MONOID, e, NULL)) ;
     if (!a) { printf ("error!\n") ; exit (1) ; }
 
     int64_t isize1 ;
-    OK (GrB_reduce (&isize1, NULL, GrB_PLUS_INT64_MONOID, iset,
+    OK (GrB_reduce (&isize1, NULL, GxB_PLUS_INT64_MONOID, iset,
         NULL)) ;
     printf ("isize: %.16g\n", (double) isize1) ;
 
     int64_t isize2 ;
-    OK (GrB_reduce (&isize2, NULL, GrB_PLUS_INT64_MONOID, iset2,
+    OK (GrB_reduce (&isize2, NULL, GxB_PLUS_INT64_MONOID, iset2,
         NULL )) ;
 
     if (isize1 != isize2) { printf ("error!\n") ; exit (1) ; }
@@ -189,7 +189,7 @@ int main (int argc, char **argv)
     // iset2 = iset
     OK (GrB_Vector_dup (&iset2, iset)) ;
     // iset2 = iset2 or A*iset, using the Boolean semiring
-    OK (GrB_mxv (iset2, NULL, GrB_LOR, GrB_LOR_LAND_BOOL, A, iset, NULL)) ;
+    OK (GrB_mxv (iset2, NULL, GrB_LOR, GxB_LOR_LAND_BOOL, A, iset, NULL)) ;
     OK (GrB_Vector_nvals (&nvals, iset2)) ;
     if (nvals != n)
     {

GraphBLAS/Demo/Program/tri_demo.c

@@ -68,25 +68,28 @@ int main (int argc, char **argv)
 
     // A = spones (C), and typecast to uint32
     OK (GrB_Matrix_new (&A, GrB_UINT32, n, n)) ;
-    OK (GrB_apply (A, NULL, NULL, GrB_ONE_UINT32, C, NULL)) ;
+    OK (GrB_apply (A, NULL, NULL, GxB_ONE_UINT32, C, NULL)) ;
     double t_read = simple_toc (tic) ;
     printf ("\ntotal time to read A matrix: %14.6f sec\n", t_read) ;
     GrB_free (&C) ;
 
-    // U = triu (A)
+    // U = triu (A,1)
     simple_tic (tic) ;
-    OK (triu (&U, A)) ;
+    GrB_Index k = 1 ;
+    OK (GrB_Matrix_new (&U, GrB_UINT32, n, n)) ;
+    OK (GxB_select (U, NULL, NULL, GxB_TRIU, A, &k, NULL)) ;
     OK (GrB_Matrix_nvals (&nedges, U)) ;
     printf ("\nn %.16g # edges %.16g\n", (double) n, (double) nedges) ;
     double t_prune = simple_toc (tic) ;
     printf ("U=triu(A) time:  %14.6f sec\n", t_prune) ;
 
-    // L = U', for method 4
+    // L = tril (A,-1), for method 4
     simple_tic (tic) ;
     OK (GrB_Matrix_new (&L, GrB_UINT32, n, n)) ;
-    OK (GrB_transpose (L, NULL, NULL, U, NULL)) ;
+    k = -1 ;
+    OK (GxB_select (L, NULL, NULL, GxB_TRIL, A, &k, NULL)) ;
     double t_trans = simple_toc (tic) ;
-    printf ("L=U' time :      %14.6f sec\n", t_trans) ;
+    printf ("L=tril(A) time:  %14.6f sec\n", t_trans) ;
 
     //--------------------------------------------------------------------------
     // count the triangles via C<U> = U*U (outer-product)

GraphBLAS/Demo/Program/wildtype_demo.c

@@ -44,7 +44,7 @@ void wildtype_print (const wildtype *x, const char *name)
 void wildtype_print_matrix (GrB_Matrix A, char *name)
 {
     GrB_Type type ;
-    GrB_Matrix_type (&type, A) ;
+    GxB_Matrix_type (&type, A) ;
     if (type != WildType)
     {
         printf ("\nThe matrix %s is not wild enough to print.\n", name) ;
@@ -126,7 +126,7 @@ int main (void)
 
     // get its properties
     size_t s ;
-    GrB_Type_size (&s, WildType) ;
+    GxB_Type_size (&s, WildType) ;
     printf ("WildType size: %d\n", (int) s) ;
 
     // create a 10-by-10 WildType matrix, each entry is a 'scalar' WildType

GraphBLAS/Demo/Source/bfs5m_check.c

@@ -6,8 +6,8 @@
 // by Aydin Buluc, Timothy Mattson, Scott McMillan, Jose' Moreira, Carl Yang.
 // Based on "GraphBLAS Mathematics" by Jeremy Kepner.
 
-// This version uses a predefined semiring (GrB_LOR_LAND_BOOL) and a predefined
-// monoid (GrB_LOR_BOOL_MONOID), in GraphBLAS.h.  It also checks the status of
+// This version uses a predefined semiring (GxB_LOR_LAND_BOOL) and a predefined
+// monoid (GxB_LOR_BOOL_MONOID), in GraphBLAS.h.  It also checks the status of
 // each call to GraphBLAS functions.  These two changes are unrelated.  Both
 // change are made here to illustrate two different things.
 
@@ -76,10 +76,10 @@ GrB_Info bfs5m_check        // BFS of a graph (using vector assign & reduce)
 
         // q<!v> = A ||.&& q ; finds all the unvisited
         // successors from current q, using !v as the mask
-        OK (GrB_mxv (q, v, NULL, GrB_LOR_LAND_BOOL, A, q, desc)) ;
+        OK (GrB_mxv (q, v, NULL, GxB_LOR_LAND_BOOL, A, q, desc)) ;
 
         // successor = ||(q)
-        OK (GrB_reduce (&successor, NULL, GrB_LOR_BOOL_MONOID, q, NULL)) ;
+        OK (GrB_reduce (&successor, NULL, GxB_LOR_BOOL_MONOID, q, NULL)) ;
     }
 
     *v_output = v ;         // return result

GraphBLAS/Demo/Source/bfs6_check.c

@@ -6,8 +6,8 @@
 // by Aydin Buluc, Timothy Mattson, Scott McMillan, Jose' Moreira, Carl Yang.
 // Based on "GraphBLAS Mathematics" by Jeremy Kepner.
 
-// This version uses a predefined semiring (GrB_LOR_LAND_BOOL) and a predefined
-// monoid (GrB_LOR_BOOL_MONOID), in GraphBLAS.h.  It also checks the status of
+// This version uses a predefined semiring (GxB_LOR_LAND_BOOL) and a predefined
+// monoid (GxB_LOR_BOOL_MONOID), in GraphBLAS.h.  It also checks the status of
 // each call to GraphBLAS functions.  These two changes are unrelated.  Both
 // change are made here to illustrate two different things.
 
@@ -80,7 +80,7 @@ GrB_Info bfs6_check         // BFS of a graph (using unary operator)
 
         // q<!v> = A ||.&& q ; finds all the unvisited successors from current
         // q, using !v as the mask
-        OK (GrB_mxv (q, v, NULL, GrB_LOR_LAND_BOOL, A, q, desc)) ;
+        OK (GrB_mxv (q, v, NULL, GxB_LOR_LAND_BOOL, A, q, desc)) ;
 
         GrB_Vector_nvals (&nvals, q) ;
     }

GraphBLAS/Demo/Source/mis_check.c

@@ -11,13 +11,13 @@
 
 #include "GraphBLAS.h"
 
-#ifdef SUITESPARSE_GRAPHBLAS
+#ifdef GXB_SUITESPARSE_GRAPHBLAS
     // use predefined semirings.  They are safe to free,
     // so the FREE_ALL macro can be used as-is in either case.
-    #define Max             GrB_MAX_FP32_MONOID
-    #define maxSelect2nd    GrB_MAX_SECOND_FP32
-    #define Lor             GrB_LOR_BOOL_MONOID
-    #define Boolean         GrB_LOR_LAND_BOOL
+    #define Max             GxB_MAX_FP32_MONOID
+    #define maxSelect2nd    GxB_MAX_SECOND_FP32
+    #define Lor             GxB_LOR_BOOL_MONOID
+    #define Boolean         GxB_LOR_LAND_BOOL
 #endif
 
 // "OK(x)" macro defined in demos.h calls a GraphBLAS method, and if it fails,
@@ -76,7 +76,7 @@ GrB_Info mis_check              // compute a maximal independent set
     GrB_Vector new_members = NULL ;     // set of new members to iset
     GrB_Vector new_neighbors = NULL ;   // new neighbors to new iset members
     GrB_Vector candidates = NULL ;      // candidate members to iset
-#ifndef SUITESPARSE_GRAPHBLAS
+#ifndef GXB_SUITESPARSE_GRAPHBLAS
     GrB_Monoid Max = NULL ;
     GrB_Semiring maxSelect2nd = NULL ;  // Max/Select2nd "semiring"
     GrB_Monoid Lor = NULL ;
@@ -101,7 +101,7 @@ GrB_Info mis_check              // compute a maximal independent set
     // Initialize independent set vector, bool
     OK (GrB_Vector_new (&iset, GrB_BOOL, n)) ;
 
-#ifndef SUITESPARSE_GRAPHBLAS
+#ifndef GXB_SUITESPARSE_GRAPHBLAS
     // create the maxSelect2nd semiring
     OK (GrB_Monoid_new (&Max, GrB_MAX_FP32, (float) 0.0)) ;
     OK (GrB_Semiring_new (&maxSelect2nd, Max, GrB_SECOND_FP32)) ;

GraphBLAS/Demo/Source/tricount.c

@@ -94,14 +94,14 @@ GrB_Info tricount           // count # of triangles
             OK (GrB_Matrix_ncols (&ne, E)) ;
             OK (GrB_Matrix_new (&C, GrB_UINT32, n, ne)) ;
             // mxm:  outer product method, no mask
-            OK (GrB_mxm (C, NULL, NULL, GrB_PLUS_TIMES_UINT32, A, E, NULL));
+            OK (GrB_mxm (C, NULL, NULL, GxB_PLUS_TIMES_UINT32, A, E, NULL));
             t [0] = simple_toc (tic) ;
 
             simple_tic (tic) ;
             OK (GrB_UnaryOp_new (&Two, two, GrB_UINT32, GrB_UINT32)) ;
             OK (GrB_Matrix_new (&S, GrB_UINT32, n, ne)) ;
             OK (GrB_apply (S, NULL, NULL, Two, C, NULL)) ;
-            OK (GrB_reduce (&ntri, NULL, GrB_PLUS_INT64_MONOID, S, NULL)) ;
+            OK (GrB_reduce (&ntri, NULL, GxB_PLUS_INT64_MONOID, S, NULL)) ;
             ntri /= 3 ;
             break ;
 
@@ -110,11 +110,11 @@ GrB_Info tricount           // count # of triangles
             OK (GrB_Matrix_nrows (&n, A)) ;
             OK (GrB_Matrix_new (&C, GrB_UINT32, n, n)) ;
             // mxm:  outer product method, with mask
-            OK (GrB_mxm (C, A, NULL, GrB_PLUS_TIMES_UINT32, A, A, NULL)) ;
+            OK (GrB_mxm (C, A, NULL, GxB_PLUS_TIMES_UINT32, A, A, NULL)) ;
             t [0] = simple_toc (tic) ;
 
             simple_tic (tic) ;
-            OK (GrB_reduce (&ntri, NULL, GrB_PLUS_INT64_MONOID, C, NULL)) ;
+            OK (GrB_reduce (&ntri, NULL, GxB_PLUS_INT64_MONOID, C, NULL)) ;
             ntri /= 6 ;
             break ;
 
@@ -123,11 +123,11 @@ GrB_Info tricount           // count # of triangles
             OK (GrB_Matrix_nrows (&n, A)) ;
             OK (GrB_Matrix_new (&C, GrB_UINT32, n, n)) ;
             // mxm:  outer product method, with mask
-            OK (GrB_mxm (C, A, NULL, GrB_PLUS_TIMES_UINT32, L, U, NULL)) ;
+            OK (GrB_mxm (C, A, NULL, GxB_PLUS_TIMES_UINT32, L, U, NULL)) ;
             t [0] = simple_toc (tic) ;
 
             simple_tic (tic) ;
-            OK (GrB_reduce (&ntri, NULL, GrB_PLUS_INT64_MONOID, C, NULL)) ;
+            OK (GrB_reduce (&ntri, NULL, GxB_PLUS_INT64_MONOID, C, NULL)) ;
             ntri /= 2 ;
             break ;
 
@@ -137,23 +137,23 @@ GrB_Info tricount           // count # of triangles
             OK (GrB_Matrix_nrows (&n, U)) ;
             OK (GrB_Matrix_new (&C, GrB_UINT32, n, n)) ;
             // mxm:  outer product method, with mask
-            OK (GrB_mxm (C, U, NULL, GrB_PLUS_TIMES_UINT32, U, U, NULL)) ;
+            OK (GrB_mxm (C, U, NULL, GxB_PLUS_TIMES_UINT32, U, U, NULL)) ;
             t [0] = simple_toc (tic) ;
 
             simple_tic (tic) ;
-            OK (GrB_reduce (&ntri, NULL, GrB_PLUS_INT64_MONOID, C, NULL)) ;
+            OK (GrB_reduce (&ntri, NULL, GxB_PLUS_INT64_MONOID, C, NULL)) ;
             break ;
 
         case 4:  // SandiaL:    ntri = sum (sum ((L * L) .* L))
 
             // same as case 3, just a different matrix
             OK (GrB_Matrix_nrows (&n, L)) ;
             OK (GrB_Matrix_new (&C, GrB_UINT32, n, n)) ;
-            OK (GrB_mxm (C, L, NULL, GrB_PLUS_TIMES_UINT32, L, L, d)) ;
+            OK (GrB_mxm (C, L, NULL, GxB_PLUS_TIMES_UINT32, L, L, d)) ;
             t [0] = simple_toc (tic) ;
 
             simple_tic (tic) ;
-            OK (GrB_reduce (&ntri, NULL, GrB_PLUS_INT64_MONOID, C, NULL)) ;
+            OK (GrB_reduce (&ntri, NULL, GxB_PLUS_INT64_MONOID, C, NULL)) ;
             break ;
 
         case 5:  // SandiaDot:  ntri = sum (sum ((L' * U) .* U))
@@ -163,11 +163,11 @@ GrB_Info tricount           // count # of triangles
             OK (GrB_Descriptor_new (&d)) ;
             OK (GrB_Descriptor_set (d, GrB_INP0, GrB_TRAN)) ;
             // mxm:  dot product method, with mask
-            OK (GrB_mxm (C, U, NULL, GrB_PLUS_TIMES_UINT32, L, U, d)) ;
+            OK (GrB_mxm (C, U, NULL, GxB_PLUS_TIMES_UINT32, L, U, d)) ;
             t [0] = simple_toc (tic) ;
 
             simple_tic (tic) ;
-            OK (GrB_reduce (&ntri, NULL, GrB_PLUS_INT64_MONOID, C, NULL)) ;
+            OK (GrB_reduce (&ntri, NULL, GxB_PLUS_INT64_MONOID, C, NULL)) ;
             break ;
 
         default:    // invalid method