diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000..c739908bbf --- /dev/null +++ b/.gitignore @@ -0,0 +1,222 @@ +# Ignore these files: +*.o +*.so.* +*.so +*.dylib +*.a +*.obj +*.ln +*.bb +*.bbg +*.da +*.tcov +*.gcov +gmon.out +*.bak +*.d +*.gcda +*.gcno +*.aux +*.bbl +*.blg +*.log +*.toc +*.dvi +*.lof +*.lot +*.dll +*.dSYM +my_*.out +*.gcda +*.gcno +*.mex* +*.profile +*.swp +.DS_Store +.nfs* +.pyc + +# ignore these specific programs in the Package/Demo directories +AMD/Demo/amd_demo +AMD/Demo/amd_demo2 +AMD/Demo/amd_l_demo +AMD/Demo/amd_simple +CAMD/Demo/camd_demo +CAMD/Demo/camd_demo2 +CAMD/Demo/camd_l_demo +CAMD/Demo/camd_simple +CCOLAMD/Demo/ccolamd_example +CCOLAMD/Demo/ccolamd_l_example +CHOLMOD/Demo/cholmod_demo +CHOLMOD/Demo/cholmod_l_demo +CHOLMOD/Demo/cholmod_simple +CHOLMOD/Demo/timelog.m +COLAMD/Demo/colamd_example +COLAMD/Demo/colamd_l_example +CSparse/Demo/cs_demo1 +CSparse/Demo/cs_demo2 +CSparse/Demo/cs_demo3 +CXSparse/Demo/cs_ci_demo1 +CXSparse/Demo/cs_ci_demo2 +CXSparse/Demo/cs_ci_demo3 +CXSparse/Demo/cs_cl_demo1 +CXSparse/Demo/cs_cl_demo2 +CXSparse/Demo/cs_cl_demo3 +CXSparse/Demo/cs_demo1 +CXSparse/Demo/cs_demo2 +CXSparse/Demo/cs_demo3 +CXSparse/Demo/cs_di_demo1 +CXSparse/Demo/cs_di_demo2 +CXSparse/Demo/cs_di_demo3 +CXSparse/Demo/cs_dl_demo1 +CXSparse/Demo/cs_dl_demo2 +CXSparse/Demo/cs_dl_demo3 +CXSparse/Demo/cs_idemo +CXSparse/Demo/cs_ldemo +KLU/Demo/klu_simple +KLU/Demo/kludemo +KLU/Demo/kluldemo +LDL/Demo/ldlamd +LDL/Demo/ldllamd +LDL/Demo/ldllmain +LDL/Demo/ldllsimple +LDL/Demo/ldlmain +LDL/Demo/ldlsimple +RBio/Demo/RBdemo +RBio/Demo/temp.rb +SPQR/Demo/qrdemo +SPQR/Demo/qrsimple +SPQR/Demo/qrsimplec +SPQR/Demo/C.mtx +SPQR/Demo/E.txt +SPQR/Demo/R.mtx +SPQR/Demo/X.mtx +SPQR/Demo/gpu_results.txt +SPQR/Demo/qrdemo_gpu +SPQR/Demo/qrdemo_gpu2 +SPQR/Demo/qrdemo_gpu3 +UMFPACK/Demo/numeric.umf +UMFPACK/Demo/symbolic.umf +UMFPACK/Demo/umfpack_di_demo +UMFPACK/Demo/umfpack_dl_demo +UMFPACK/Demo/umfpack_simple +UMFPACK/Demo/umfpack_zi_demo +UMFPACK/Demo/umfpack_zl_demo + +# ignore these specific programs in the Package/Tcov directories +CHOLMOD/Tcov/cl +CHOLMOD/Tcov/clread +CHOLMOD/Tcov/cm +CHOLMOD/Tcov/cmread +CHOLMOD/Tcov/covs.out +CHOLMOD/Tcov/ldemo +CHOLMOD/Tcov/ldemo.c +CHOLMOD/Tcov/temp*.mtx +CHOLMOD/Tcov/timelog.m +CHOLMOD/Tcov/l_*.c +CHOLMOD/Tcov/z_*.c +CHOLMOD/Tcov/zz_*.c +CHOLMOD/Tcov/zl_*.c +CHOLMOD/Tcov/zdemo +CHOLMOD/Tcov/zdemo.c + +CSparse/Tcov/cov.out +CSparse/Tcov/cov.sort +CSparse/Tcov/cover.out +CSparse/Tcov/covs.out +CSparse/Tcov/cs_*.c +CSparse/Tcov/cstcov_test +CSparse/Tcov/*.out +CSparse/Tcov/cs_demo1 +CSparse/Tcov/cs_demo2 +CSparse/Tcov/cs_demo3 + +CXSparse/Tcov/cov.out +CXSparse/Tcov/cov.sort +CXSparse/Tcov/cover.out +CXSparse/Tcov/covs.out +CXSparse/Tcov/cs_*.c +CXSparse/Tcov/cs*_ci.c +CXSparse/Tcov/cs*_cl.c +CXSparse/Tcov/cs*_di.c +CXSparse/Tcov/cs*_dl.c +CXSparse/Tcov/*.out +CXSparse/Tcov/cs_demo1_ci +CXSparse/Tcov/cs_demo1_cl +CXSparse/Tcov/cs_demo1_di +CXSparse/Tcov/cs_demo1_dl +CXSparse/Tcov/cs_demo2_ci +CXSparse/Tcov/cs_demo2_cl +CXSparse/Tcov/cs_demo2_di +CXSparse/Tcov/cs_demo2_dl +CXSparse/Tcov/cs_demo3_ci +CXSparse/Tcov/cs_demo3_cl +CXSparse/Tcov/cs_demo3_di +CXSparse/Tcov/cs_demo3_dl +CXSparse/Tcov/cs_idemo +CXSparse/Tcov/cs_ldemo +CXSparse/Tcov/cstcov_test_ci +CXSparse/Tcov/cstcov_test_cl +CXSparse/Tcov/cstcov_test_di +CXSparse/Tcov/cstcov_test_dl + +KLU/Tcov/cov_*.c +KLU/Tcov/klutest +KLU/Tcov/klultest +KLU/Tcov/*.out + +SPQR/Tcov/X.mtx +SPQR/Tcov/gpu_results.txt +SPQR/Tcov/gpuqrengine_demo +SPQR/Tcov/qrdemo_gpu +SPQR/Tcov/qrtest +SPQR/Tcov/qrtest_out.txt +SPQR/Tcov/troll.m +SPQR/Tcov/cov.out + +UMFPACK/Tcov/covall_err.out +UMFPACK/Tcov/cover.out + +# ignore these specific files in the Package/MATLAB directories +MATLAB_Tools/spqr_rank/save_samples_demo_spqr_rank.mat +CXSparse/MATLAB/CSparse/cs_cl_*.c +CXSparse/MATLAB/Test/cs_*.c + +RBio/Tcov/RBdemo +RBio/Tcov/RBdemo.c +RBio/Tcov/RBio.c +RBio/Tcov/RBio.h +RBio/Tcov/RBtest +RBio/Tcov/SuiteSparse_config.c +RBio/Tcov/SuiteSparse_config.h +RBio/Tcov/*.out +RBio/Tcov/*.rb + +# GraphBLAS +GraphBLAS/Demo/bfs_demo.out +GraphBLAS/Demo/complex_demo.m +GraphBLAS/Demo/mis_demo.out +GraphBLAS/Demo/simple_demo.out +GraphBLAS/Demo/wildtype_demo.out +GraphBLAS/Demo/tri_demo.out +GraphBLAS/Test/errlog.txt +GraphBLAS/Test/log.txt +GraphBLAS/Doc/GraphBLAS_UserGuide.out +GraphBLAS/Tcov/cover_GB_2type_template.c +GraphBLAS/Tcov/cover_GB_AxB_compare_template.c +GraphBLAS/Tcov/cover_GB_AxB_factory.c +GraphBLAS/Tcov/cover_GB_AxB_template.c +GraphBLAS/Tcov/cover_GB_assoc_template.c +GraphBLAS/Tcov/cover_GB_ops_template.c +GraphBLAS/Tcov/cover_GB_qsort_template.c +GraphBLAS/Tcov/cover_GB_semiring_template.c +GraphBLAS/Tcov/cover_GB_subref_template.c +GraphBLAS/Tcov/cover_gb.c +GraphBLAS/Tcov/cover_gb_exp.c +GraphBLAS/Tcov/errlog.txt +GraphBLAS/Tcov/log.txt +GraphBLAS/Tcov/gbstat.mat + +# Do not ignore this file +!.gitignore + diff --git a/CHOLMOD/Cholesky/cholmod_rowcolcounts.c b/CHOLMOD/Cholesky/cholmod_rowcolcounts.c index 6a99775776..c3ddb27720 100644 --- a/CHOLMOD/Cholesky/cholmod_rowcolcounts.c +++ b/CHOLMOD/Cholesky/cholmod_rowcolcounts.c @@ -54,7 +54,7 @@ /* === initialize_node ====================================================== */ /* ========================================================================== */ -static int initialize_node /* initial work for kth node in postordered etree */ +static Int initialize_node /* initial work for kth node in postordered etree */ ( Int k, /* at the kth step of the algorithm (and kth node) */ Int Post [ ], /* Post [k] = i, the kth node in postordered etree */ diff --git a/CHOLMOD/Doc/CHOLMOD_UserGuide.pdf b/CHOLMOD/Doc/CHOLMOD_UserGuide.pdf index f29a62a191..85d3e0da00 100644 Binary files a/CHOLMOD/Doc/CHOLMOD_UserGuide.pdf and b/CHOLMOD/Doc/CHOLMOD_UserGuide.pdf differ diff --git a/CHOLMOD/Doc/CHOLMOD_UserGuide.tex b/CHOLMOD/Doc/CHOLMOD_UserGuide.tex index 5a050a59f2..43bc455b2a 100644 --- a/CHOLMOD/Doc/CHOLMOD_UserGuide.tex +++ b/CHOLMOD/Doc/CHOLMOD_UserGuide.tex @@ -21,7 +21,7 @@ \title{User Guide for CHOLMOD: a sparse Cholesky factorization and modification package} -\date{VERSION 3.0.11, May 4, 2016} +\date{VERSION 3.0.12, Mar 12, 2018} \maketitle %------------------------------------------------------------------------------- diff --git a/CHOLMOD/Doc/ChangeLog b/CHOLMOD/Doc/ChangeLog index e9776545e7..462191037b 100644 --- a/CHOLMOD/Doc/ChangeLog +++ b/CHOLMOD/Doc/ChangeLog @@ -1,3 +1,7 @@ +Mar 12, 2018: version 3.0.12 + + * bug fix to cholmod_rowcolcounts.c (int overflow was possible) + May 4, 2016: version 3.0.11 * minor changes to Makefile diff --git a/CHOLMOD/Doc/getproto b/CHOLMOD/Doc/getproto index b3b30a6f75..5036adbc0f 100755 --- a/CHOLMOD/Doc/getproto +++ b/CHOLMOD/Doc/getproto @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash echo -n $1 > _temp.awk cat rule.awk >> _temp.awk cat header.tex diff --git a/CHOLMOD/Include/cholmod_core.h b/CHOLMOD/Include/cholmod_core.h index 0804794b2f..f635ec2651 100644 --- a/CHOLMOD/Include/cholmod_core.h +++ b/CHOLMOD/Include/cholmod_core.h @@ -243,11 +243,11 @@ #define CHOLMOD_HAS_VERSION_FUNCTION -#define CHOLMOD_DATE "May 4, 2016" +#define CHOLMOD_DATE "Mar 12, 2018" #define CHOLMOD_VER_CODE(main,sub) ((main) * 1000 + (sub)) #define CHOLMOD_MAIN_VERSION 3 #define CHOLMOD_SUB_VERSION 0 -#define CHOLMOD_SUBSUB_VERSION 11 +#define CHOLMOD_SUBSUB_VERSION 12 #define CHOLMOD_VERSION \ CHOLMOD_VER_CODE(CHOLMOD_MAIN_VERSION,CHOLMOD_SUB_VERSION) diff --git a/CHOLMOD/Lib/Makefile b/CHOLMOD/Lib/Makefile index 2ea7ac17f6..09b3871a9f 100644 --- a/CHOLMOD/Lib/Makefile +++ b/CHOLMOD/Lib/Makefile @@ -3,7 +3,7 @@ #=============================================================================== LIBRARY = libcholmod -VERSION = 3.0.11 +VERSION = 3.0.12 SO_VERSION = 3 default: library diff --git a/ChangeLog b/ChangeLog index e00a4b3056..206031a251 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +Mar 15, 2018: SuiteSparse 5.2.0 + + * GraphBLAS 2.0.1: bug fix to GxB_kron + * SuiteSparse_config: corrected back to SO_VERSION 5 + +Mar 12, 2018: + + * GraphBLAS 2.0.0: with changes to API to conform to the latest + specification. The SO_VERSION of GraphBLAS must change, + as a result, since this affects both the ABI and API interface. + * CHOLMOD 3.1.12: bug fix (no change to the CHOLMOD ABI or API) + * KLU 1.3.9: minor edit, not a bug fix, but code is more clear now + Dec 23, 2017: SuiteSparse 5.1.2 * improved build process for GraphBLAS diff --git a/GraphBLAS/CMakeLists.txt b/GraphBLAS/CMakeLists.txt index 7ab3ac14a6..24866da22e 100644 --- a/GraphBLAS/CMakeLists.txt +++ b/GraphBLAS/CMakeLists.txt @@ -1,4 +1,4 @@ -# SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +# SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. # http://suitesparse.com See GraphBLAS/Doc/License.txt for license. # # CMakeLists.tx: instructions for cmake to build GraphBLAS. @@ -82,18 +82,18 @@ endif ( ) # create the dynamic graphblas library. Requires ANSI C11 file ( GLOB GRAPHBLAS_SOURCES "Source/*.c" "Source/Generated/*.c" ) add_library ( graphblas SHARED ${GRAPHBLAS_SOURCES} ) -SET_TARGET_PROPERTIES ( graphblas PROPERTIES VERSION 1.1.2 - SOVERSION 1 +SET_TARGET_PROPERTIES ( graphblas PROPERTIES VERSION 2.0.1 + SOVERSION 2 C_STANDARD_REQUIRED 11 PUBLIC_HEADER "Include/GraphBLAS.h" ) set_property ( TARGET graphblas PROPERTY C_STANDARD 11 ) # create the static graphblas library. Requires ANSI C11 add_library ( graphblas_static STATIC ${GRAPHBLAS_SOURCES} ) -SET_TARGET_PROPERTIES ( graphblas_static PROPERTIES VERSION 1.1.2 +SET_TARGET_PROPERTIES ( graphblas_static PROPERTIES VERSION 2.0.1 OUTPUT_NAME graphblas POSITION_INDEPENDENT_CODE OFF - SOVERSION 1 + SOVERSION 2 C_STANDARD_REQUIRED 11 PUBLIC_HEADER "Include/GraphBLAS.h" ) set_property ( TARGET graphblas_static PROPERTY C_STANDARD 11 ) @@ -145,6 +145,7 @@ add_executable ( bfs_demo "Demo/Program/bfs_demo.c" ) add_executable ( tri_demo "Demo/Program/tri_demo.c" ) add_executable ( mis_demo "Demo/Program/mis_demo.c" ) add_executable ( complex_demo "Demo/Program/complex_demo.c" ) +add_executable ( kron_demo "Demo/Program/kron_demo.c" ) add_executable ( simple_demo "Demo/Program/simple_demo.c" ) add_executable ( wildtype_demo "Demo/Program/wildtype_demo.c" ) @@ -153,6 +154,7 @@ target_link_libraries ( bfs_demo graphblas graphblasdemo ) target_link_libraries ( tri_demo graphblas graphblasdemo ) target_link_libraries ( mis_demo graphblas graphblasdemo ) target_link_libraries ( complex_demo graphblas graphblasdemo ) +target_link_libraries ( kron_demo graphblas graphblasdemo ) target_link_libraries ( simple_demo graphblasdemo ) target_link_libraries ( wildtype_demo graphblas ) diff --git a/GraphBLAS/Demo/Include/demos.h b/GraphBLAS/Demo/Include/demos.h index 0b9473faa2..8a755c428f 100644 --- a/GraphBLAS/Demo/Include/demos.h +++ b/GraphBLAS/Demo/Include/demos.h @@ -2,7 +2,7 @@ // GraphBLAS/Demo/demos.h: include file for all demo programs //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ @@ -54,7 +54,8 @@ GrB_Info read_matrix // read a double-precision matrix bool make_symmetric, // if true, return A as symmetric bool no_self_edges, // if true, then remove self edges from A bool one_based, // if true, input matrix is 1-based - bool boolean // if true, input is GrB_BOOL, otherwise GrB_FP64 + bool boolean, // if true, input is GrB_BOOL, otherwise GrB_FP64 + bool printstuff // if true, print status to stdout ) ; GrB_Info mis // compute a maximal independent set diff --git a/GraphBLAS/Demo/Include/simple_rand.h b/GraphBLAS/Demo/Include/simple_rand.h index 72cc418068..0818414031 100644 --- a/GraphBLAS/Demo/Include/simple_rand.h +++ b/GraphBLAS/Demo/Include/simple_rand.h @@ -2,7 +2,7 @@ /* GraphBLAS/Demo/simple_rand.h: a very simple random number generator */ /* -------------------------------------------------------------------------- */ -/* SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. */ +/* SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved*/ /* http://suitesparse.com See GraphBLAS/Doc/License.txt for license. */ /* -------------------------------------------------------------------------- */ diff --git a/GraphBLAS/Demo/Include/simple_timer.h b/GraphBLAS/Demo/Include/simple_timer.h index d6622033a1..3f0993d78a 100644 --- a/GraphBLAS/Demo/Include/simple_timer.h +++ b/GraphBLAS/Demo/Include/simple_timer.h @@ -2,7 +2,7 @@ /* GraphBLAS/Demo/simple_timer.h: a timer for performance measurements */ /* -------------------------------------------------------------------------- */ -/* SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. */ +/* SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved*/ /* http://suitesparse.com See GraphBLAS/Doc/License.txt for license. */ /* -------------------------------------------------------------------------- */ diff --git a/GraphBLAS/Demo/MATLAB/kron_demo.m b/GraphBLAS/Demo/MATLAB/kron_demo.m new file mode 100644 index 0000000000..071f0415bc --- /dev/null +++ b/GraphBLAS/Demo/MATLAB/kron_demo.m @@ -0,0 +1,35 @@ +function [C err] = kron_demo (A,B) +%KRON_DEMO test Program/kron_demo.c and compare with MATLAB kron +% Usage: +% [C err] = kron_demo (A,B) + +% write A to a file +Afile = fopen ('A.tsv', 'w') ; +[i j x] = find (A) ; +fprintf (Afile, '%d\t%d\t%0.17g\n', [i j x]') ; +fclose (Afile) ; + +% write B to a file +Bfile = fopen ('B.tsv', 'w') ; +[i j x] = find (B) ; +fprintf (Bfile, '%d\t%d\t%0.17g\n', [i j x]') ; +fclose (Bfile) ; + +% run kron_demo +system ('../../build/kron_demo A.tsv B.tsv C.tsv') ; + +% read C from file +load C.tsv ; +C = spconvert (C) ; + +% compare with MATLAB +C2 = kron (A, B) ; + +err = norm (C-C2, 1) / (norm (A,1) + norm (B,1)) ; +if (err > 1e-14) + error ('invalid Kronecker product') ; +end + +delete A.tsv +delete B.tsv +delete C.tsv diff --git a/GraphBLAS/Demo/MATLAB/kron_test.m b/GraphBLAS/Demo/MATLAB/kron_test.m new file mode 100644 index 0000000000..a3cc9f65ec --- /dev/null +++ b/GraphBLAS/Demo/MATLAB/kron_test.m @@ -0,0 +1,10 @@ +%KRON_TEST test kron_demo.m + +clear +A = sprand (10, 20, 0.1) ; +A (10,20) = 42 ; +B = sprand (5, 4, 0.1) ; +B (5,4) = 9 ; +[C err] = kron_demo (A,B) ; +fprintf ('Kron demo passed, err: %g\n', err) ; + diff --git a/GraphBLAS/Demo/MATLAB/tricount.m b/GraphBLAS/Demo/MATLAB/tricount.m index 61b6021da2..f56b0e81c2 100644 --- a/GraphBLAS/Demo/MATLAB/tricount.m +++ b/GraphBLAS/Demo/MATLAB/tricount.m @@ -42,7 +42,7 @@ % sparse column form, so the MATLAB equivalent of the Sandia method is % sum(sum((U*U).*L))> -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. %------------------------------------------------------------------------------- diff --git a/GraphBLAS/Demo/Output/bfs_demo.out b/GraphBLAS/Demo/Output/bfs_demo.out index 13c80e3b9f..adc6e981ce 100644 --- a/GraphBLAS/Demo/Output/bfs_demo.out +++ b/GraphBLAS/Demo/Output/bfs_demo.out @@ -1,12 +1,12 @@ Wathen: nx 4 ny 4 n 65 nz 817 method 0, time: 0.000 sec method 5: vector assign and reduce: -BFS time in seconds: 0.000131 +BFS time in seconds: 0.000146 nodes reachable from node 0: 65 out of 65 max BFS level: 5 method 5: same but check each result -BFS time in seconds: 0.000046 +BFS time in seconds: 0.000049 nodes reachable from node 0: 65 out of 65 max BFS level: 5 @@ -16,84 +16,84 @@ nodes reachable from node 0: 65 out of 65 max BFS level: 5 method 6: same but check each result -BFS time in seconds: 0.000070 +BFS time in seconds: 0.000051 nodes reachable from node 0: 65 out of 65 max BFS level: 5 random 5 by 5, nz: 23, method 1 time 0.000 sec method 5: vector assign and reduce: -BFS time in seconds: 0.000110 +BFS time in seconds: 0.000124 nodes reachable from node 0: 5 out of 5 max BFS level: 2 method 5: same but check each result -BFS time in seconds: 0.000020 +BFS time in seconds: 0.000029 nodes reachable from node 0: 5 out of 5 max BFS level: 2 method 6: apply unary operator -BFS time in seconds: 0.000034 +BFS time in seconds: 0.000038 nodes reachable from node 0: 5 out of 5 max BFS level: 2 method 6: same but check each result -BFS time in seconds: 0.000018 +BFS time in seconds: 0.000022 nodes reachable from node 0: 5 out of 5 max BFS level: 2 ntuples: 3 nrows 3 ncols 3 time to prune self-edges: 0.000000 -time to build the graph with GrB_Matrix_build: 0.000034 +time to build the graph with GrB_Matrix_build: 0.000050 make symmetric A = (C+C')/2 -A = (C+C')/2 time 0.000026 +A = (C+C')/2 time 0.000044 matrix 3 by 3, 3 entries, from stdin method 5: vector assign and reduce: -BFS time in seconds: 0.000075 +BFS time in seconds: 0.000093 nodes reachable from node 0: 1 out of 3 max BFS level: 1 method 5: same but check each result -BFS time in seconds: 0.000016 +BFS time in seconds: 0.000017 nodes reachable from node 0: 1 out of 3 max BFS level: 1 method 6: apply unary operator -BFS time in seconds: 0.000024 +BFS time in seconds: 0.000029 nodes reachable from node 0: 1 out of 3 max BFS level: 1 method 6: same but check each result -BFS time in seconds: 0.000013 +BFS time in seconds: 0.000014 nodes reachable from node 0: 1 out of 3 max BFS level: 1 ntuples: 8 nrows 4 ncols 4 -time to prune self-edges: 0.000001 -time to build the graph with GrB_Matrix_build: 0.000046 +time to prune self-edges: 0.000002 +time to build the graph with GrB_Matrix_build: 0.000048 make symmetric A = (C+C')/2 -A = (C+C')/2 time 0.000026 +A = (C+C')/2 time 0.000039 matrix 4 by 4, 8 entries, from stdin method 5: vector assign and reduce: -BFS time in seconds: 0.000069 +BFS time in seconds: 0.000098 nodes reachable from node 0: 2 out of 4 max BFS level: 2 method 5: same but check each result -BFS time in seconds: 0.000019 +BFS time in seconds: 0.000020 nodes reachable from node 0: 2 out of 4 max BFS level: 2 method 6: apply unary operator -BFS time in seconds: 0.000035 +BFS time in seconds: 0.000065 nodes reachable from node 0: 2 out of 4 max BFS level: 2 method 6: same but check each result -BFS time in seconds: 0.000024 +BFS time in seconds: 0.000020 nodes reachable from node 0: 2 out of 4 max BFS level: 2 @@ -101,7 +101,7 @@ max BFS level: 2 ================================================================= GraphBLAS error: GrB_DOMAIN_MISMATCH -function: GrB_Monoid_INT32_new (&monoid, op, identity) +function: GrB_Monoid_new_INT32 (&monoid, op, identity) Identity type [int32_t] must be identical to monoid operator z=or(x,y) of type [bool] ================================================================= @@ -110,10 +110,10 @@ must be identical to monoid operator z=or(x,y) of type [bool] ------------------- this is OK: ================================================================= -SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. http://suitesparse.com Dept of Computer Sci. & Eng, Texas A&M University -SuiteSparse:GraphBLAS version: 1.1.2 Date: Dec 28, 2017 -SuiteSparse:GraphBLAS, Copyright 2017, Timothy A. Davis +SuiteSparse:GraphBLAS version: 2.0.1 Date: Mar 15, 2018 +SuiteSparse:GraphBLAS, Copyright 2017-2018, Timothy A. Davis Licensed under the Apache License, Version 2.0 (the "License"); you may not use SuiteSparse:GraphBLAS except in compliance with the @@ -126,7 +126,7 @@ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -Conforms to GraphBLAS spec: 1.1.0 Date: Oct 10, 2017 +Conforms to GraphBLAS spec: 1.1.0 Date: Nov 14, 2017 GraphBLAS C API, provisional release, by Aydin Buluc, Timothy Mattson, Scott McMillan, Jose' Moreira, Carl Yang. Based on "GraphBLAS Mathematics" by Jeremy Kepner. @@ -136,30 +136,30 @@ GraphBLAS status: GrB_SUCCESS ntuples: 10 nrows 4 ncols 4 -time to prune self-edges: 0.000000 -time to build the graph with GrB_Matrix_build: 0.000040 +time to prune self-edges: 0.000002 +time to build the graph with GrB_Matrix_build: 0.000053 make symmetric A = (C+C')/2 -A = (C+C')/2 time 0.000033 +A = (C+C')/2 time 0.000047 matrix 4 by 4, 14 entries, from stdin method 5: vector assign and reduce: -BFS time in seconds: 0.000081 +BFS time in seconds: 0.000112 nodes reachable from node 0: 4 out of 4 max BFS level: 2 method 5: same but check each result -BFS time in seconds: 0.000018 +BFS time in seconds: 0.000025 nodes reachable from node 0: 4 out of 4 max BFS level: 2 method 6: apply unary operator -BFS time in seconds: 0.000030 +BFS time in seconds: 0.000039 nodes reachable from node 0: 4 out of 4 max BFS level: 2 method 6: same but check each result -BFS time in seconds: 0.000017 +BFS time in seconds: 0.000019 nodes reachable from node 0: 4 out of 4 max BFS level: 2 @@ -167,7 +167,7 @@ max BFS level: 2 ================================================================= GraphBLAS error: GrB_DOMAIN_MISMATCH -function: GrB_Monoid_INT32_new (&monoid, op, identity) +function: GrB_Monoid_new_INT32 (&monoid, op, identity) Identity type [int32_t] must be identical to monoid operator z=or(x,y) of type [bool] ================================================================= @@ -176,10 +176,10 @@ must be identical to monoid operator z=or(x,y) of type [bool] ------------------- this is OK: ================================================================= -SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. http://suitesparse.com Dept of Computer Sci. & Eng, Texas A&M University -SuiteSparse:GraphBLAS version: 1.1.2 Date: Dec 28, 2017 -SuiteSparse:GraphBLAS, Copyright 2017, Timothy A. Davis +SuiteSparse:GraphBLAS version: 2.0.1 Date: Mar 15, 2018 +SuiteSparse:GraphBLAS, Copyright 2017-2018, Timothy A. Davis Licensed under the Apache License, Version 2.0 (the "License"); you may not use SuiteSparse:GraphBLAS except in compliance with the @@ -192,7 +192,7 @@ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. -Conforms to GraphBLAS spec: 1.1.0 Date: Oct 10, 2017 +Conforms to GraphBLAS spec: 1.1.0 Date: Nov 14, 2017 GraphBLAS C API, provisional release, by Aydin Buluc, Timothy Mattson, Scott McMillan, Jose' Moreira, Carl Yang. Based on "GraphBLAS Mathematics" by Jeremy Kepner. @@ -202,386 +202,386 @@ GraphBLAS status: GrB_SUCCESS ntuples: 8 nrows 4 ncols 3 -time to prune self-edges: 0.000001 -time to build the graph with GrB_Matrix_build: 0.000039 +time to prune self-edges: 0.000000 +time to build the graph with GrB_Matrix_build: 0.000049 make symmetric A = [0 C ; C' 0], a bipartite graph -time to construct augmented system: 0.000039 +time to construct augmented system: 0.000049 matrix 7 by 7, 16 entries, from stdin method 5: vector assign and reduce: -BFS time in seconds: 0.000086 +BFS time in seconds: 0.000119 nodes reachable from node 0: 7 out of 7 max BFS level: 5 method 5: same but check each result -BFS time in seconds: 0.000031 +BFS time in seconds: 0.000051 nodes reachable from node 0: 7 out of 7 max BFS level: 5 method 6: apply unary operator -BFS time in seconds: 0.000057 +BFS time in seconds: 0.000053 nodes reachable from node 0: 7 out of 7 max BFS level: 5 method 6: same but check each result -BFS time in seconds: 0.000032 +BFS time in seconds: 0.000035 nodes reachable from node 0: 7 out of 7 max BFS level: 5 ntuples: 438 nrows 219 ncols 85 -time to prune self-edges: 0.000001 -time to build the graph with GrB_Matrix_build: 0.000050 +time to prune self-edges: 0.000002 +time to build the graph with GrB_Matrix_build: 0.000065 make symmetric A = [0 C ; C' 0], a bipartite graph -time to construct augmented system: 0.000086 +time to construct augmented system: 0.000128 matrix 304 by 304, 876 entries, from stdin method 5: vector assign and reduce: -BFS time in seconds: 0.000187 +BFS time in seconds: 0.000207 nodes reachable from node 0: 304 out of 304 max BFS level: 17 method 5: same but check each result -BFS time in seconds: 0.000135 +BFS time in seconds: 0.000183 nodes reachable from node 0: 304 out of 304 max BFS level: 17 method 6: apply unary operator -BFS time in seconds: 0.000174 +BFS time in seconds: 0.000199 nodes reachable from node 0: 304 out of 304 max BFS level: 17 method 6: same but check each result -BFS time in seconds: 0.000164 +BFS time in seconds: 0.000227 nodes reachable from node 0: 304 out of 304 max BFS level: 17 ntuples: 224 nrows 48 ncols 48 -time to prune self-edges: 0.000001 -time to build the graph with GrB_Matrix_build: 0.000046 +time to prune self-edges: 0.000002 +time to build the graph with GrB_Matrix_build: 0.000069 make symmetric A = (C+C')/2 -A = (C+C')/2 time 0.000041 +A = (C+C')/2 time 0.000057 matrix 48 by 48, 400 entries, from stdin method 5: vector assign and reduce: -BFS time in seconds: 0.000096 +BFS time in seconds: 0.000134 nodes reachable from node 0: 48 out of 48 max BFS level: 4 method 5: same but check each result -BFS time in seconds: 0.000037 +BFS time in seconds: 0.000040 nodes reachable from node 0: 48 out of 48 max BFS level: 4 method 6: apply unary operator -BFS time in seconds: 0.000055 +BFS time in seconds: 0.000126 nodes reachable from node 0: 48 out of 48 max BFS level: 4 method 6: same but check each result -BFS time in seconds: 0.000041 +BFS time in seconds: 0.000043 nodes reachable from node 0: 48 out of 48 max BFS level: 4 ntuples: 147631 nrows 4884 ncols 4884 time to prune self-edges: 0.000003 -time to build the graph with GrB_Matrix_build: 0.002080 +time to build the graph with GrB_Matrix_build: 0.003171 make symmetric A = (C+C')/2 -A = (C+C')/2 time 0.002319 +A = (C+C')/2 time 0.004172 matrix 4884 by 4884, 290378 entries, from stdin method 5: vector assign and reduce: -BFS time in seconds: 0.001543 +BFS time in seconds: 0.002207 nodes reachable from node 0: 4810 out of 4884 max BFS level: 44 method 5: same but check each result -BFS time in seconds: 0.001528 +BFS time in seconds: 0.001365 nodes reachable from node 0: 4810 out of 4884 max BFS level: 44 method 6: apply unary operator -BFS time in seconds: 0.002379 +BFS time in seconds: 0.002099 nodes reachable from node 0: 4810 out of 4884 max BFS level: 44 method 6: same but check each result -BFS time in seconds: 0.001866 +BFS time in seconds: 0.002914 nodes reachable from node 0: 4810 out of 4884 max BFS level: 44 ntuples: 1069 nrows 183 ncols 183 time to prune self-edges: 0.000002 -time to build the graph with GrB_Matrix_build: 0.000069 +time to build the graph with GrB_Matrix_build: 0.000077 make symmetric A = (C+C')/2 -A = (C+C')/2 time 0.000069 +A = (C+C')/2 time 0.000071 matrix 183 by 183, 1585 entries, from stdin method 5: vector assign and reduce: -BFS time in seconds: 0.000148 +BFS time in seconds: 0.000161 nodes reachable from node 0: 183 out of 183 max BFS level: 4 method 5: same but check each result -BFS time in seconds: 0.000076 +BFS time in seconds: 0.000074 nodes reachable from node 0: 183 out of 183 max BFS level: 4 method 6: apply unary operator -BFS time in seconds: 0.000087 +BFS time in seconds: 0.000082 nodes reachable from node 0: 183 out of 183 max BFS level: 4 method 6: same but check each result -BFS time in seconds: 0.000073 +BFS time in seconds: 0.000067 nodes reachable from node 0: 183 out of 183 max BFS level: 4 ntuples: 123 nrows 32 ncols 31 -time to prune self-edges: 0.000001 -time to build the graph with GrB_Matrix_build: 0.000041 +time to prune self-edges: 0.000002 +time to build the graph with GrB_Matrix_build: 0.000054 make symmetric A = [0 C ; C' 0], a bipartite graph -time to construct augmented system: 0.000053 +time to construct augmented system: 0.000060 matrix 63 by 63, 246 entries, from stdin method 5: vector assign and reduce: -BFS time in seconds: 0.000114 +BFS time in seconds: 0.000134 nodes reachable from node 0: 63 out of 63 max BFS level: 6 method 5: same but check each result -BFS time in seconds: 0.000052 +BFS time in seconds: 0.000051 nodes reachable from node 0: 63 out of 63 max BFS level: 6 method 6: apply unary operator -BFS time in seconds: 0.000090 +BFS time in seconds: 0.000074 nodes reachable from node 0: 63 out of 63 max BFS level: 6 method 6: same but check each result -BFS time in seconds: 0.000059 +BFS time in seconds: 0.000057 nodes reachable from node 0: 63 out of 63 max BFS level: 6 ntuples: 123 nrows 31 ncols 32 -time to prune self-edges: 0.000001 -time to build the graph with GrB_Matrix_build: 0.000049 +time to prune self-edges: 0.000002 +time to build the graph with GrB_Matrix_build: 0.000050 make symmetric A = [0 C ; C' 0], a bipartite graph -time to construct augmented system: 0.000051 +time to construct augmented system: 0.000040 matrix 63 by 63, 246 entries, from stdin method 5: vector assign and reduce: -BFS time in seconds: 0.000109 +BFS time in seconds: 0.000136 nodes reachable from node 0: 63 out of 63 max BFS level: 6 method 5: same but check each result -BFS time in seconds: 0.000047 +BFS time in seconds: 0.000050 nodes reachable from node 0: 63 out of 63 max BFS level: 6 method 6: apply unary operator -BFS time in seconds: 0.000069 +BFS time in seconds: 0.000067 nodes reachable from node 0: 63 out of 63 max BFS level: 6 method 6: same but check each result -BFS time in seconds: 0.000051 +BFS time in seconds: 0.000050 nodes reachable from node 0: 63 out of 63 max BFS level: 6 ntuples: 102 nrows 27 ncols 51 -time to prune self-edges: 0.000001 -time to build the graph with GrB_Matrix_build: 0.000041 +time to prune self-edges: 0.000002 +time to build the graph with GrB_Matrix_build: 0.000055 make symmetric A = [0 C ; C' 0], a bipartite graph -time to construct augmented system: 0.000046 +time to construct augmented system: 0.000057 matrix 78 by 78, 204 entries, from stdin method 5: vector assign and reduce: -BFS time in seconds: 0.000122 +BFS time in seconds: 0.000152 nodes reachable from node 0: 78 out of 78 max BFS level: 10 method 5: same but check each result -BFS time in seconds: 0.000066 +BFS time in seconds: 0.000071 nodes reachable from node 0: 78 out of 78 max BFS level: 10 method 6: apply unary operator -BFS time in seconds: 0.000090 +BFS time in seconds: 0.000098 nodes reachable from node 0: 78 out of 78 max BFS level: 10 method 6: same but check each result -BFS time in seconds: 0.000084 +BFS time in seconds: 0.000079 nodes reachable from node 0: 78 out of 78 max BFS level: 10 ntuples: 49920 nrows 492 ncols 490 -time to prune self-edges: 0.000002 -time to build the graph with GrB_Matrix_build: 0.000581 +time to prune self-edges: 0.000003 +time to build the graph with GrB_Matrix_build: 0.001015 make symmetric A = [0 C ; C' 0], a bipartite graph -time to construct augmented system: 0.005522 +time to construct augmented system: 0.004634 matrix 982 by 982, 99840 entries, from stdin method 5: vector assign and reduce: -BFS time in seconds: 0.000744 +BFS time in seconds: 0.000665 nodes reachable from node 0: 933 out of 982 max BFS level: 5 method 5: same but check each result -BFS time in seconds: 0.000621 +BFS time in seconds: 0.000543 nodes reachable from node 0: 933 out of 982 max BFS level: 5 method 6: apply unary operator -BFS time in seconds: 0.000422 +BFS time in seconds: 0.000524 nodes reachable from node 0: 933 out of 982 max BFS level: 5 method 6: same but check each result -BFS time in seconds: 0.000353 +BFS time in seconds: 0.000506 nodes reachable from node 0: 933 out of 982 max BFS level: 5 ntuples: 299 nrows 67 ncols 67 -time to prune self-edges: 0.000001 -time to build the graph with GrB_Matrix_build: 0.000053 +time to prune self-edges: 0.000000 +time to build the graph with GrB_Matrix_build: 0.000080 make symmetric A = (C+C')/2 -A = (C+C')/2 time 0.000032 +A = (C+C')/2 time 0.000052 matrix 67 by 67, 576 entries, from stdin method 5: vector assign and reduce: -BFS time in seconds: 0.000107 +BFS time in seconds: 0.000139 nodes reachable from node 0: 67 out of 67 max BFS level: 5 method 5: same but check each result -BFS time in seconds: 0.000035 +BFS time in seconds: 0.000050 nodes reachable from node 0: 67 out of 67 max BFS level: 5 method 6: apply unary operator -BFS time in seconds: 0.000082 +BFS time in seconds: 0.000070 nodes reachable from node 0: 67 out of 67 max BFS level: 5 method 6: same but check each result -BFS time in seconds: 0.000060 +BFS time in seconds: 0.000053 nodes reachable from node 0: 67 out of 67 max BFS level: 5 -Wathen: nx 200 ny 200 n 120801 nz 1883201 method 0, time: 0.316 sec +Wathen: nx 200 ny 200 n 120801 nz 1883201 method 0, time: 0.377 sec method 5: vector assign and reduce: -BFS time in seconds: 0.027409 +BFS time in seconds: 0.036218 nodes reachable from node 0: 120801 out of 120801 max BFS level: 201 method 5: same but check each result -BFS time in seconds: 0.033958 +BFS time in seconds: 0.034446 nodes reachable from node 0: 120801 out of 120801 max BFS level: 201 method 6: apply unary operator -BFS time in seconds: 0.076350 +BFS time in seconds: 0.073186 nodes reachable from node 0: 120801 out of 120801 max BFS level: 201 method 6: same but check each result -BFS time in seconds: 0.071698 +BFS time in seconds: 0.081593 nodes reachable from node 0: 120801 out of 120801 max BFS level: 201 -random 10000 by 10000, nz: 199764, method 0 time 0.048 sec +random 10000 by 10000, nz: 199764, method 0 time 0.049 sec method 5: vector assign and reduce: -BFS time in seconds: 0.003944 +BFS time in seconds: 0.004385 nodes reachable from node 0: 10000 out of 10000 max BFS level: 5 method 5: same but check each result -BFS time in seconds: 0.003572 +BFS time in seconds: 0.004012 nodes reachable from node 0: 10000 out of 10000 max BFS level: 5 method 6: apply unary operator -BFS time in seconds: 0.003559 +BFS time in seconds: 0.003577 nodes reachable from node 0: 10000 out of 10000 max BFS level: 5 method 6: same but check each result -BFS time in seconds: 0.005103 +BFS time in seconds: 0.003590 nodes reachable from node 0: 10000 out of 10000 max BFS level: 5 -random 10000 by 10000, nz: 199764, method 1 time 0.033 sec +random 10000 by 10000, nz: 199764, method 1 time 0.039 sec method 5: vector assign and reduce: -BFS time in seconds: 0.003542 +BFS time in seconds: 0.004277 nodes reachable from node 0: 10000 out of 10000 max BFS level: 5 method 5: same but check each result -BFS time in seconds: 0.003093 +BFS time in seconds: 0.003713 nodes reachable from node 0: 10000 out of 10000 max BFS level: 5 method 6: apply unary operator -BFS time in seconds: 0.002650 +BFS time in seconds: 0.003542 nodes reachable from node 0: 10000 out of 10000 max BFS level: 5 method 6: same but check each result -BFS time in seconds: 0.003812 +BFS time in seconds: 0.003755 nodes reachable from node 0: 10000 out of 10000 max BFS level: 5 -random 100000 by 100000, nz: 19980358, method 0 time 5.015 sec +random 100000 by 100000, nz: 19980358, method 0 time 6.335 sec method 5: vector assign and reduce: -BFS time in seconds: 0.138870 +BFS time in seconds: 0.135572 nodes reachable from node 0: 100000 out of 100000 max BFS level: 4 method 5: same but check each result -BFS time in seconds: 0.145375 +BFS time in seconds: 0.134372 nodes reachable from node 0: 100000 out of 100000 max BFS level: 4 method 6: apply unary operator -BFS time in seconds: 0.150154 +BFS time in seconds: 0.127397 nodes reachable from node 0: 100000 out of 100000 max BFS level: 4 method 6: same but check each result -BFS time in seconds: 0.142193 +BFS time in seconds: 0.128578 nodes reachable from node 0: 100000 out of 100000 max BFS level: 4 -random 100000 by 100000, nz: 19980358, method 1 time 4.156 sec +random 100000 by 100000, nz: 19980358, method 1 time 4.119 sec method 5: vector assign and reduce: -BFS time in seconds: 0.129175 +BFS time in seconds: 0.134574 nodes reachable from node 0: 100000 out of 100000 max BFS level: 4 method 5: same but check each result -BFS time in seconds: 0.153241 +BFS time in seconds: 0.130955 nodes reachable from node 0: 100000 out of 100000 max BFS level: 4 method 6: apply unary operator -BFS time in seconds: 0.143124 +BFS time in seconds: 0.127984 nodes reachable from node 0: 100000 out of 100000 max BFS level: 4 method 6: same but check each result -BFS time in seconds: 0.142926 +BFS time in seconds: 0.127272 nodes reachable from node 0: 100000 out of 100000 max BFS level: 4 diff --git a/GraphBLAS/Demo/Program/bfs_demo.c b/GraphBLAS/Demo/Program/bfs_demo.c index 4698ec1c9e..2cc4d87783 100644 --- a/GraphBLAS/Demo/Program/bfs_demo.c +++ b/GraphBLAS/Demo/Program/bfs_demo.c @@ -2,7 +2,7 @@ // GraphBLAS/Demo/Program/bfs_demo.c: breadth first search using mxv with a mask //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ @@ -158,16 +158,17 @@ int main (int argc, char **argv) // now break something on purpose and report the error: //-------------------------------------------------------------------------- - // this fails because the compiler selects the INT32 Monoid_new function - // (clang 8.0 on MacOSX, at least), since false is merely the constant "0". if (n == 4) { + // this fails because the compiler selects the GrB_Monoid_new_INT32 + // function (clang 8.0 on MacOSX, at least), since false is merely the + // constant "0". GrB_Monoid Lor ; info = GrB_Monoid_new (&Lor, GrB_LOR, false) ; printf ("\n------------------- this fails:\n%s\n", GrB_error ( )) ; GrB_free (&Lor) ; - // this selects the correct GrB_Monoid_BOOL_new function + // this selects the correct GrB_Monoid_new_BOOL function info = GrB_Monoid_new (&Lor, GrB_LOR, (bool) false) ; printf ("\n------------------- this is OK:\n%s\n", GrB_error ( )) ; GrB_free (&Lor) ; diff --git a/GraphBLAS/Demo/Program/complex_demo.c b/GraphBLAS/Demo/Program/complex_demo.c index 7a0c178331..b760ce5125 100644 --- a/GraphBLAS/Demo/Program/complex_demo.c +++ b/GraphBLAS/Demo/Program/complex_demo.c @@ -2,7 +2,7 @@ // GraphBLAS/Demo/Program/complex_demo.c: demo for user-defined complex type //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ @@ -38,7 +38,8 @@ void print_complex_matrix (GrB_Matrix A, char *name) GrB_Matrix_extractTuples_UDT (I, J, X, &nentries, A) ; - printf ("%s = sparse (%.16g,%.16g) ;\n", name, (double) nrows, (double) ncols) ; + printf ("%s = sparse (%.16g,%.16g) ;\n", name, + (double) nrows, (double) ncols) ; for (int64_t k = 0 ; k < nentries ; k++) { printf (" %s (%.16g,%.16g) = (%20.16g) + (%20.16g)*1i ;\n", diff --git a/GraphBLAS/Demo/Program/kron_demo.c b/GraphBLAS/Demo/Program/kron_demo.c new file mode 100644 index 0000000000..1523faf26d --- /dev/null +++ b/GraphBLAS/Demo/Program/kron_demo.c @@ -0,0 +1,160 @@ +//------------------------------------------------------------------------------ +// GraphBLAS/Demo/Program/kron_demo.c: Kronkecker product +//------------------------------------------------------------------------------ + +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. +// http://suitesparse.com See GraphBLAS/Doc/License.txt for license. + +//------------------------------------------------------------------------------ + +// Reads two graphs from two files and computes their Kronecker product, +// C = kron (A,B), writing the result to a file. +// +// kron_demo A.tsv B.tsv C.tsv +// +// Where A.tsv and B.tsv are two tab- or space-delimited triplet files with +// 1-based indices. Each line has the form: +// +// i j x +// +// where A(i,j)=x is performed by GrB_Matrix_build, to construct the matrix. +// The dimensions of A and B are assumed to be the largest row and column +// indices that appear in the files. The file C.tsv is the filename of the +// output file for C=kron(A,B), also with 1-based indices. + +#include "demos.h" +// #include "../../Source/GB.h" + +// macro used by OK(...) to free workspace if an error occurs +#define FREE_ALL \ + GrB_free (&A) ; \ + GrB_free (&B) ; \ + GrB_free (&C) ; \ + if (Afile != NULL) fclose (Afile) ; \ + if (Bfile != NULL) fclose (Bfile) ; \ + if (Cfile != NULL) fclose (Cfile) ; \ + if (I != NULL) free (I) ; \ + if (J != NULL) free (J) ; \ + if (X != NULL) free (X) ; \ + GrB_finalize ( ) ; + +int main (int argc, char **argv) +{ + //-------------------------------------------------------------------------- + // check inputs + //-------------------------------------------------------------------------- + + GrB_Matrix A = NULL, B = NULL, C = NULL ; + GrB_Index *I = NULL, *J = NULL ; + FILE *Afile = NULL, *Bfile = NULL, *Cfile = NULL ; + double *X = NULL ; + GrB_Info info ; + double tic [2], t ; + + OK (GrB_init (GrB_NONBLOCKING)) ; + + // printf ("argc %d\n", argc) ; + if (argc != 4) + { + FREE_ALL ; + fprintf (stderr, "usage: kron_demo A.tsv B.tsv C.tsv\n") ; + exit (1) ; + } + + Afile = fopen (argv [1], "r") ; + Bfile = fopen (argv [2], "r") ; + Cfile = fopen (argv [3], "w") ; + if (Afile == NULL || Bfile == NULL || Cfile == NULL) + { + FREE_ALL ; + fprintf (stderr, "unable to read input files or create output file\n") ; + exit (1) ; + } + + //-------------------------------------------------------------------------- + // get A and B from input files + //-------------------------------------------------------------------------- + + // this would be faster and take less memory if GraphBLAS had a built-in + // read-from-file operation + OK (read_matrix (&A, Afile, false, false, true, false, false)) ; + OK (read_matrix (&B, Bfile, false, false, true, false, false)) ; + + // GB_check (A, "A", 3) ; + // GB_check (B, "B", 3) ; + + fclose (Afile) ; + fclose (Bfile) ; + Afile = NULL ; + Bfile = NULL ; + + GrB_Index anrows, ancols, bnrows, bncols, anvals, bnvals ; + OK (GrB_Matrix_nrows (&anrows, A)) ; + OK (GrB_Matrix_ncols (&ancols, A)) ; + OK (GrB_Matrix_nvals (&anvals, A)) ; + OK (GrB_Matrix_nrows (&bnrows, B)) ; + OK (GrB_Matrix_ncols (&bncols, B)) ; + OK (GrB_Matrix_nvals (&bnvals, B)) ; + + //-------------------------------------------------------------------------- + // C = kron (A,B) + //-------------------------------------------------------------------------- + + OK (GrB_Matrix_new (&C, GrB_FP64, anrows * bnrows, ancols * bncols)) ; + + simple_tic (tic) ; + OK (GxB_kron (C, NULL, NULL, GrB_TIMES_FP64, A, B, NULL)) ; + t = simple_toc (tic) ; + + OK (GrB_free (&A)) ; + OK (GrB_free (&B)) ; + + // GB_check (C, "C", 3) ; + + //-------------------------------------------------------------------------- + // report results + //-------------------------------------------------------------------------- + + GrB_Index cnrows, cncols, cnvals ; + OK (GrB_Matrix_nrows (&cnrows, C)) ; + OK (GrB_Matrix_ncols (&cncols, C)) ; + OK (GrB_Matrix_nvals (&cnvals, C)) ; + + fprintf (stderr, "GraphBLAS GxB_kron:\n" + "A: %lld-by-%lld, %lld entries.\n" + "B: %lld-by-%lld, %lld entries.\n" + "C: %lld-by-%lld, %lld entries.\n" + "time: %g seconds, rate: nval(C)/t = %g million/sec\n", + anrows, ancols, anvals, + bnrows, bncols, bnvals, + cnrows, cncols, cnvals, + t, 1e-6*((double) cnvals) / t) ; + + //-------------------------------------------------------------------------- + // write C to the output file + //-------------------------------------------------------------------------- + + // this would be faster and take less memory if GraphBLAS had a built-in + // write-to-file operation + + I = (GrB_Index *) malloc ((cnvals+1) * sizeof (GrB_Index)) ; + J = (GrB_Index *) malloc ((cnvals+1) * sizeof (GrB_Index)) ; + X = (double *) malloc ((cnvals+1) * sizeof (double )) ; + if (I == NULL || J == NULL || X == NULL) + { + fprintf (stderr, "out of memory\n") ; + FREE_ALL ; + exit (1) ; + } + + OK (GrB_Matrix_extractTuples (I, J, X, &cnvals, C)) ; + + for (int64_t k = 0 ; k < cnvals ; k++) + { + fprintf (Cfile, "%lld\t%lld\t%.17g\n", 1 + I [k], 1 + J [k], X [k]) ; + } + + FREE_ALL ; + return (0) ; +} + diff --git a/GraphBLAS/Demo/Program/mis_demo.c b/GraphBLAS/Demo/Program/mis_demo.c index 06e29e0b4b..56048ed8f9 100644 --- a/GraphBLAS/Demo/Program/mis_demo.c +++ b/GraphBLAS/Demo/Program/mis_demo.c @@ -2,7 +2,7 @@ // GraphBLAS/Demo/Program/mis_demo.c: maximal independent set //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ @@ -105,7 +105,7 @@ int main (int argc, char **argv) bool a ; OK (GrB_reduce (&a, NULL, GxB_LAND_BOOL_MONOID, e, NULL)) ; - if (!a) { printf ("error!\n") ; exit (1) ; } + if (!a) { printf ("error! mismatch\n") ; exit (1) ; } int64_t isize1 ; OK (GrB_reduce (&isize1, NULL, GxB_PLUS_INT64_MONOID, iset, @@ -145,7 +145,8 @@ int main (int argc, char **argv) { if (X [k]) { - I [isize++] = k ; + // printf ("I [%lld] = %lld\n", isize, I [k]) ; + I [isize++] = I [k] ; } } diff --git a/GraphBLAS/Demo/Program/simple_demo.c b/GraphBLAS/Demo/Program/simple_demo.c index 6c340b9eb6..c19e4bcab4 100644 --- a/GraphBLAS/Demo/Program/simple_demo.c +++ b/GraphBLAS/Demo/Program/simple_demo.c @@ -2,7 +2,7 @@ /* GraphBLAS/Demo/Program/simple_demo.c: tests simple_rand and simple_timer */ /* -------------------------------------------------------------------------- */ -/* SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. */ +/* SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved*/ /* http://suitesparse.com See GraphBLAS/Doc/License.txt for license. */ /* -------------------------------------------------------------------------- */ diff --git a/GraphBLAS/Demo/Program/tri_demo.c b/GraphBLAS/Demo/Program/tri_demo.c index 188b5cb051..34085f7935 100644 --- a/GraphBLAS/Demo/Program/tri_demo.c +++ b/GraphBLAS/Demo/Program/tri_demo.c @@ -2,7 +2,7 @@ // GraphBLAS/Demo/Program/tri_demo.c: count triangles //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Demo/Program/wildtype_demo.c b/GraphBLAS/Demo/Program/wildtype_demo.c index 966911c6ce..0c8817af30 100644 --- a/GraphBLAS/Demo/Program/wildtype_demo.c +++ b/GraphBLAS/Demo/Program/wildtype_demo.c @@ -122,7 +122,7 @@ int main (void) fprintf (stderr, "wildtype_demo:\n") ; // create the WildType - GrB_Type_new (&WildType, wildtype) ; + GrB_Type_new (&WildType, sizeof (wildtype)) ; // get its properties size_t s ; @@ -193,7 +193,7 @@ int main (void) } sprintf (scalar_identity.whatstuff, "identity") ; wildtype_print (&scalar_identity, "scalar_identity for the monoid") ; - GrB_Monoid_UDT_new (&WildAdder, WildAdd, &scalar_identity) ; + GrB_Monoid_new_UDT (&WildAdder, WildAdd, &scalar_identity) ; // create the InTheWild semiring GrB_Semiring InTheWild ; diff --git a/GraphBLAS/Demo/README.txt b/GraphBLAS/Demo/README.txt index de9f264b8b..3bc25d7d17 100644 --- a/GraphBLAS/Demo/README.txt +++ b/GraphBLAS/Demo/README.txt @@ -1,4 +1,4 @@ -SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. http://suitesparse.com See GraphBLAS/Doc/License.txt for license. This is the GraphBLAS/Demo folder. It contains a set of simple demo programs @@ -46,6 +46,7 @@ mis_demo.c demo program to test mis tri_demo.c demo program to test tricount simple_demo.c demo program to test simple_rand and simple_timer wildtype_demo.c demo program with arbitrary struct as user-defined type +kron_demo.c demo program to test GxB_kron -------------------------------------------------------------------------------- in Demo/Output: diff --git a/GraphBLAS/Demo/Source/get_matrix.c b/GraphBLAS/Demo/Source/get_matrix.c index 0ea2745d68..6af6383ba3 100644 --- a/GraphBLAS/Demo/Source/get_matrix.c +++ b/GraphBLAS/Demo/Source/get_matrix.c @@ -2,7 +2,7 @@ // GraphBLAS/Demo/get_matrix.c: get a matrix from a file, or create random one //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ @@ -156,7 +156,8 @@ GrB_Info get_matrix // get a matrix from stdin, or create random one bool one_based = false ; if (argc > 2) one_based = strtol (argv [1], NULL, 0) ; - OK (read_matrix (&A, stdin, true, no_self_edges, one_based, boolean)) ; + OK (read_matrix (&A, stdin, true, no_self_edges, one_based, boolean, + true)) ; OK (GrB_Matrix_nrows (&nrows, A)) ; OK (GrB_Matrix_ncols (&ncols, A)) ; diff --git a/GraphBLAS/Demo/Source/mis.c b/GraphBLAS/Demo/Source/mis.c index 4df76edcb5..3f35fee73a 100644 --- a/GraphBLAS/Demo/Source/mis.c +++ b/GraphBLAS/Demo/Source/mis.c @@ -17,7 +17,7 @@ // Given a numeric n x n adjacency matrix A of an unweighted and undirected // graph (where the value true represents an edge), compute a maximal set of // independent nodes and return it in a boolean n-vector, 'iset' where -// set[i] == true implies nodes i is a member of the set (the iset vector +// set[i] == true implies node i is a member of the set (the iset vector // should be uninitialized on input.) // The graph cannot have any self edges, and it must be symmetric. These @@ -138,6 +138,9 @@ GrB_Info mis // compute a maximal independent set last_nvals = nvals ; } + // drop explicit false values + GrB_apply (iset, iset, NULL, GrB_IDENTITY_BOOL, iset, r_desc) ; + // return result *iset_output = iset ; diff --git a/GraphBLAS/Demo/Source/mis_check.c b/GraphBLAS/Demo/Source/mis_check.c index 4d4d350b62..dae041ba70 100644 --- a/GraphBLAS/Demo/Source/mis_check.c +++ b/GraphBLAS/Demo/Source/mis_check.c @@ -178,6 +178,9 @@ GrB_Info mis_check // compute a maximal independent set last_nvals = nvals ; } + // drop explicit false values + OK (GrB_apply (iset, iset, NULL, GrB_IDENTITY_BOOL, iset, r_desc)) ; + // return result *iset_output = iset ; iset = NULL ; // set to NULL so FREE_ALL doesn't free it diff --git a/GraphBLAS/Demo/Source/random_matrix.c b/GraphBLAS/Demo/Source/random_matrix.c index 5c9e236a00..b2df3718e6 100644 --- a/GraphBLAS/Demo/Source/random_matrix.c +++ b/GraphBLAS/Demo/Source/random_matrix.c @@ -2,7 +2,7 @@ // GraphBLAS/Demo/random_matrix.c: create a random matrix //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Demo/Source/read_matrix.c b/GraphBLAS/Demo/Source/read_matrix.c index 80ee76ed76..14cd14e35a 100644 --- a/GraphBLAS/Demo/Source/read_matrix.c +++ b/GraphBLAS/Demo/Source/read_matrix.c @@ -2,7 +2,7 @@ // GraphBLAS/Demo/read_matrix.c: read a matrix from stdin //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ @@ -52,7 +52,8 @@ GrB_Info read_matrix // read a double-precision or boolean matrix bool make_symmetric, // if true, return A as symmetric bool no_self_edges, // if true, then remove self edges from A bool one_based, // if true, input matrix is 1-based - bool boolean // if true, input is GrB_BOOL, otherwise GrB_FP64 + bool boolean, // if true, input is GrB_BOOL, otherwise GrB_FP64 + bool pr // if true, print status to stdout ) { @@ -83,7 +84,7 @@ GrB_Info read_matrix // read a double-precision or boolean matrix if (I == NULL || J == NULL || X == NULL) { // out of memory - printf ("out of memory for initial tuples\n") ; + if (pr) printf ("out of memory for initial tuples\n") ; FREE_ALL ; return (GrB_OUT_OF_MEMORY) ; } @@ -108,7 +109,7 @@ GrB_Info read_matrix // read a double-precision or boolean matrix X2 = realloc (X, 2 * len * xsize) ; if (I2 == NULL || J2 == NULL || X2 == NULL) { - printf ("out of memory for tuples\n") ; + if (pr) printf ("out of memory for tuples\n") ; FREE_ALL ; return (GrB_OUT_OF_MEMORY) ; } @@ -141,7 +142,7 @@ GrB_Info read_matrix // read a double-precision or boolean matrix // find the dimensions //-------------------------------------------------------------------------- - printf ("ntuples: %.16g\n", (double) ntuples) ; + if (pr) printf ("ntuples: %.16g\n", (double) ntuples) ; int64_t nrows = 0 ; int64_t ncols = 0 ; for (int64_t k = 0 ; k < ntuples ; k++) @@ -152,7 +153,8 @@ GrB_Info read_matrix // read a double-precision or boolean matrix nrows++ ; ncols++ ; - printf ("nrows %.16g ncols %.16g\n", (double) nrows, (double) ncols) ; + if (pr) printf ("nrows %.16g ncols %.16g\n", + (double) nrows, (double) ncols) ; //-------------------------------------------------------------------------- // prune self edges @@ -185,7 +187,7 @@ GrB_Info read_matrix // read a double-precision or boolean matrix ntuples = ntuples2 ; } t1 = simple_toc (tic) ; - printf ("time to prune self-edges: %12.6f\n", t1) ; + if (pr) printf ("time to prune self-edges: %12.6f\n", t1) ; //-------------------------------------------------------------------------- // build the matrix, summing up duplicates, and then free the tuples @@ -201,7 +203,7 @@ GrB_Info read_matrix // read a double-precision or boolean matrix } else { - xtype = xtype ; + xtype = GrB_FP64 ; xop = GrB_PLUS_FP64 ; xop2 = GrB_FIRST_FP64 ; } @@ -218,7 +220,8 @@ GrB_Info read_matrix // read a double-precision or boolean matrix OK (GrB_Matrix_build (C, I, J, Xdouble, ntuples, xop)) ; } t1 = simple_toc (tic) ; - printf ("time to build the graph with GrB_Matrix_build: %12.6f\n", t1) ; + if (pr) printf ("time to build the graph with GrB_Matrix_build: %12.6f\n", + t1) ; #ifdef TEST_SETELEMENT { @@ -241,7 +244,8 @@ GrB_Info read_matrix // read a double-precision or boolean matrix // force completion of B GrB_Matrix_nvals (&nvals, B) ; double t2 = simple_toc (tic) ; - printf ("time to build the graph with GrB_setElement: %12.6f\n", t2) ; + if (pr) printf ("time to build the graph with GrB_setElement:" + " %12.6f\n", t2) ; GrB_free (&B) ; } #endif @@ -273,7 +277,7 @@ GrB_Info read_matrix // read a double-precision or boolean matrix // ensure the matrix is symmetric //---------------------------------------------------------------------- - printf ("make symmetric\n") ; + if (pr) printf ("make symmetric\n") ; if (nrows == ncols) { @@ -281,7 +285,7 @@ GrB_Info read_matrix // read a double-precision or boolean matrix // A = (C+C')/2 //------------------------------------------------------------------ - printf ("A = (C+C')/2\n") ; + if (pr) printf ("A = (C+C')/2\n") ; double tic [2], t ; simple_tic (tic) ; OK (GrB_Matrix_new (&A, xtype, nrows, nrows)) ; @@ -305,7 +309,7 @@ GrB_Info read_matrix // read a double-precision or boolean matrix } t = simple_toc (tic) ; - printf ("A = (C+C')/2 time %12.6f\n", t) ; + if (pr) printf ("A = (C+C')/2 time %12.6f\n", t) ; } else @@ -316,7 +320,7 @@ GrB_Info read_matrix // read a double-precision or boolean matrix //------------------------------------------------------------------ // no self edges will exist - printf ("A = [0 C ; C' 0], a bipartite graph\n") ; + if (pr) printf ("A = [0 C ; C' 0], a bipartite graph\n") ; double tic [2], t ; simple_tic (tic) ; @@ -331,7 +335,7 @@ GrB_Info read_matrix // read a double-precision or boolean matrix // J = nrows:(nrows+ncols-1) if (I == NULL || J == NULL) { - printf ("out of memory for index ranges\n") ; + if (pr) printf ("out of memory for index ranges\n") ; FREE_ALL ; return (GrB_OUT_OF_MEMORY) ; } @@ -364,7 +368,7 @@ GrB_Info read_matrix // read a double-precision or boolean matrix GrB_Matrix_nvals (&nvals, A) ; t = simple_toc (tic) ; - printf ("time to construct augmented system: %12.6f\n", t) ; + if (pr) printf ("time to construct augmented system: %12.6f\n", t) ; *A_output = A ; // set A to NULL so the FREE_ALL macro does not free *A_output A = NULL ; @@ -378,7 +382,7 @@ GrB_Info read_matrix // read a double-precision or boolean matrix // return the matrix as-is //---------------------------------------------------------------------- - printf ("leave A as-is\n") ; + if (pr) printf ("leave A as-is\n") ; *A_output = C ; // set C to NULL so the FREE_ALL macro does not free *A_output C = NULL ; diff --git a/GraphBLAS/Demo/Source/simple_rand.c b/GraphBLAS/Demo/Source/simple_rand.c index e358546b47..a4547c7298 100644 --- a/GraphBLAS/Demo/Source/simple_rand.c +++ b/GraphBLAS/Demo/Source/simple_rand.c @@ -2,7 +2,7 @@ /* GraphBLAS/Demo/simple_rand.c: a very simple random number generator */ /* -------------------------------------------------------------------------- */ -/* SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. */ +/* SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved*/ /* http://suitesparse.com See GraphBLAS/Doc/License.txt for license. */ /* -------------------------------------------------------------------------- */ diff --git a/GraphBLAS/Demo/Source/simple_timer.c b/GraphBLAS/Demo/Source/simple_timer.c index de6a600b46..731f90b839 100644 --- a/GraphBLAS/Demo/Source/simple_timer.c +++ b/GraphBLAS/Demo/Source/simple_timer.c @@ -2,7 +2,7 @@ /* GraphBLAS/Demo/simple_timer.c: a timer for performance measurements */ /* -------------------------------------------------------------------------- */ -/* SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. */ +/* SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved*/ /* http://suitesparse.com See GraphBLAS/Doc/License.txt for license. */ /* -------------------------------------------------------------------------- */ diff --git a/GraphBLAS/Demo/Source/usercomplex.c b/GraphBLAS/Demo/Source/usercomplex.c index d5030ec786..9d2115841f 100644 --- a/GraphBLAS/Demo/Source/usercomplex.c +++ b/GraphBLAS/Demo/Source/usercomplex.c @@ -219,7 +219,7 @@ GrB_Info Complex_init ( ) // create the Complex type //-------------------------------------------------------------------------- - OK (GrB_Type_new (&Complex, C)) ; + OK (GrB_Type_new (&Complex, sizeof (C))) ; #undef C #define C Complex @@ -306,8 +306,8 @@ GrB_Info Complex_init ( ) // create the Complex monoids //-------------------------------------------------------------------------- - OK (GrB_Monoid_UDT_new (&Complex_plus_monoid, Complex_plus, &Complex_0)) ; - OK (GrB_Monoid_UDT_new (&Complex_times_monoid, Complex_times, &Complex_1)) ; + OK (GrB_Monoid_new_UDT (&Complex_plus_monoid, Complex_plus, &Complex_0)) ; + OK (GrB_Monoid_new_UDT (&Complex_times_monoid, Complex_times, &Complex_1)) ; //-------------------------------------------------------------------------- // create the Complex plus-times semiring diff --git a/GraphBLAS/Doc/ChangeLog b/GraphBLAS/Doc/ChangeLog index ab89f23d1e..9b7f978aba 100644 --- a/GraphBLAS/Doc/ChangeLog +++ b/GraphBLAS/Doc/ChangeLog @@ -1,3 +1,21 @@ +Version 2.0.1: Mar 15, 2018 + + * bug fix in GxB_kron: computed C incorrectly when A and B had pending + updates on input + +Version 2.0.0: Mar 12, 2018 + + * moved opaque object definitions from Include/GraphBLAS.h to Source/GB.h + * modifications to meet changes in the Nov 14, 2017, API specification: + GrB_Monoid_TYPE_new changed to GrB_Monoid_new_TYPE + GrB_Type_new modified: 2nd argument no longer a type, but sizeof(type) + * to allow non-C applications to access all GraphBLAS functions: + These were just macros, now defined as both macros and functions: + GrB_Type_new, GrB_UnaryOp_new, GrB_BinaryOp_new, and GxB_SelectOp_new. + * added GxB_kron, GxB_resize (GxB_Matrix_resize and GxB_Vector_resize) + * bug fix to mask: GrB_anymethod (C, C, ... , r_desc) where r_desc.outp + is 'replace', and C is aliased to the Mask, was incorrect. + Version 1.1.2: Dec 28, 2017 * build issues with cmake @@ -29,7 +47,8 @@ Version 1.0.0: Nov 25, 2017 * tested on many compilers (gcc 4.9 to 7.2 on Linux, clang 8 and gcc 6.2.0 on the Mac, xlc 13.01 on IBM Power) * changed printf formats in Demo/ to silence warnings from older compilers - * complex.h in gcc-6.2.0 on the Mac doesn't #define CMPLX; added to usercomplex.h + * complex.h in gcc-6.2.0 on the Mac doesn't #define CMPLX; + added to usercomplex.h * mergesort removed, quicksort performance improved * performance improvement for masked matrix-matrix multiply * bug fix for masked matrix-matrix multiply. In 0.5.0 only the Mask diff --git a/GraphBLAS/Doc/GraphBLAS_API_C.pdf b/GraphBLAS/Doc/GraphBLAS_API_C.pdf new file mode 100644 index 0000000000..d2fd9fa44b Binary files /dev/null and b/GraphBLAS/Doc/GraphBLAS_API_C.pdf differ diff --git a/GraphBLAS/Doc/GraphBLAS_UserGuide.pdf b/GraphBLAS/Doc/GraphBLAS_UserGuide.pdf index 90b2c01dd3..55b6ab9391 100644 Binary files a/GraphBLAS/Doc/GraphBLAS_UserGuide.pdf and b/GraphBLAS/Doc/GraphBLAS_UserGuide.pdf differ diff --git a/GraphBLAS/Doc/GraphBLAS_UserGuide.tex b/GraphBLAS/Doc/GraphBLAS_UserGuide.tex index 351c885a46..baf3c2e1cd 100644 --- a/GraphBLAS/Doc/GraphBLAS_UserGuide.tex +++ b/GraphBLAS/Doc/GraphBLAS_UserGuide.tex @@ -22,7 +22,7 @@ http://www.suitesparse.com and http://aldenmath.com } -\date{VERSION 1.1.2, Dec 28, 2017} +\date{VERSION 2.0.1, Mar 15, 2018} %------------------------------------------------------------------------------- \begin{document} @@ -72,10 +72,9 @@ \section{Introduction} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% A full and precise definition of the GraphBLAS specification is provided in {\em The GraphBLAS C API Specification} by {Ayd\i n Bulu\c{c}, Timothy Mattson, Scott McMillan, Jos\'e Moreira, and Carl Yang} \cite{spec}, based on {\em -GraphBLAS Mathematics} by Jeremy Kepner \cite{Kepner2017}. -The GraphBLAS C API -Specification is available at \url{http://graphblas.org}. -This version of SuiteSparse:GraphBLAS fully conforms to Version 1.1.0 of that +GraphBLAS Mathematics} by Jeremy Kepner \cite{Kepner2017}. The GraphBLAS C API +Specification is available at \url{http://graphblas.org}. This version of +SuiteSparse:GraphBLAS fully conforms to Version 1.1.0 (Nov 14, 2017) of that specification. In this User Guide, aspects of the GraphBLAS specification that would be true for any GraphBLAS implementation are simply called ``GraphBLAS.'' Details unique to this particular implementation are referred to as @@ -591,10 +590,9 @@ \subsection{Notation and list of GraphBLAS operations} %======================== \label{list} As a summary of what GraphBLAS can do, the following table lists all GraphBLAS -operations. Upper case letters denote a matrix, and lower case letters are -vectors. Let ${\bf AB}$ denote the multiplication of two matrices over a -semiring. The semiring can use any binary operator as its ``multiply'' -operator, and any commutative and associative monoid as its ``add'' operator. +operations (where \verb'GxB_*' are in SuiteSparse:GraphBLAS only). Upper case +letters denote a matrix, lower case letters are vectors, and ${\bf AB}$ +denote the multiplication of two matrices over a semiring. \vspace{0.05in} {\footnotesize @@ -632,6 +630,8 @@ \subsection{Notation and list of GraphBLAS operations} %======================== \hline \verb'GrB_transpose' & transpose & ${\bf C \langle M \rangle = C \odot A'}$ \\ \hline +\verb'GxB_kron' & Kronecker product & ${\bf C \langle M \rangle = C \odot \mbox{kron}(A, B)}$ \\ +\hline \end{tabular} } \vspace{0.05in} @@ -652,9 +652,10 @@ \subsection{Notation and list of GraphBLAS operations} %======================== Reduction of a matrix ${\bf A}$ to a vector reduces the $i$th row of ${\bf A}$ to a scalar $w_i$. This is like \verb"w=sum(A')" since by default, MATLAB -reduces down the columns, not across the rows. Since the input matrix can be -optionally transposed, selecting this option obtains the behavior of \verb'sum' -in MATLAB. +reduces down the columns, not across the rows. +% Since the input matrix can be +% optionally transposed, selecting this option obtains the behavior of \verb'sum' +% in MATLAB. % Further details of each operation are given in Section~\ref{operations}. @@ -1028,12 +1029,12 @@ \subsection{{\sf GrB\_error:} get more details on the last error} %============= SuiteSparse:GraphBLAS reports many helpful details. For example, if a row or column index is out of bounds, the report will state what those bounds are. If a matrix dimension is incorrect, the mismatching dimensions will be provided. -\verb'GrB_BinaryOp_new' and \verb'GrB_UnaryOp_new' record the name the function -passed to them, and \verb'GrB_Type_new' records the name of its type parameter, -and these are printed if the user-defined types and operators are used -incorrectly. Refer to the output of the example programs in the \verb'Demo' -folder, which intentionally generate errors to illustrate the use of -\verb'GrB_error'. +\verb'GrB_BinaryOp_new', \verb'GrB_UnaryOp_new', and \verb'GxB_SelectOp_new' +record the name the function passed to them, and \verb'GrB_Type_new' records +the name of its type parameter, and these are printed if the user-defined types +and operators are used incorrectly. Refer to the output of the example +programs in the \verb'Demo' folder, which intentionally generate errors to +illustrate the use of \verb'GrB_error'. % #ifdef DEVELOPER: % Also given is the filename and line number of the location in the @@ -1193,7 +1194,7 @@ \subsubsection{{\sf GrB\_Type\_new:} create a user-defined type} GrB_Info GrB_Type_new // create a new GraphBLAS type ( GrB_Type *type, // handle of user type to create - // a C type + size_t sizeof_ctype // size = sizeof (ctype) of the C type ) ; \end{verbatim} }\end{mdframed} @@ -1201,11 +1202,12 @@ \subsubsection{{\sf GrB\_Type\_new:} create a user-defined type} \verb'GrB_Type_new' creates a new user-defined type. The \verb'type' is a handle, or a pointer to an opaque object. The handle itself must not be \verb'NULL' on input, but the content of the handle can be undefined. On -output, the handle contains a pointer to a newly created type. The -\verb'ctype' parameter is peculiar because \verb'GrB_Type_new' is a C macro, -not an actual function. The \verb'ctype' parameter is not a variable, but an -actual type in C, either built-in or defined by a \verb'typedef'. The only -requirement on \verb'ctype' is that \verb'sizeof(ctype)' is valid in C, and +output, the handle contains a pointer to a newly created type. +The \verb'ctype' is the type in C that will be used to construct the new +GraphBLAS type. It can be either a built-in C type, or defined by a +\verb'typedef'. +The second parameter should be passed as \verb'sizeof(ctype)'. The only +requirement on the C type is that \verb'sizeof(ctype)' is valid in C, and that the type reside in a contiguous block of memory so that it can be moved with \verb'memcpy'. For example, to create a user-defined type called \verb'Complex' for double-precision complex values using the ANSI C11 @@ -1217,9 +1219,8 @@ \subsubsection{{\sf GrB\_Type\_new:} create a user-defined type} \begin{verbatim} #include #include - GrB_Type Complex ; - GrB_Type_new (&Complex, double complex) ; \end{verbatim} } + GrB_Type_new (&Complex, sizeof (double complex)) ; \end{verbatim} } To demonstrate the flexibility of the \verb'GrB_Type', consider a ``scalar'' consisting of 4-by-4 floating-point matrix and a string. This type might be @@ -1237,9 +1238,8 @@ \subsubsection{{\sf GrB\_Type\_new:} create a user-defined type} char whatstuff [64] ; } wildtype ; - GrB_Type WildType ; - GrB_Type_new (&WildType, wildtype) ; \end{verbatim} } + GrB_Type_new (&WildType, sizeof (wildtype)) ; \end{verbatim} } With this type a sparse matrix can be created in which each entry consists of a 4-by-4 dense matrix \verb'stuff' and a 64-character string \verb'whatstuff'. @@ -1265,7 +1265,6 @@ \subsubsection{{\sf GrB\_Type\_new:} create a user-defined type} application. Thus, while GraphBLAS does not include any complex types or operators, SuiteSparse:GraphBLAS provides them in two simple ``user'' files in the \verb'Demo' folder. - Refer to Section~\ref{user} for more details on these two example user-defined types. @@ -2421,12 +2420,14 @@ \subsection{GraphBLAS vectors: {\sf GrB\_Vector}} %============================= \verb'GrB_Vector_setElement' & add a single entry to a vector \\ \verb'GrB_Vector_extractElement' & get a single entry from a vector \\ \verb'GrB_Vector_extractTuples' & get all entries from a vector \\ +\verb'GxB_Vector_resize' & resize a vector \\ \verb'GrB_Vector_free' & free a vector \\ \hline \end{tabular} } -% \newpage + +\newpage %------------------------------------------------------------------------------- \subsubsection{{\sf GrB\_Vector\_new:} create a vector} %------------------------------------------------------------------------------- @@ -2449,7 +2450,7 @@ \subsubsection{{\sf GrB\_Vector\_new:} create a vector} \verb'v = sparse (n,1)', except that GraphBLAS can create sparse vectors any type. The pattern of the new vector is empty. -\newpage +% \newpage %------------------------------------------------------------------------------- \subsubsection{{\sf GrB\_Vector\_dup:} copy a vector} %------------------------------------------------------------------------------- @@ -2490,7 +2491,7 @@ \subsubsection{{\sf GrB\_Vector\_dup:} copy a vector} same set of values, but they do not depend on each other. Modifying one has no effect on the other. -% \newpage +\newpage %------------------------------------------------------------------------------- \subsubsection{{\sf GrB\_Vector\_clear:} clear a vector of all entries} %------------------------------------------------------------------------------- @@ -2514,7 +2515,7 @@ \subsubsection{{\sf GrB\_Vector\_clear:} clear a vector of all entries} change. In SuiteSparse:GraphBLAS, any pending updates to the vector are discarded. -\newpage +% \newpage %------------------------------------------------------------------------------- \subsubsection{{\sf GrB\_Vector\_size:} return the size of a vector} %------------------------------------------------------------------------------- @@ -2534,7 +2535,7 @@ \subsubsection{{\sf GrB\_Vector\_size:} return the size of a vector} \verb'GrB_Vector_size' returns the size of a vector (the number of rows). Analogous to \verb'n = length(v)' or \verb'n = size(v,1)' in MATLAB. -% \newpage +\newpage %------------------------------------------------------------------------------- \subsubsection{{\sf GrB\_Vector\_nvals:} return the number of entries in a vector} %------------------------------------------------------------------------------- @@ -2573,7 +2574,7 @@ \subsubsection{{\sf GrB\_Vector\_nvals:} return the number of entries in pending computations are complete for all GraphBLAS objects, use \verb'GrB_wait' instead. -\newpage +% \newpage %------------------------------------------------------------------------------- \subsubsection{{\sf GxB\_Vector\_type:} return the type of a vector} %------------------------------------------------------------------------------- @@ -2597,7 +2598,7 @@ \subsubsection{{\sf GxB\_Vector\_type:} return the type of a vector} {\bf SPEC:} The \verb'GxB_Vector_type' function is an extension to the spec. \end{spec} -% \newpage +\newpage %------------------------------------------------------------------------------- \subsubsection{{\sf GrB\_Vector\_build:} build a vector from a set of tuples} %------------------------------------------------------------------------------- @@ -2633,7 +2634,7 @@ \subsubsection{{\sf GrB\_Vector\_build:} build a vector from a set of tu {\bf SPEC:} As an extension to the spec, results are defined even if \verb'dup' is non-associative. \end{spec} -\newpage +% \newpage %------------------------------------------------------------------------------- \subsubsection{{\sf GrB\_Vector\_setElement:} add a single entry to a vector} %------------------------------------------------------------------------------- @@ -2656,7 +2657,7 @@ \subsubsection{{\sf GrB\_Vector\_setElement:} add a single entry to a vector} \verb'j=0'. For further details of this function, see \verb'GrB_Matrix_setElement' in Section~\ref{matrix_setElement}. -% \newpage +\newpage %------------------------------------------------------------------------------- \subsubsection{{\sf GrB\_Vector\_extractElement:} get a single entry from a vector} %------------------------------------------------------------------------------- @@ -2684,7 +2685,7 @@ \subsubsection{{\sf GrB\_Vector\_extractElement:} get a single entry from a vect All computations for the vector \verb'v' are guaranteed to be finished when the method returns. -\newpage +% \newpage %------------------------------------------------------------------------------- \subsubsection{{\sf GrB\_Vector\_extractTuples:} get all entries from a vector} %------------------------------------------------------------------------------- @@ -2713,6 +2714,26 @@ \subsubsection{{\sf GrB\_Vector\_extractTuples:} get all entries from a vector} All computations for the vector \verb'v' are guaranteed to be finished when the method returns. +\newpage +%------------------------------------------------------------------------------- +\subsubsection{{\sf GxB\_Vector\_resize:} resize a vector} +%------------------------------------------------------------------------------- +\label{vector_resize} + +\begin{mdframed}[userdefinedwidth=6in] +{\footnotesize +\begin{verbatim} +GrB_Info GxB_Vector_resize // change the size of a vector +( + GrB_Vector u, // vector to modify + const GrB_Index nrows_new // new number of rows in vector +) ; +\end{verbatim} } \end{mdframed} + +\verb'GxB_Vector_resize' changes the size of a vector. +If the dimension decreases, entries that fall outside the resized +vector are deleted. + % \newpage %------------------------------------------------------------------------------- \subsubsection{{\sf GrB\_Vector\_free:} free a vector} @@ -2765,6 +2786,7 @@ \subsection{GraphBLAS matrices: {\sf GrB\_Matrix}} %============================ \verb'GrB_Matrix_setElement' & add a single entry to a matrix \\ \verb'GrB_Matrix_extractElement'& get a single entry from a matrix \\ \verb'GrB_Matrix_extractTuples' & get all entries from a matrix \\ +\verb'GxB_Matrix_resize' & resize a matrix \\ \verb'GrB_Matrix_free' & free a matrix \\ \hline \end{tabular} @@ -3222,6 +3244,26 @@ \subsubsection{{\sf GrB\_Matrix\_extractTuples:}get all entries from a matrix} All computations for the matrix \verb'A' are guaranteed to be finished when the method returns. +% \newpage +%------------------------------------------------------------------------------- +\subsubsection{{\sf GxB\_Matrix\_resize:} resize a matrix} +%------------------------------------------------------------------------------- +\label{matrix_resize} + +\begin{mdframed}[userdefinedwidth=6in] +{\footnotesize +\begin{verbatim} +GrB_Info GxB_Matrix_resize // change the size of a matrix +( + GrB_Matrix A, // matrix to modify + const GrB_Index nrows_new, // new number of rows in matrix + const GrB_Index ncols_new // new number of columns in matrix +) ; +\end{verbatim} } \end{mdframed} + +\verb'GxB_Matrix_resize' changes the size of a matrix. +If the dimensions decrease, entries that fall outside the resized +matrix are deleted. % \newpage %------------------------------------------------------------------------------- @@ -3595,6 +3637,8 @@ \section{GraphBLAS Operations} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \hline \verb'GrB_transpose' & transpose & ${\bf C \langle M \rangle = C \odot A'}$ \\ \hline +\verb'GxB_kron' & Kronecker product & ${\bf C \langle M \rangle = C \odot \mbox{kron}(A, B)}$ \\ +\hline \end{tabular} } \vspace{0.2in} @@ -3678,7 +3722,7 @@ \subsection{The GraphBLAS specification in {MATLAB}} %========================== \hline \verb'GB_spec_Vector_extract.m' & \verb'GrB_Vector_extract' & \ref{extract_vector} \\ \verb'GB_spec_Matrix_extract.m' & \verb'GrB_Matrix_extract' & \ref{extract_matrix} \\ -\verb'GB_spec_Col_extract.m' & \verb'GrB_Col_extract' & \ref{extract_column} \\ +\verb'GB_spec_Col_extract.m' & \verb'GrB_Col_extract' & \ref{extract_column} \\ \hline \verb'GB_spec_subassign.m' & \verb'GxB_subassign' & \ref{subassign} \\ \verb'GB_spec_assign.m' & \verb'GrB_assign' & \ref{assign} \\ @@ -3692,6 +3736,8 @@ \subsection{The GraphBLAS specification in {MATLAB}} %========================== \hline \verb'GB_spec_transpose.m' & \verb'GrB_transpose' & \ref{transpose} \\ \hline +\verb'GB_spec_kron.m' & \verb'GxB_kron' & \ref{kron} \\ +\hline \end{tabular} } \vspace{0.2in} @@ -5949,6 +5995,50 @@ \subsection{{\sf GrB\_transpose:} transpose a matrix} %========================= GrB_Descriptor_set (desc, GrB_OUTP, GrB_REPLACE) ; GrB_transpose (A, Mask, NULL, A, desc) ; \end{verbatim}} +\newpage +%=============================================================================== +\subsection{{\sf GxB\_kron:} Kronecker product} %=============================== +%=============================================================================== +\label{kron} + +\begin{mdframed}[userdefinedwidth=6in] +{\footnotesize +\begin{verbatim} +GrB_Info GxB_kron // C = accum (C, kron(A,B)) +( + GrB_Matrix C, // input/output matrix for results + const GrB_Matrix Mask, // optional mask for C, unused if NULL + const GrB_BinaryOp accum, // optional accum for Z=accum(C,T) + const GrB_BinaryOp op, // defines '*' for T=kron(A,B) + const GrB_Matrix A, // first input: matrix A + const GrB_Matrix B, // second input: matrix B + const GrB_Descriptor desc // descriptor for C, Mask, A, and B +) ; +\end{verbatim} } \end{mdframed} + +\verb'GxB_kron' computes the Kronecker product, +${\bf C \langle M \rangle = C \odot \mbox{kron}(A,B)}$ where +\[ +\mbox{kron}{\bf (A,B)} = +\left[ + \begin{array}{ccc} + a_{00} \otimes {\bf B} & \ldots & a_{0,n-1} \otimes {\bf B} \\ + \vdots & \ddots & \vdots \\ + a_{m-1,0} \otimes {\bf B} & \ldots & a_{m-1,n-1} \otimes {\bf B} \\ + \end{array} +\right] +\] +The $\otimes$ operator is defined by the \verb'op' parameter. It is applied in +an element-wise fashion (like \verb'GrB_eWiseMult'), where the pattern of the +submatrix $a_{ij} \otimes {\bf B}$ is the same as the pattern of ${\bf B}$ if +$a_{ij}$ is an entry in the matrix ${\bf A}$, or empty otherwise. The input +matrices \verb'A' and \verb'B' can be of any dimension, and both matrices may +be transposed first via the descriptor, \verb'desc'. Entries in \verb'A' and +\verb'B' are typecast into the input types of the \verb'op'. The matrix +\verb'T=kron(A,B)' has the same type as the \verb'ztype' of the binary +operator, \verb'op'. The final step is ${\bf C \langle M \rangle = C \odot +T}$, as described in Section~\ref{accummask}. + \newpage %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \section{Examples} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -6651,7 +6741,7 @@ \subsection{Triangle counting} formulation. Thus, the ${\bf C \langle L \rangle} = {\bf U}'{\bf L}$ method uses dot products. This provides a mechanism for the end-user to select a masked dot product matrix multiplication method in SuiteSparse:GraphBLAS, which -is occassionally faster than the outer product method. +is occasionally faster than the outer product method. Each method is followed by a reduction to a scalar, via \verb'GrB_reduce' in GraphBLAS or by \verb'nnz' or \verb'sum(sum(...))' in MATLAB. @@ -7002,7 +7092,7 @@ \subsection{User-defined types and operators: double complex and struct-based} {\footnotesize \begin{verbatim} - GrB_Type_new (&Complex, double complex) ; \end{verbatim}} + GrB_Type_new (&Complex, sizeof (double complex)) ; \end{verbatim}} Next, it creates a full suite of operators that correspond to every built-in GraphBLAS operator, both binary and unary. In addition, it @@ -7064,11 +7154,19 @@ \section{Installing SuiteSparse:GraphBLAS} in the main GraphBLAS folder, which compiles the library and runs several demos. -GraphBLAS is not yet parallel, but it is thread-safe if multiple simultaneous -calls are made to GraphBLAS functions. For this usage, GraphBLAS must be -compiled with OpenMP so that GraphBLAS has access to a critical section -mechanism. OpenMP is optional if the user application does not make -multiple simultaneous calls to GraphBLAS. +SuiteSparse:GraphBLAS is not yet parallel, but it is thread-safe if multiple +simultaneous calls are made to GraphBLAS functions. The output variables of +those calls to GraphBLAS must be unique; you cannot safely modify one GraphBLAS +object in parallel, with two or more simultaneous GraphBLAS functions operating +on the same output object. In addition, all pending operations of objects that +appear in parallel calls to GraphBLAS must be complete. This can be done for +all objects via \verb'GrB_wait', or it can be done by calling a method or +operation that forces completion of a particular object (such as +\verb'GrB_*_nvals'). If multiple parallel calls to GraphBLAS functions operate +on unique inputs, then those input objects can safely have pending operations. +To use GraphBLAS from parallel threads, GraphBLAS must be compiled with OpenMP +so that it has access to a critical section mechanism. OpenMP is optional if +the user application does not make multiple simultaneous calls to GraphBLAS. If \verb'cmake' or \verb'make' fail, it might be that your default compiler does not support ANSI C11. Try another compiler. For example, try one of @@ -7142,7 +7240,7 @@ \section{Installing SuiteSparse:GraphBLAS} \newpage %------------------------------------------------------------------------------- -\section{Acknowledgements} +\section{Acknowledgments} %------------------------------------------------------------------------------- I would like to thank Jeremy Kepner (MIT Lincoln Laboratory Supercomputing diff --git a/GraphBLAS/Doc/License.txt b/GraphBLAS/Doc/License.txt index a0370150f5..081f6dd9b0 100644 --- a/GraphBLAS/Doc/License.txt +++ b/GraphBLAS/Doc/License.txt @@ -1,4 +1,4 @@ -SuiteSparse:GraphBLAS, Copyright 2017, Timothy A. Davis +SuiteSparse:GraphBLAS, Copyright 2017-2018, Timothy A. Davis Licensed under the Apache License, Version 2.0 (the "License"); you may not use SuiteSparse:GraphBLAS except in compliance with the diff --git a/GraphBLAS/Doc/Makefile b/GraphBLAS/Doc/Makefile index 2de9fa5154..537952aad7 100644 --- a/GraphBLAS/Doc/Makefile +++ b/GraphBLAS/Doc/Makefile @@ -2,7 +2,7 @@ # GraphBLAS/Doc/Makefile #------------------------------------------------------------------------------- -# SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +# SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. # http://suitesparse.com See GraphBLAS/Doc/License.txt for license. #------------------------------------------------------------------------------- diff --git a/GraphBLAS/Include/GraphBLAS.h b/GraphBLAS/Include/GraphBLAS.h index 0bbf23cbb7..84aca02571 100644 --- a/GraphBLAS/Include/GraphBLAS.h +++ b/GraphBLAS/Include/GraphBLAS.h @@ -2,7 +2,7 @@ // GraphBLAS.h: definitions for the GraphBLAS package //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ @@ -72,9 +72,9 @@ (((major)*1000ULL + (minor))*1000ULL + (sub)) // The version of this implementation: -#define GXB_IMPLEMENTATION_MAJOR 1 -#define GXB_IMPLEMENTATION_MINOR 1 -#define GXB_IMPLEMENTATION_SUB 2 +#define GXB_IMPLEMENTATION_MAJOR 2 +#define GXB_IMPLEMENTATION_MINOR 0 +#define GXB_IMPLEMENTATION_SUB 1 #define GXB_IMPLEMENTATION \ GXB_VERSION (GXB_IMPLEMENTATION_MAJOR, \ GXB_IMPLEMENTATION_MINOR, \ @@ -82,15 +82,16 @@ // The 'about' string the describes this particular implementation of GraphBLAS: #define GXB_ABOUT \ -"SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved.\n" \ +"SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, " \ +"All Rights Reserved.\n" \ "http://suitesparse.com Dept of Computer Sci. & Eng, Texas A&M University\n" // and its date: -#define GXB_DATE "Dec 28, 2017" +#define GXB_DATE "Mar 15, 2018" // The GraphBLAS license for this particular implementation of GraphBLAS: #define GXB_LICENSE \ -"SuiteSparse:GraphBLAS, Copyright 2017, Timothy A. Davis\n" \ +"SuiteSparse:GraphBLAS, Copyright 2017-2018, Timothy A. Davis\n" \ "\n" \ "Licensed under the Apache License, Version 2.0 (the \"License\");\n" \ "you may not use SuiteSparse:GraphBLAS except in compliance with the\n" \ @@ -121,7 +122,7 @@ "\"GraphBLAS Mathematics\" by Jeremy Kepner.\n" // and its date: -#define GXB_SPEC_DATE "Oct 10, 2017" +#define GXB_SPEC_DATE "Nov 14, 2017" //------------------------------------------------------------------------------ // include files required by GraphBLAS @@ -297,20 +298,7 @@ const char *GrB_error ( ) ; // return a string describing the last error // also define new types based on any typedef in the C language whose values // are held in a contiguous region of memory. -// USER CODE SHOULD NOT RELY ON GB_LEN -#define GB_LEN 128 - -typedef struct -{ - int64_t magic ; // for detecting uninitialized objects - size_t size ; // size of the type - int code ; // the type code - char name [GB_LEN] ; // name of the type -} -GB_Type_opaque ; // CONTENT NOT USER-ACCESSIBLE - -// The GrB_Type handle is user-accessible, but GB_Type_opaque is not: -typedef GB_Type_opaque *GrB_Type ; +typedef struct GB_Type_opaque *GrB_Type ; // GraphBLAS predefined types and the counterparts in pure C and in MATLAB extern GrB_Type @@ -326,34 +314,47 @@ extern GrB_Type GrB_FP32 , // in C: float in MATLAB: single GrB_FP64 ; // in C: double in MATLAB: double -// The user-callable function has the following signature. -// It is actually implemented as a macro. +// GrB_Type_new is implemented both as a macro and a function. Both are +// user-callable. The default is to use the macro, since this allows the name +// of the type to be saved as a string, for subsequent error reporting by +// GrB_error. It is also provided as a function so that applications that +// require a function instead of macro can access it. User code can simply do +// #undef GrB_Type_new before using the function. This approach also places +// the function GrB_Type_new in the linkable SuiteSparse:GraphBLAS library so +// that it is visible for linking with applications in languages other than +// ANSI C99. The function version does not allow the name of the ctype to be +// saved in the new GraphBLAS type, however. It is given a generic name. -/* +// If SuiteSparse:GraphBLAS is compiled with -DNMACRO then the macro versions +// of GrB_Type_new, GrB_UnaryOp_new, GrB_BinaryOp_new, and GxB_SelectOp_new +// are not made available. The function versions are always used instead. +// #define NMACRO + +#undef GrB_Type_new GrB_Info GrB_Type_new // create a new GraphBLAS type ( GrB_Type *type, // handle of user type to create - // a C type + size_t sizeof_ctype // size = sizeof (ctype) of the C type ) ; -*/ -// USER CODE SHOULD NOT RELY ON GB_STR OR GB_XSTR +// user code should not directly use GB_STR or GB_XSTR // GB_STR: convert the content of x into a string "x" #define GB_XSTR(x) GB_STR(x) #define GB_STR(x) #x -// GrB_Type_new is user-callable; GB_Type_new should not be called directly. -#define GrB_Type_new(utype, ctype) \ - GB_Type_new (utype, sizeof (ctype), GB_STR(ctype)) - -// This function is not user-callable; use GrB_Type_new instead +// GrB_Type_new as a user-callable macro, which allows the name of the ctype +// to be added to the new type. +#ifndef NMACRO +#define GrB_Type_new(utype, sizeof_ctype) \ + GB_Type_new (utype, sizeof_ctype, GB_STR(sizeof_ctype)) +#endif -GrB_Info GB_Type_new // USER CODE SHOULD NOT USE THIS FUNCTION DIRECTLY +GrB_Info GB_Type_new // not user-callable; use GrB_Type_new instead ( GrB_Type *type, // handle of user type to create - const size_t size, // size of the user type - const char *name // name of the type + const size_t sizeof_ctype, // size of the user type + const char *name // name of the type, as "sizeof (ctype)" ) ; // SPEC: GxB_Type_size is an extension to the spec @@ -396,19 +397,7 @@ GrB_Info GrB_Type_free // free a user-defined type // ztype and xtype, respectively. The function must typecast its arguments as // needed from void* to ztype* and xtype*. -typedef struct -{ - int64_t magic ; // for detecting uninitialized objects - GrB_Type xtype ; // type of x - GrB_Type ztype ; // type of z - void *function ; // a pointer to the unary function - char name [GB_LEN] ; // name of the unary operator - int opcode ; // operator opcode -} -GB_UnaryOp_opaque ; // CONTENT NOT USER-ACCESSIBLE - -// The GrB_UnaryOp handle (user-accesible) -typedef GB_UnaryOp_opaque *GrB_UnaryOp ; +typedef struct GB_UnaryOp_opaque *GrB_UnaryOp ; //------------------------------------------------------------------------------ // built-in unary operators, z = f(x) @@ -461,11 +450,12 @@ extern GrB_UnaryOp // methods for unary operators //------------------------------------------------------------------------------ -// The user-callable function GrB_UnaryOp_new has the following signature. It -// is actually implemented as a macro so that the name of the unary function -// can be kept by GraphBLAS. +// GrB_UnaryOp_new is implemented both as a macro and a function. Both are +// user-callable. The default is to use the macro, since this allows the name +// of the unary function to be kept in the new operator as a string. See the +// discussion of GrB_Type_new above. -/* +#undef GrB_UnaryOp_new GrB_Info GrB_UnaryOp_new // create a new user-defined unary operator ( @@ -475,13 +465,11 @@ GrB_Info GrB_UnaryOp_new // create a new user-defined unary operator const GrB_Type xtype // type of input x ) ; -*/ - +#ifndef NMACRO #define GrB_UnaryOp_new(op,f,z,x) GB_UnaryOp_new (op,f,z,x, GB_STR(f)) +#endif -// This function is NOT user-callable: - -GrB_Info GB_UnaryOp_new // USER CODE SHOULD NOT USE THIS FUNCTION DIRECTLY +GrB_Info GB_UnaryOp_new // not user-callable; use GrB_UnaryOp_new ( GrB_UnaryOp *unaryop, // handle for the new unary operator void *function, // pointer to the unary function @@ -522,20 +510,7 @@ GrB_Info GrB_UnaryOp_free // free a user-created unary operator // The pointers are void * but they are always of pointers to objects of type // ztype, xtype, and ytype, respectively. See Demo/usercomplex.c for examples. -typedef struct -{ - int64_t magic ; // for detecting uninitialized objects - GrB_Type xtype ; // type of x - GrB_Type ytype ; // type of y - GrB_Type ztype ; // type of z - void *function ; // a pointer to the binary function - char name [GB_LEN] ; // name of the binary operator - int opcode ; // operator opcode -} -GB_BinaryOp_opaque ; // CONTENT NOT USER-ACCESSIBLE - -// The GrB_BinaryOp handle (user-accesible) -typedef GB_BinaryOp_opaque *GrB_BinaryOp ; +typedef struct GB_BinaryOp_opaque *GrB_BinaryOp ; //------------------------------------------------------------------------------ // built-in binary operators, z = f(x,y) @@ -757,11 +732,12 @@ extern GrB_BinaryOp // methods for binary operators //------------------------------------------------------------------------------ -// The user-callable function GxB_BinaryOp_new has the following signature. It -// is implemented as a macro so that the name of the select function can be -// kept by GraphBLAS. +// GrB_BinaryOp_new is implemented both as a macro and a function. Both are +// user-callable. The default is to use the macro, since this allows the name +// of the unary function to be kept in the new operator as a string. See the +// discussion of GrB_Type_new above. -/* +#undef GrB_BinaryOp_new GrB_Info GrB_BinaryOp_new ( @@ -772,13 +748,11 @@ GrB_Info GrB_BinaryOp_new const GrB_Type ytype // type of input y ) ; -*/ - +#ifndef NMACRO #define GrB_BinaryOp_new(op,f,z,x,y) GB_BinaryOp_new (op,f,z,x,y, GB_STR(f)) +#endif -// This function is NOT user-callable: - -GrB_Info GB_BinaryOp_new // USER CODE SHOULD NOT USE THIS FUNCTION DIRECTLY +GrB_Info GB_BinaryOp_new // not user-callable; use GrB_BinaryOp_new ( GrB_BinaryOp *binaryop, // handle for the new binary operator void *function, // pointer to the binary function @@ -788,7 +762,6 @@ GrB_Info GB_BinaryOp_new // USER CODE SHOULD NOT USE THIS FUNCTION DIRECTLY const char *name // name of the underlying function ) ; - // SPEC: GxB_BinaryOp_ztype is an extension to the spec GrB_Info GxB_BinaryOp_ztype // return the type of z @@ -844,18 +817,7 @@ GrB_Info GrB_BinaryOp_free // free a user-created binary operator // const GrB_Index nrows, const GrB_Index ncols, // const void *x, const void *k) ; -typedef struct -{ - int64_t magic ; // for detecting uninitialized objects - GrB_Type xtype ; // type of x, or NULL if generic - void *function ; // a pointer to the select function - char name [GB_LEN] ; // name of the select operator - int opcode ; // operator opcode -} -GB_SelectOp_opaque ; // CONTENT NOT USER-ACCESSIBLE - -// The GxB_SelectOp handle (user-accesible) -typedef GB_SelectOp_opaque *GxB_SelectOp ; +typedef struct GB_SelectOp_opaque *GxB_SelectOp ; //------------------------------------------------------------------------------ // built-in select operators @@ -886,11 +848,12 @@ extern GxB_SelectOp // select operators //------------------------------------------------------------------------------ -// The user-callable function GxB_SelectOp_new has the following signature. It -// is implemented as a macro so that the name of the select function can be -// kept by GraphBLAS. +// GxB_SelectOp_new is implemented both as a macro and a function. Both are +// user-callable. The default is to use the macro, since this allows the name +// of the select function to be kept in the new operator as a string. See the +// discussion of GrB_Type_new above. -/* +#undef GxB_SelectOp_new GrB_Info GxB_SelectOp_new // create a new user-defined select operator ( @@ -899,13 +862,11 @@ GrB_Info GxB_SelectOp_new // create a new user-defined select operator const GrB_Type xtype // type of input x, or NULL if type-generic ) ; -*/ - +#ifndef NMACRO #define GxB_SelectOp_new(op,f,x) GB_SelectOp_new (op,f,x, GB_STR(f)) +#endif -// This function is NOT user-callable: - -GrB_Info GB_SelectOp_new // USER CODE SHOULD NOT USE THIS FUNCTION DIRECTLY +GrB_Info GB_SelectOp_new // not user-callable; use GxB_SelectOp_new ( GxB_SelectOp *selectop, // handle for the new select operator void *function, // pointer to the select function @@ -932,100 +893,89 @@ GrB_Info GxB_SelectOp_free // free a user-created select operator // and y are identical. The monoid also has an identity element, such that // op(x,identity) = op(identity,x) = x. -typedef struct -{ - int64_t magic ; // for detecting uninitialized objects - GrB_BinaryOp op ; // binary operator of the monoid - void *identity ; // identity of the monoid; size is op->ztype->size - bool identity_is_zero ; // true if all bits of identity are zero - bool user_defined ; // true if monoid is user-defined -} -GB_Monoid_opaque ; // CONTENT NOT USER-ACCESSIBLE - -// The GrB_Monoid handle (user-accesible) -typedef GB_Monoid_opaque *GrB_Monoid ; +typedef struct GB_Monoid_opaque *GrB_Monoid ; // Create a new Monoid with a specific type of identity, which must match // the binary_op type. The binary_op's three types must all be the same. -GrB_Info GrB_Monoid_BOOL_new // create a new boolean monoid +GrB_Info GrB_Monoid_new_BOOL // create a new boolean monoid ( GrB_Monoid *monoid, // handle of monoid to create const GrB_BinaryOp op, // binary operator of the monoid const bool identity // identity value of the monoid ) ; -GrB_Info GrB_Monoid_INT8_new // create a new int8 monoid +GrB_Info GrB_Monoid_new_INT8 // create a new int8 monoid ( GrB_Monoid *monoid, // handle of monoid to create const GrB_BinaryOp op, // binary operator of the monoid const int8_t identity // identity value of the monoid ) ; -GrB_Info GrB_Monoid_UINT8_new // create a new uint8 monoid +GrB_Info GrB_Monoid_new_UINT8 // create a new uint8 monoid ( GrB_Monoid *monoid, // handle of monoid to create const GrB_BinaryOp op, // binary operator of the monoid const uint8_t identity // identity value of the monoid ) ; -GrB_Info GrB_Monoid_INT16_new // create a new int16 monoid +GrB_Info GrB_Monoid_new_INT16 // create a new int16 monoid ( GrB_Monoid *monoid, // handle of monoid to create const GrB_BinaryOp op, // binary operator of the monoid const int16_t identity // identity value of the monoid ) ; -GrB_Info GrB_Monoid_UINT16_new // create a new uint16 monoid +GrB_Info GrB_Monoid_new_UINT16 // create a new uint16 monoid ( GrB_Monoid *monoid, // handle of monoid to create const GrB_BinaryOp op, // binary operator of the monoid const uint16_t identity // identity value of the monoid ) ; -GrB_Info GrB_Monoid_INT32_new // create a new int32 monoid +GrB_Info GrB_Monoid_new_INT32 // create a new int32 monoid ( GrB_Monoid *monoid, // handle of monoid to create const GrB_BinaryOp op, // binary operator of the monoid const int32_t identity // identity value of the monoid ) ; -GrB_Info GrB_Monoid_UINT32_new // create a new uint32 monoid +GrB_Info GrB_Monoid_new_UINT32 // create a new uint32 monoid ( GrB_Monoid *monoid, // handle of monoid to create const GrB_BinaryOp op, // binary operator of the monoid const uint32_t identity // identity value of the monoid ) ; -GrB_Info GrB_Monoid_INT64_new // create a new int64 monoid +GrB_Info GrB_Monoid_new_INT64 // create a new int64 monoid ( GrB_Monoid *monoid, // handle of monoid to create const GrB_BinaryOp op, // binary operator of the monoid const int64_t identity // identity value of the monoid ) ; -GrB_Info GrB_Monoid_UINT64_new // create a new uint64 monoid +GrB_Info GrB_Monoid_new_UINT64 // create a new uint64 monoid ( GrB_Monoid *monoid, // handle of monoid to create const GrB_BinaryOp op, // binary operator of the monoid const uint64_t identity // identity value of the monoid ) ; -GrB_Info GrB_Monoid_FP32_new // create a new float monoid +GrB_Info GrB_Monoid_new_FP32 // create a new float monoid ( GrB_Monoid *monoid, // handle of monoid to create const GrB_BinaryOp op, // binary operator of the monoid const float identity // identity value of the monoid ) ; -GrB_Info GrB_Monoid_FP64_new // create a new double monoid +GrB_Info GrB_Monoid_new_FP64 // create a new double monoid ( GrB_Monoid *monoid, // handle of monoid to create const GrB_BinaryOp op, // binary operator of the monoid const double identity // identity value of the monoid ) ; -GrB_Info GrB_Monoid_UDT_new // create a monoid with a user-defined type +GrB_Info GrB_Monoid_new_UDT // create a monoid with a user-defined type ( GrB_Monoid *monoid, // handle of monoid to create const GrB_BinaryOp op, // binary operator of the monoid @@ -1049,30 +999,30 @@ GrB_Info GrB_Monoid_new // create a monoid _Generic \ ( \ (identity), \ - const bool : GrB_Monoid_BOOL_new , \ - bool : GrB_Monoid_BOOL_new , \ - const int8_t : GrB_Monoid_INT8_new , \ - int8_t : GrB_Monoid_INT8_new , \ - const uint8_t : GrB_Monoid_UINT8_new , \ - uint8_t : GrB_Monoid_UINT8_new , \ - const int16_t : GrB_Monoid_INT16_new , \ - int16_t : GrB_Monoid_INT16_new , \ - const uint16_t : GrB_Monoid_UINT16_new , \ - uint16_t : GrB_Monoid_UINT16_new , \ - const int32_t : GrB_Monoid_INT32_new , \ - int32_t : GrB_Monoid_INT32_new , \ - const uint32_t : GrB_Monoid_UINT32_new , \ - uint32_t : GrB_Monoid_UINT32_new , \ - const int64_t : GrB_Monoid_INT64_new , \ - int64_t : GrB_Monoid_INT64_new , \ - const uint64_t : GrB_Monoid_UINT64_new , \ - uint64_t : GrB_Monoid_UINT64_new , \ - const float : GrB_Monoid_FP32_new , \ - float : GrB_Monoid_FP32_new , \ - const double : GrB_Monoid_FP64_new , \ - double : GrB_Monoid_FP64_new , \ - const void * : GrB_Monoid_UDT_new , \ - void * : GrB_Monoid_UDT_new \ + const bool : GrB_Monoid_new_BOOL , \ + bool : GrB_Monoid_new_BOOL , \ + const int8_t : GrB_Monoid_new_INT8 , \ + int8_t : GrB_Monoid_new_INT8 , \ + const uint8_t : GrB_Monoid_new_UINT8 , \ + uint8_t : GrB_Monoid_new_UINT8 , \ + const int16_t : GrB_Monoid_new_INT16 , \ + int16_t : GrB_Monoid_new_INT16 , \ + const uint16_t : GrB_Monoid_new_UINT16 , \ + uint16_t : GrB_Monoid_new_UINT16 , \ + const int32_t : GrB_Monoid_new_INT32 , \ + int32_t : GrB_Monoid_new_INT32 , \ + const uint32_t : GrB_Monoid_new_UINT32 , \ + uint32_t : GrB_Monoid_new_UINT32 , \ + const int64_t : GrB_Monoid_new_INT64 , \ + int64_t : GrB_Monoid_new_INT64 , \ + const uint64_t : GrB_Monoid_new_UINT64 , \ + uint64_t : GrB_Monoid_new_UINT64 , \ + const float : GrB_Monoid_new_FP32 , \ + float : GrB_Monoid_new_FP32 , \ + const double : GrB_Monoid_new_FP64 , \ + double : GrB_Monoid_new_FP64 , \ + const void * : GrB_Monoid_new_UDT , \ + void * : GrB_Monoid_new_UDT \ ) \ (monoid, op, identity) ; @@ -1107,17 +1057,7 @@ GrB_Info GrB_Monoid_free // free a user-created monoid // defines a function z=fmult(x,y) where the type of z matches the exactly with // the monoid type. -typedef struct -{ - int64_t magic ; // for detecting uninitialized objects - GrB_Monoid add ; // add operator of the semiring - GrB_BinaryOp multiply ; // multiply operator of the semiring - bool user_defined ; // true if semiring is user-defined -} -GB_Semiring_opaque ; // CONTENT NOT USER-ACCESSIBLE - -// The GrB_Semiring handle (user-accesible) -typedef GB_Semiring_opaque *GrB_Semiring ; +typedef struct GB_Semiring_opaque *GrB_Semiring ; GrB_Info GrB_Semiring_new // create a semiring ( @@ -1170,71 +1110,9 @@ GrB_Info GrB_Semiring_free // free a user-created semiring typedef uint64_t GrB_Index ; -// The GraphBLAS GrB_Matrix object; content not user-accessible - -typedef struct -{ - int64_t magic ; // for detecting uninitialized objects - GrB_Type type ; // the type of each numerical entry - int64_t nrows ; // number of rows - int64_t ncols ; // number of columns - int64_t nzmax ; // size of i and x arrays - int64_t *p ; // column pointers, array of size ncols+1 - int64_t *i ; // row indices, array of size nzmax - void *x ; // values, size nzmax; each size A->type->size - bool p_shallow ; // true if p is a shallow copy - bool i_shallow ; // true if i is a shallow copy - bool x_shallow ; // true if x is a shallow copy - int64_t npending ; // number of pending tuples to add to the matrix - int64_t max_npending ; // size of ipending, jpending, and xpending arrays - bool sorted_pending ; // true if pending tuples are in sorted order - int64_t *ipending ; // row indices of pending tuples - int64_t *jpending ; // col indices of pending tuples; NULL if ncols <= 1 - void *xpending ; // values of pending tuples - GrB_BinaryOp operator_pending ; // operator to assemble duplications - int64_t nzombies ; // number of zombines marked for deletion - void *queue_next ; // next matrix in the matrix queue - void *queue_prev ; // prev matrix in the matrix queue - bool enqueued ; // true if the matrix is in the queue -} -GB_Matrix_opaque ; // CONTENT NOT USER-ACCESSIBLE - -// The GrB_Matrix handle (user-accesible) -typedef GB_Matrix_opaque *GrB_Matrix ; +typedef struct GB_Matrix_opaque *GrB_Matrix ; -// The GraphBLAS GrB_Vector object; content not user-accessible. The content -// is exactly the same as a GrB_Matrix (SuiteSparse:GraphBLAS requires these -// to objects to be identical in size and content). - -typedef struct -{ - int64_t magic ; // for detecting uninitialized objects - GrB_Type type ; // the type of each numerical entry - int64_t nrows ; // number of rows - int64_t ncols ; // always 1 - int64_t nzmax ; // size of i and x arrays - int64_t *p ; // column pointers, array of size ncols+1 == 2 - int64_t *i ; // row indices, array of size nzmax - void *x ; // values, size nzmax; each size A->type->size - bool p_shallow ; // true if p is a shallow copy - bool i_shallow ; // true if i is a shallow copy - bool x_shallow ; // true if x is a shallow copy - int64_t npending ; // number of pending tuples to add to the matrix - int64_t max_npending ; // size of ipending, jpending, and xpending arrays - bool sorted_pending ; // true if pending tuples are in sorted order - int64_t *ipending ; // row indices of pending tuples - int64_t *jpending ; // always NULL - void *xpending ; // values of pending tuples - GrB_BinaryOp operator_pending ; // operator to assemble duplications - int64_t nzombies ; // number of zombines marked for deletion - void *queue_next ; // next matrix in the matrix queue - void *queue_prev ; // prev matrix in the matrix queue - bool enqueued ; // true if the matrix is in the queue -} -GB_Vector_opaque ; // CONTENT NOT USER-ACCESSIBLE - -// The GrB_Vector handle (user-accesible) -typedef GB_Vector_opaque *GrB_Vector ; +typedef struct GB_Vector_opaque *GrB_Vector ; //============================================================================== //=== GraphBLAS Vector methods ================================================= @@ -2625,18 +2503,7 @@ typedef enum } GrB_Desc_Value ; -typedef struct -{ - int64_t magic ; // for detecting uninitialized objects - GrB_Desc_Value out ; // output descriptor - GrB_Desc_Value mask ; // mask descriptor - GrB_Desc_Value in0 ; // first input descriptor (A for C=A*B, for example) - GrB_Desc_Value in1 ; // second input descriptor (B for C=A*B) -} -GB_Descriptor_opaque ; // CONTENT NOT USER-ACCESSIBLE - -// The GrB_Descriptor handle (user-accesible) -typedef GB_Descriptor_opaque *GrB_Descriptor ; +typedef struct GB_Descriptor_opaque *GrB_Descriptor ; GrB_Info GrB_Descriptor_new // create a new descriptor ( @@ -4179,7 +4046,6 @@ GrB_Info GxB_Matrix_select // C = accum (C, op(A,k)) or op(A',k) ) \ (C, Mask, accum, op, A, k, desc) - //------------------------------------------------------------------------------ // matrix and vector reduction //------------------------------------------------------------------------------ @@ -5004,5 +4870,54 @@ GrB_Info GxB_stats GxB_Statistics *stats ) ; +//------------------------------------------------------------------------------ +// GxB_resize: change the size of a matrix or vector +//------------------------------------------------------------------------------ + +// If the dimensions decrease, entries that fall outside the resized matrix or +// vector are deleted + +GrB_Info GxB_Matrix_resize // change the size of a matrix +( + GrB_Matrix A, // matrix to modify + const GrB_Index nrows_new, // new number of rows in matrix + const GrB_Index ncols_new // new number of columns in matrix +) ; + +GrB_Info GxB_Vector_resize // change the size of a vector +( + GrB_Vector u, // vector to modify + const GrB_Index nrows_new // new number of rows in vector +) ; + +// GxB_resize is a generic function for resizing a matrix or vector + +// GrB_Vector_resize (u,nrows_new) +// GrB_Matrix_resize (A,nrows_new,ncols_new) + +#define GxB_resize(arg1,...) \ + _Generic \ + ( \ + (arg1), \ + GrB_Vector : GxB_Vector_resize , \ + GrB_Matrix : GxB_Matrix_resize \ + ) \ + (arg1, __VA_ARGS__) + +//------------------------------------------------------------------------------ +// GxB_kron: Kronecker product +//------------------------------------------------------------------------------ + +GrB_Info GxB_kron // C = accum (C, kron(A,B)) +( + GrB_Matrix C, // input/output matrix for results + const GrB_Matrix Mask, // optional mask for C, unused if NULL + const GrB_BinaryOp accum, // optional accum for Z=accum(C,T) + const GrB_BinaryOp op, // defines '*' for T=kron(A,B) + const GrB_Matrix A, // first input: matrix A + const GrB_Matrix B, // second input: matrix B + const GrB_Descriptor desc // descriptor for C, Mask, A, and B +) ; + #endif diff --git a/GraphBLAS/Makefile b/GraphBLAS/Makefile index d678cdd502..21772d8a21 100644 --- a/GraphBLAS/Makefile +++ b/GraphBLAS/Makefile @@ -2,7 +2,7 @@ # GraphBLAS/Makefile #------------------------------------------------------------------------------- -# SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +# SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. # http://suitesparse.com See GraphBLAS/Doc/License.txt for license. #------------------------------------------------------------------------------- diff --git a/GraphBLAS/README.txt b/GraphBLAS/README.txt index f862ebbe54..f8a19bb6d1 100644 --- a/GraphBLAS/README.txt +++ b/GraphBLAS/README.txt @@ -1,7 +1,7 @@ -SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. http://suitesparse.com See GraphBLAS/Doc/License.txt for license. -VERSION 1.1.2, Dec 28, 2017 +VERSION 2.0.1, Mar 15, 2018 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.h b/GraphBLAS/Source/GB.h index e11488541d..da117e6808 100644 --- a/GraphBLAS/Source/GB.h +++ b/GraphBLAS/Source/GB.h @@ -2,7 +2,7 @@ // GB.h: definitions visible only inside GraphBLAS //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ @@ -39,6 +39,131 @@ // uncomment this for code development (additional diagnostics are printed): // #define DEVELOPER +//------------------------------------------------------------------------------ +// opaque content of GraphBLAS objects +//------------------------------------------------------------------------------ + +#define GB_LEN 128 + +struct GB_Type_opaque // content of GrB_Type +{ + int64_t magic ; // for detecting uninitialized objects + size_t size ; // size of the type + int code ; // the type code + char name [GB_LEN] ; // name of the type +} ; + +struct GB_UnaryOp_opaque // content of GrB_UnaryOp +{ + int64_t magic ; // for detecting uninitialized objects + GrB_Type xtype ; // type of x + GrB_Type ztype ; // type of z + void *function ; // a pointer to the unary function + char name [GB_LEN] ; // name of the unary operator + int opcode ; // operator opcode +} ; + +struct GB_BinaryOp_opaque // content of GrB_BinaryOp +{ + int64_t magic ; // for detecting uninitialized objects + GrB_Type xtype ; // type of x + GrB_Type ytype ; // type of y + GrB_Type ztype ; // type of z + void *function ; // a pointer to the binary function + char name [GB_LEN] ; // name of the binary operator + int opcode ; // operator opcode +} ; + +struct GB_SelectOp_opaque // content of GxB_SelectOp +{ + int64_t magic ; // for detecting uninitialized objects + GrB_Type xtype ; // type of x, or NULL if generic + void *function ; // a pointer to the select function + char name [GB_LEN] ; // name of the select operator + int opcode ; // operator opcode +} ; + +struct GB_Monoid_opaque // content of GrB_Monoid +{ + int64_t magic ; // for detecting uninitialized objects + GrB_BinaryOp op ; // binary operator of the monoid + void *identity ; // identity of the monoid; size is op->ztype->size + bool identity_is_zero ; // true if all bits of identity are zero + bool user_defined ; // true if monoid is user-defined +} ; + +struct GB_Semiring_opaque // content of GrB_Semiring +{ + int64_t magic ; // for detecting uninitialized objects + GrB_Monoid add ; // add operator of the semiring + GrB_BinaryOp multiply ; // multiply operator of the semiring + bool user_defined ; // true if semiring is user-defined +} ; + +// The GraphBLAS GrB_Vector and GrB_Matrix objects are identical so that +// SuiteSparse:GraphBLAS can typecast from one to the other. + +struct GB_Vector_opaque // content of GrB_Vector +{ + int64_t magic ; // for detecting uninitialized objects + GrB_Type type ; // the type of each numerical entry + int64_t nrows ; // number of rows + int64_t ncols ; // always 1 + int64_t nzmax ; // size of i and x arrays + int64_t *p ; // column pointers, array of size ncols+1 == 2 + int64_t *i ; // row indices, array of size nzmax + void *x ; // values, size nzmax; each size A->type->size + bool p_shallow ; // true if p is a shallow copy + bool i_shallow ; // true if i is a shallow copy + bool x_shallow ; // true if x is a shallow copy + int64_t npending ; // number of pending tuples to add to the matrix + int64_t max_npending ; // size of ipending, jpending, and xpending arrays + bool sorted_pending ; // true if pending tuples are in sorted order + int64_t *ipending ; // row indices of pending tuples + int64_t *jpending ; // always NULL + void *xpending ; // values of pending tuples + GrB_BinaryOp operator_pending ; // operator to assemble duplications + int64_t nzombies ; // number of zombines marked for deletion + void *queue_next ; // next matrix in the matrix queue + void *queue_prev ; // prev matrix in the matrix queue + bool enqueued ; // true if the matrix is in the queue +} ; + +struct GB_Matrix_opaque // content of GrB_Matrix +{ + int64_t magic ; // for detecting uninitialized objects + GrB_Type type ; // the type of each numerical entry + int64_t nrows ; // number of rows + int64_t ncols ; // number of columns + int64_t nzmax ; // size of i and x arrays + int64_t *p ; // column pointers, array of size ncols+1 + int64_t *i ; // row indices, array of size nzmax + void *x ; // values, size nzmax; each size A->type->size + bool p_shallow ; // true if p is a shallow copy + bool i_shallow ; // true if i is a shallow copy + bool x_shallow ; // true if x is a shallow copy + int64_t npending ; // number of pending tuples to add to the matrix + int64_t max_npending ; // size of ipending, jpending, and xpending arrays + bool sorted_pending ; // true if pending tuples are in sorted order + int64_t *ipending ; // row indices of pending tuples + int64_t *jpending ; // col indices of pending tuples; NULL if ncols <= 1 + void *xpending ; // values of pending tuples + GrB_BinaryOp operator_pending ; // operator to assemble duplications + int64_t nzombies ; // number of zombines marked for deletion + void *queue_next ; // next matrix in the matrix queue + void *queue_prev ; // prev matrix in the matrix queue + bool enqueued ; // true if the matrix is in the queue +} ; + +struct GB_Descriptor_opaque // content of GrB_Descriptor +{ + int64_t magic ; // for detecting uninitialized objects + GrB_Desc_Value out ; // output descriptor + GrB_Desc_Value mask ; // mask descriptor + GrB_Desc_Value in0 ; // first input descriptor (A for C=A*B, for example) + GrB_Desc_Value in1 ; // second input descriptor (B for C=A*B) +} ; + //------------------------------------------------------------------------------ // GB_INDEX_MAX //------------------------------------------------------------------------------ @@ -318,7 +443,7 @@ typedef enum GB_Type_code ; // enumerated type code // predefined type objects -extern GB_Type_opaque +extern struct GB_Type_opaque GB_opaque_BOOL , // GrB_BOOL is a pointer to this object, etc. GB_opaque_INT8 , GB_opaque_UINT8 , @@ -1366,6 +1491,35 @@ char *GB_code_string // return a static string for a type name const GB_Type_code code // code to convert to string ) ; +GrB_Info GB_resize // change the size of a matrix +( + GrB_Matrix A, // matrix to modify + const GrB_Index nrows_new, // new number of rows in matrix + const GrB_Index ncols_new // new number of columns in matrix +) ; + +GrB_Info GB_kron // C = accum (C, kron(A,B)) +( + GrB_Matrix C, // input/output matrix for results + const bool C_replace, // if true, clear C before writing to it + const GrB_Matrix Mask, // optional mask for C, unused if NULL + const bool Mask_comp, // if true, use ~Mask + const GrB_BinaryOp accum, // optional accum for Z=accum(C,T) + const GrB_BinaryOp op, // defines '*' for kron(A,B) + const GrB_Matrix A, // input matrix + const bool A_transpose, // if true, use A' instead of A + const GrB_Matrix B, // input matrix + const bool B_transpose // if true, use B' instead of B +) ; + +void GB_kron_kernel // C = kron (A,B) +( + GrB_Matrix C, // output matrix + const GrB_BinaryOp op, // multiply operator + const GrB_Matrix A, // input matrix + const GrB_Matrix B // input matrix +) ; + //------------------------------------------------------------------------------ // Global storage: for all threads in a user application that uses GraphBLAS //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_AxB_builtin.c b/GraphBLAS/Source/GB_AxB_builtin.c index 5374f0ce74..ed9c496468 100644 --- a/GraphBLAS/Source/GB_AxB_builtin.c +++ b/GraphBLAS/Source/GB_AxB_builtin.c @@ -2,7 +2,7 @@ // GB_AxB_builtin: hard-coded C=A*B for built-in types //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_AxB_flopcount.c b/GraphBLAS/Source/GB_AxB_flopcount.c index 12ab38e0c4..bb853e3fff 100644 --- a/GraphBLAS/Source/GB_AxB_flopcount.c +++ b/GraphBLAS/Source/GB_AxB_flopcount.c @@ -2,7 +2,7 @@ // GB_AxB_flopcount: find the flop count for C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_AxB_methods.h b/GraphBLAS/Source/GB_AxB_methods.h index 9f2daa20f3..860c5672fb 100644 --- a/GraphBLAS/Source/GB_AxB_methods.h +++ b/GraphBLAS/Source/GB_AxB_methods.h @@ -2,7 +2,7 @@ // GB_AxB_methods.h: definitions for GB_AxB_builtin.c and GB_Matrix_AdotB.c //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_AxB_numeric.c b/GraphBLAS/Source/GB_AxB_numeric.c index a35f80e26c..8037f57a13 100644 --- a/GraphBLAS/Source/GB_AxB_numeric.c +++ b/GraphBLAS/Source/GB_AxB_numeric.c @@ -2,7 +2,7 @@ // GB_AxB_numeric: compute the values of C = A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_AxB_symbolic.c b/GraphBLAS/Source/GB_AxB_symbolic.c index 893e6cc562..75e477e796 100644 --- a/GraphBLAS/Source/GB_AxB_symbolic.c +++ b/GraphBLAS/Source/GB_AxB_symbolic.c @@ -2,7 +2,7 @@ // GB_AxB_symbolic: find the pattern of C = A*B or variations //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_BinaryOp_check.c b/GraphBLAS/Source/GB_BinaryOp_check.c index 5bed661c25..de14961989 100644 --- a/GraphBLAS/Source/GB_BinaryOp_check.c +++ b/GraphBLAS/Source/GB_BinaryOp_check.c @@ -2,7 +2,7 @@ // GB_BinaryOp_check: check and print a binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_BinaryOp_compatible.c b/GraphBLAS/Source/GB_BinaryOp_compatible.c index da085383dc..254c48f390 100644 --- a/GraphBLAS/Source/GB_BinaryOp_compatible.c +++ b/GraphBLAS/Source/GB_BinaryOp_compatible.c @@ -2,7 +2,7 @@ // GB_BinaryOp_compatible: check binary operator for type compatibility //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_BinaryOp_new.c b/GraphBLAS/Source/GB_BinaryOp_new.c index 8e76673d11..73d9710f33 100644 --- a/GraphBLAS/Source/GB_BinaryOp_new.c +++ b/GraphBLAS/Source/GB_BinaryOp_new.c @@ -2,7 +2,7 @@ // GB_BinaryOp_new: create a new binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ @@ -43,7 +43,7 @@ GrB_Info GB_BinaryOp_new //-------------------------------------------------------------------------- // allocate the binary operator - GB_CALLOC_MEMORY (*binaryop, 1, sizeof (GB_BinaryOp_opaque)) ; + GB_CALLOC_MEMORY (*binaryop, 1, sizeof (struct GB_BinaryOp_opaque)) ; if (*binaryop == NULL) { return (ERROR (GrB_OUT_OF_MEMORY, (LOG, "out of memory"))) ; diff --git a/GraphBLAS/Source/GB_Descriptor_check.c b/GraphBLAS/Source/GB_Descriptor_check.c index 49b4598e99..dceb3785c6 100644 --- a/GraphBLAS/Source/GB_Descriptor_check.c +++ b/GraphBLAS/Source/GB_Descriptor_check.c @@ -2,7 +2,7 @@ // GB_Descriptor_check: check and print a Descriptor //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_Descriptor_get.c b/GraphBLAS/Source/GB_Descriptor_get.c index 42ee95cf03..eefc22a7a4 100644 --- a/GraphBLAS/Source/GB_Descriptor_get.c +++ b/GraphBLAS/Source/GB_Descriptor_get.c @@ -2,7 +2,7 @@ // GB_Descriptor_get: get the status of a descriptor //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_Entry_print.c b/GraphBLAS/Source/GB_Entry_print.c index 9270682c99..787e43aad0 100644 --- a/GraphBLAS/Source/GB_Entry_print.c +++ b/GraphBLAS/Source/GB_Entry_print.c @@ -2,7 +2,7 @@ // GB_Entry_print: print a single entry for a built-in type //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_Flag_alloc.c b/GraphBLAS/Source/GB_Flag_alloc.c index 7062dc9824..5e2091c708 100644 --- a/GraphBLAS/Source/GB_Flag_alloc.c +++ b/GraphBLAS/Source/GB_Flag_alloc.c @@ -2,7 +2,7 @@ // GB_Flag_alloc: ensure Flag workspace is large enough //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_Flag_free.c b/GraphBLAS/Source/GB_Flag_free.c index 7b58b1ba4f..84e498e40d 100644 --- a/GraphBLAS/Source/GB_Flag_free.c +++ b/GraphBLAS/Source/GB_Flag_free.c @@ -2,7 +2,7 @@ // GB_Flag_free: free the Flag workspace array //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_Index_multiply.c b/GraphBLAS/Source/GB_Index_multiply.c index 6c05a88611..a595262d40 100644 --- a/GraphBLAS/Source/GB_Index_multiply.c +++ b/GraphBLAS/Source/GB_Index_multiply.c @@ -2,7 +2,7 @@ // GB_Index_multiply: multiply two integers and guard against overflow //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_Mark_alloc.c b/GraphBLAS/Source/GB_Mark_alloc.c index 59d6d524cb..49740c57b4 100644 --- a/GraphBLAS/Source/GB_Mark_alloc.c +++ b/GraphBLAS/Source/GB_Mark_alloc.c @@ -2,7 +2,7 @@ // GB_Mark_alloc: ensure Mark workspace is large enough //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_Mark_free.c b/GraphBLAS/Source/GB_Mark_free.c index 27e790b19c..451cc18230 100644 --- a/GraphBLAS/Source/GB_Mark_free.c +++ b/GraphBLAS/Source/GB_Mark_free.c @@ -2,7 +2,7 @@ // GB_Mark_free: free the Mark workspace array //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_Mark_reset.c b/GraphBLAS/Source/GB_Mark_reset.c index 9f7c89ae7f..48f0bc7f15 100644 --- a/GraphBLAS/Source/GB_Mark_reset.c +++ b/GraphBLAS/Source/GB_Mark_reset.c @@ -2,7 +2,7 @@ // GB_Mark_reset: increment the Mark workspace flag //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_Mask_compatible.c b/GraphBLAS/Source/GB_Mask_compatible.c index 148ee60574..692decc70d 100644 --- a/GraphBLAS/Source/GB_Mask_compatible.c +++ b/GraphBLAS/Source/GB_Mask_compatible.c @@ -2,7 +2,7 @@ // GB_Mask_compatible: check input and operators for type compatibility //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_Matrix_AdotB.c b/GraphBLAS/Source/GB_Matrix_AdotB.c index adff517dd0..fbe00732eb 100644 --- a/GraphBLAS/Source/GB_Matrix_AdotB.c +++ b/GraphBLAS/Source/GB_Matrix_AdotB.c @@ -2,7 +2,7 @@ // GB_Matrix_AdotB: compute C = Mask.*(A'*B) without forming A' via dot products //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ @@ -481,8 +481,10 @@ GrB_Info GB_Matrix_AdotB // C = A'*B using dot product method } } } + // log the end of the last column Cp [n] = cnz ; + ASSERT (cnz <= C->nzmax) ; } //-------------------------------------------------------------------------- @@ -490,7 +492,6 @@ GrB_Info GB_Matrix_AdotB // C = A'*B using dot product method //-------------------------------------------------------------------------- C->magic = MAGIC ; // C is now initialized ] - ASSERT (cnz <= C->nzmax) ; bool ok = GB_Matrix_realloc (C, NNZ (C), true, NULL) ; ASSERT (ok) ; ASSERT_OK (GB_check (C, "C = A'*B output", 0)) ; diff --git a/GraphBLAS/Source/GB_Matrix_add.c b/GraphBLAS/Source/GB_Matrix_add.c index 1d3f04f92c..4996662e95 100644 --- a/GraphBLAS/Source/GB_Matrix_add.c +++ b/GraphBLAS/Source/GB_Matrix_add.c @@ -2,7 +2,7 @@ // GB_Matrix_add: 'add' two matrices using an operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_Matrix_alloc.c b/GraphBLAS/Source/GB_Matrix_alloc.c index cc1851425a..e45357157f 100644 --- a/GraphBLAS/Source/GB_Matrix_alloc.c +++ b/GraphBLAS/Source/GB_Matrix_alloc.c @@ -2,7 +2,7 @@ // GB_Matrix_alloc: allocate a matrix to hold a given number of entries //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_Matrix_check.c b/GraphBLAS/Source/GB_Matrix_check.c index 045cf76bfb..b3d1820b09 100644 --- a/GraphBLAS/Source/GB_Matrix_check.c +++ b/GraphBLAS/Source/GB_Matrix_check.c @@ -2,7 +2,7 @@ // GB_Matrix_check: print a GraphBLAS matrix and check if it is valid //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_Matrix_clear.c b/GraphBLAS/Source/GB_Matrix_clear.c index caac442ac4..411397bf40 100644 --- a/GraphBLAS/Source/GB_Matrix_clear.c +++ b/GraphBLAS/Source/GB_Matrix_clear.c @@ -2,7 +2,7 @@ // GB_Matrix_clear: clears the content of a matrix //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_Matrix_dup.c b/GraphBLAS/Source/GB_Matrix_dup.c index 826d02437d..4ddf3a688b 100644 --- a/GraphBLAS/Source/GB_Matrix_dup.c +++ b/GraphBLAS/Source/GB_Matrix_dup.c @@ -2,7 +2,7 @@ // GB_Matrix_dup: make a deep copy of a sparse matrix //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_Matrix_emult.c b/GraphBLAS/Source/GB_Matrix_emult.c index c144ce1e7b..899807883f 100644 --- a/GraphBLAS/Source/GB_Matrix_emult.c +++ b/GraphBLAS/Source/GB_Matrix_emult.c @@ -2,7 +2,7 @@ // GB_Matrix_emult: element-wise "multiplication" of two matrices //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_Matrix_free.c b/GraphBLAS/Source/GB_Matrix_free.c index 72d590821a..7dc58c4aa5 100644 --- a/GraphBLAS/Source/GB_Matrix_free.c +++ b/GraphBLAS/Source/GB_Matrix_free.c @@ -2,7 +2,7 @@ // GB_Matrix_free: free a matrix //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ @@ -30,7 +30,7 @@ void GB_Matrix_free // free a matrix } A->p = NULL ; GB_Matrix_ixfree (A) ; - GB_FREE_MEMORY (*matrix, 1, sizeof (GB_Matrix_opaque)) ; + GB_FREE_MEMORY (*matrix, 1, sizeof (struct GB_Matrix_opaque)) ; } (*matrix) = NULL ; } diff --git a/GraphBLAS/Source/GB_Matrix_ixfree.c b/GraphBLAS/Source/GB_Matrix_ixfree.c index c211bfd566..918cd5d7a5 100644 --- a/GraphBLAS/Source/GB_Matrix_ixfree.c +++ b/GraphBLAS/Source/GB_Matrix_ixfree.c @@ -2,7 +2,7 @@ // GB_Matrix_ixfree: free A->i, A->x, pending tuples, zombies; A->p unchanged //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_Matrix_multiply.c b/GraphBLAS/Source/GB_Matrix_multiply.c index 40c2d5c8e3..9cb2616d2b 100644 --- a/GraphBLAS/Source/GB_Matrix_multiply.c +++ b/GraphBLAS/Source/GB_Matrix_multiply.c @@ -2,7 +2,7 @@ // GB_Matrix_multiply: symbolic and numeric C=A*B, A'*B, A*B', or A'*B' //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ @@ -133,15 +133,26 @@ GrB_Info GB_Matrix_multiply // C = A*B, A'*B, A*B', or A'*B' bool use_adotb ; if (Mask != NULL) { - // C = A'*B always uses the dot product method + // C = A'*B always uses the dot product method. This might + // not be the fastest method, but if the outer product method + // is faster, the user can always transpose A first (AT=A') and + // then compute C = AT*B, which uses the case above. + use_adotb = true ; + } + else if (C->nrows == 1 || C->ncols == 1) + { + // C = A'*B uses the dot product method if C is a vector use_adotb = true ; } else { - // C = A'*B uses the dot product method only if C is small + // when C is a matrix, C = A'*B uses the dot product method if + // the workspace required for C is much smaller than the + // workspace for transposing A or B. GrB_Index cwork ; bool ok = GB_Index_multiply (&cwork, C->nrows, C->ncols) ; - use_adotb = ok && cwork < IMIN (at_workspace, 4 * bt_workspace); + use_adotb = ok + && cwork < IMIN (at_workspace, 4 * bt_workspace) / 10000 ; } if (use_adotb) @@ -208,8 +219,8 @@ GrB_Info GB_Matrix_multiply // C = A*B, A'*B, A*B', or A'*B' // C = CT', no typecasting, no operator OK (GB_Matrix_transpose (C, CT, NULL, true)) ; - } + } } } else diff --git a/GraphBLAS/Source/GB_Matrix_nrows.c b/GraphBLAS/Source/GB_Matrix_nrows.c index a380d8a0c5..1d8897c241 100644 --- a/GraphBLAS/Source/GB_Matrix_nrows.c +++ b/GraphBLAS/Source/GB_Matrix_nrows.c @@ -2,7 +2,7 @@ // GB_Matrix_nrows: number of rows of a sparse matrix //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_Matrix_nvals.c b/GraphBLAS/Source/GB_Matrix_nvals.c index b0e8a4cfe4..310ba1235b 100644 --- a/GraphBLAS/Source/GB_Matrix_nvals.c +++ b/GraphBLAS/Source/GB_Matrix_nvals.c @@ -2,7 +2,7 @@ // GB_Matrix_nvals: number of entries in a sparse matrix //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_Matrix_realloc.c b/GraphBLAS/Source/GB_Matrix_realloc.c index 133e76d62e..529fff1648 100644 --- a/GraphBLAS/Source/GB_Matrix_realloc.c +++ b/GraphBLAS/Source/GB_Matrix_realloc.c @@ -2,7 +2,7 @@ // GB_Matrix_realloc: reallocate a matrix to hold a given number of entries //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_Matrix_transplant.c b/GraphBLAS/Source/GB_Matrix_transplant.c index ec3d4795ce..7fe4fa4eb4 100644 --- a/GraphBLAS/Source/GB_Matrix_transplant.c +++ b/GraphBLAS/Source/GB_Matrix_transplant.c @@ -2,7 +2,7 @@ // GB_Matrix_transplant: replace contents of one matrix with another //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_Matrix_transpose.c b/GraphBLAS/Source/GB_Matrix_transpose.c index 607087dd3a..85bb6eddf8 100644 --- a/GraphBLAS/Source/GB_Matrix_transpose.c +++ b/GraphBLAS/Source/GB_Matrix_transpose.c @@ -2,7 +2,7 @@ // GB_Matrix_transpose: transpose and optionally typecast and/or apply operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_Matrix_type.c b/GraphBLAS/Source/GB_Matrix_type.c index e05aa5e331..78b43ec514 100644 --- a/GraphBLAS/Source/GB_Matrix_type.c +++ b/GraphBLAS/Source/GB_Matrix_type.c @@ -2,7 +2,7 @@ // GB_Matrix_type: return the type of a matrix //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_Monoid_check.c b/GraphBLAS/Source/GB_Monoid_check.c index d2e3175355..c86feef966 100644 --- a/GraphBLAS/Source/GB_Monoid_check.c +++ b/GraphBLAS/Source/GB_Monoid_check.c @@ -2,7 +2,7 @@ // GB_Monoid_check: check and print a monoid //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_Monoid_new.c b/GraphBLAS/Source/GB_Monoid_new.c index 259032fb24..b71bd00df7 100644 --- a/GraphBLAS/Source/GB_Monoid_new.c +++ b/GraphBLAS/Source/GB_Monoid_new.c @@ -2,7 +2,7 @@ // GB_Monoid_new: create a Monoid with a specific type of identity //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ @@ -59,7 +59,7 @@ GrB_Info GB_Monoid_new // create a monoid //-------------------------------------------------------------------------- // allocate the monoid - GB_CALLOC_MEMORY (*monoid, 1, sizeof (GB_Monoid_opaque)) ; + GB_CALLOC_MEMORY (*monoid, 1, sizeof (struct GB_Monoid_opaque)) ; if (*monoid == NULL) { return (ERROR (GrB_OUT_OF_MEMORY, (LOG, "out of memory"))) ; @@ -73,7 +73,7 @@ GrB_Info GB_Monoid_new // create a monoid GB_MALLOC_MEMORY (mon->identity, 1, op->ztype->size) ; if (mon->identity == NULL) { - GB_FREE_MEMORY (*monoid, 1, sizeof (GB_Monoid_opaque)) ; + GB_FREE_MEMORY (*monoid, 1, sizeof (struct GB_Monoid_opaque)) ; return (ERROR (GrB_OUT_OF_MEMORY, (LOG, "out of memory"))) ; } diff --git a/GraphBLAS/Source/GB_SelectOp_check.c b/GraphBLAS/Source/GB_SelectOp_check.c index 0c195364eb..3ff3b5ff85 100644 --- a/GraphBLAS/Source/GB_SelectOp_check.c +++ b/GraphBLAS/Source/GB_SelectOp_check.c @@ -2,7 +2,7 @@ // GB_SelectOp_check: check and print a select operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_SelectOp_new.c b/GraphBLAS/Source/GB_SelectOp_new.c index f6b1f7a3e3..0d854a8b6b 100644 --- a/GraphBLAS/Source/GB_SelectOp_new.c +++ b/GraphBLAS/Source/GB_SelectOp_new.c @@ -2,7 +2,7 @@ // GB_SelectOp_new: create a new select operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ @@ -35,14 +35,13 @@ GrB_Info GB_SelectOp_new // create a new user-defined select operator (*selectop) = NULL ; RETURN_IF_NULL (function) ; RETURN_IF_UNINITIALIZED (xtype) ; // xtype may be NULL - ASSERT (name != NULL) ; //-------------------------------------------------------------------------- // create the select op //-------------------------------------------------------------------------- // allocate the select operator - GB_CALLOC_MEMORY (*selectop, 1, sizeof (GB_SelectOp_opaque)) ; + GB_CALLOC_MEMORY (*selectop, 1, sizeof (struct GB_SelectOp_opaque)) ; if (*selectop == NULL) { return (ERROR (GrB_OUT_OF_MEMORY, (LOG, "out of memory"))) ; diff --git a/GraphBLAS/Source/GB_Semiring_check.c b/GraphBLAS/Source/GB_Semiring_check.c index 4aa76cb1a4..fcdcc49f4b 100644 --- a/GraphBLAS/Source/GB_Semiring_check.c +++ b/GraphBLAS/Source/GB_Semiring_check.c @@ -2,7 +2,7 @@ // GB_Semiring_check: check and print a semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_Type_check.c b/GraphBLAS/Source/GB_Type_check.c index c5cc7b1c30..c84e824ba2 100644 --- a/GraphBLAS/Source/GB_Type_check.c +++ b/GraphBLAS/Source/GB_Type_check.c @@ -2,7 +2,7 @@ // GB_Type_check: print a built-in type //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_Type_code_compatible.c b/GraphBLAS/Source/GB_Type_code_compatible.c index 991f5fc9e9..6a707da6f5 100644 --- a/GraphBLAS/Source/GB_Type_code_compatible.c +++ b/GraphBLAS/Source/GB_Type_code_compatible.c @@ -2,7 +2,7 @@ // GB_Type_code_compatible: return true if domains are compatible //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_Type_compatible.c b/GraphBLAS/Source/GB_Type_compatible.c index 99291903df..a92be7a569 100644 --- a/GraphBLAS/Source/GB_Type_compatible.c +++ b/GraphBLAS/Source/GB_Type_compatible.c @@ -2,7 +2,7 @@ // GB_Type_compatible: return true if domains are compatible //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_Type_new.c b/GraphBLAS/Source/GB_Type_new.c index 0412a26b73..c178423c69 100644 --- a/GraphBLAS/Source/GB_Type_new.c +++ b/GraphBLAS/Source/GB_Type_new.c @@ -2,22 +2,21 @@ // GB_Type_new: create a new user-defined type //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ // This is not used for built-in types. Those are created statically. -// Users should not call this function directly; use GrB_Type_new instead, -// which is a macro #define'd in GraphBLAS.h. +// Users should not call this function directly; use GrB_Type_new instead. #include "GB.h" -GrB_Info GB_Type_new // create a new GraphBLAS type +GrB_Info GB_Type_new ( GrB_Type *type, // handle of user type to create - const size_t size, // size of the user type - const char *name // name of the type + const size_t sizeof_ctype, // size of the user type + const char *name // name of the type, as "sizeof (ctype)" ) { @@ -25,7 +24,7 @@ GrB_Info GB_Type_new // create a new GraphBLAS type // check inputs //-------------------------------------------------------------------------- - WHERE ("GrB_Type_new (&type, )") ; + WHERE ("GrB_Type_new (&type, sizeof (ctype))") ; RETURN_IF_NULL (type) ; (*type) = NULL ; @@ -34,7 +33,7 @@ GrB_Info GB_Type_new // create a new GraphBLAS type //-------------------------------------------------------------------------- // allocate the type - GB_CALLOC_MEMORY (*type, 1, sizeof (GB_Type_opaque)) ; + GB_CALLOC_MEMORY (*type, 1, sizeof (struct GB_Type_opaque)) ; if (*type == NULL) { return (ERROR (GrB_OUT_OF_MEMORY, (LOG, "out of memory"))) ; @@ -43,9 +42,44 @@ GrB_Info GB_Type_new // create a new GraphBLAS type // initialize the type GrB_Type t = *type ; t->magic = MAGIC ; - t->size = size ; + t->size = IMAX (sizeof_ctype, 1) ; t->code = GB_UDT_code ; - strncpy (t->name, name, GB_LEN-1) ; + + //-------------------------------------------------------------------------- + // get the name + //-------------------------------------------------------------------------- + + // if no name found, a generic name is used instead + strncpy (t->name, "user-type", GB_LEN-1) ; + + char input2 [GB_LEN+1] ; + char *p = NULL ; + + // look for "sizeof" in the input string + if (name != NULL) + { + strncpy (input2, name, GB_LEN) ; + p = strstr (input2, "sizeof") ; + } + + if (p != NULL) + { + + // "sizeof" appears in the input string, advance past it + p += 6 ; + + // find leading "(" if it appears, and advance to one character past it + char *p2 = strstr (p, "(") ; + if (p2 != NULL) p = p2 + 1 ; + + // find trailing ")" if it appears, and delete it + p2 = strstr (p, ")") ; + if (p2 != NULL) *p2 = '\0' ; + + // p now contains the final name, copy it to the output name + strncpy (t->name, p, GB_LEN-1) ; + } + return (REPORT_SUCCESS) ; } diff --git a/GraphBLAS/Source/GB_Type_size.c b/GraphBLAS/Source/GB_Type_size.c index 70e2967d17..55eedd27e6 100644 --- a/GraphBLAS/Source/GB_Type_size.c +++ b/GraphBLAS/Source/GB_Type_size.c @@ -2,7 +2,7 @@ // GB_Type_size: given a type code, return sizeof (type) //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_UnaryOp_check.c b/GraphBLAS/Source/GB_UnaryOp_check.c index a7263ea03a..a4c4a62d17 100644 --- a/GraphBLAS/Source/GB_UnaryOp_check.c +++ b/GraphBLAS/Source/GB_UnaryOp_check.c @@ -2,7 +2,7 @@ // GB_UnaryOp_check: check and print a unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_UnaryOp_new.c b/GraphBLAS/Source/GB_UnaryOp_new.c index 9acc02d698..d25a9017b3 100644 --- a/GraphBLAS/Source/GB_UnaryOp_new.c +++ b/GraphBLAS/Source/GB_UnaryOp_new.c @@ -2,7 +2,7 @@ // GB_UnaryOp_new: create a new unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ @@ -35,14 +35,13 @@ GrB_Info GB_UnaryOp_new // create a new user-defined unary operator RETURN_IF_NULL (function) ; RETURN_IF_NULL_OR_UNINITIALIZED (ztype) ; RETURN_IF_NULL_OR_UNINITIALIZED (xtype) ; - ASSERT (name != NULL) ; //-------------------------------------------------------------------------- // create the unary op //-------------------------------------------------------------------------- // allocate the unary operator - GB_CALLOC_MEMORY (*unaryop, 1, sizeof (GB_UnaryOp_opaque)) ; + GB_CALLOC_MEMORY (*unaryop, 1, sizeof (struct GB_UnaryOp_opaque)) ; if (*unaryop == NULL) { return (ERROR (GrB_OUT_OF_MEMORY, (LOG, "out of memory"))) ; diff --git a/GraphBLAS/Source/GB_Vector_check.c b/GraphBLAS/Source/GB_Vector_check.c index 6f6f4b2b55..a3f11b8a32 100644 --- a/GraphBLAS/Source/GB_Vector_check.c +++ b/GraphBLAS/Source/GB_Vector_check.c @@ -2,7 +2,7 @@ // GB_Vector_check: print a GraphBLAS GrB_Vector and check if it is valid //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_Work_alloc.c b/GraphBLAS/Source/GB_Work_alloc.c index 98652a74b6..b303638cbe 100644 --- a/GraphBLAS/Source/GB_Work_alloc.c +++ b/GraphBLAS/Source/GB_Work_alloc.c @@ -2,7 +2,7 @@ // GB_Work_alloc: ensure Work workspace is large enough //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_Work_free.c b/GraphBLAS/Source/GB_Work_free.c index 3707fef724..e9f9c075ad 100644 --- a/GraphBLAS/Source/GB_Work_free.c +++ b/GraphBLAS/Source/GB_Work_free.c @@ -2,7 +2,7 @@ // GB_Work_free: free the Work workspace array //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_accum_mask.c b/GraphBLAS/Source/GB_accum_mask.c index 964d619e73..d16fbd8831 100644 --- a/GraphBLAS/Source/GB_accum_mask.c +++ b/GraphBLAS/Source/GB_accum_mask.c @@ -2,7 +2,7 @@ // GB_accum_mask: accumulate results via the Mask and accum operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ @@ -127,7 +127,7 @@ GrB_Info GB_accum_mask // C = accum (C,T) // check inputs //-------------------------------------------------------------------------- - ASSERT_OK (GB_check (C, "C input", 0)) ; + ASSERT_OK (GB_check (C, "C input for C=accum(C,T)", 0)) ; ASSERT_OK_OR_NULL (GB_check (Mask, "Mask", 0)) ; ASSERT_OK_OR_NULL (GB_check (accum, "accum", 0)) ; ASSERT (Thandle != NULL) ; @@ -170,6 +170,7 @@ GrB_Info GB_accum_mask // C = accum (C,T) // T may have zombies, which are transplanted into Z. info = GB_Matrix_transplant (Z, C->type, Thandle) ; // Z is now initialized, and Z->p, Z->i, and Z->x are allocated ] + } else { diff --git a/GraphBLAS/Source/GB_add_pending.c b/GraphBLAS/Source/GB_add_pending.c index 5754e9de27..b503015e34 100644 --- a/GraphBLAS/Source/GB_add_pending.c +++ b/GraphBLAS/Source/GB_add_pending.c @@ -2,7 +2,7 @@ // GB_add_pending: add an entry A(i,j) to the list of pending tuples //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_apply.c b/GraphBLAS/Source/GB_apply.c index 3b05b4172a..ecf15f804b 100644 --- a/GraphBLAS/Source/GB_apply.c +++ b/GraphBLAS/Source/GB_apply.c @@ -2,7 +2,7 @@ // GB_apply: apply a unary operator; optionally transpose a matrix //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_assign.c b/GraphBLAS/Source/GB_assign.c index 94afce3206..4324347078 100644 --- a/GraphBLAS/Source/GB_assign.c +++ b/GraphBLAS/Source/GB_assign.c @@ -2,7 +2,7 @@ // GB_assign: submatrix assignment: C(I,J) = accum (C(I,J),A) //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_assign_scalar.c b/GraphBLAS/Source/GB_assign_scalar.c index 91d9f08ee4..5544a376cc 100644 --- a/GraphBLAS/Source/GB_assign_scalar.c +++ b/GraphBLAS/Source/GB_assign_scalar.c @@ -2,7 +2,7 @@ // GB_assign_scalar: scalar expansion: C(I,J) = accum (C(I,J),x) //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_block.c b/GraphBLAS/Source/GB_block.c index 3008aa4929..65fb89bf2a 100644 --- a/GraphBLAS/Source/GB_block.c +++ b/GraphBLAS/Source/GB_block.c @@ -2,7 +2,7 @@ // GB_block: apply all pending computations if blocking mode enabled //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_boolean_rename.c b/GraphBLAS/Source/GB_boolean_rename.c index f2865a4468..5e3c101677 100644 --- a/GraphBLAS/Source/GB_boolean_rename.c +++ b/GraphBLAS/Source/GB_boolean_rename.c @@ -2,7 +2,7 @@ // GB_boolean_rename: rename a boolean opcode //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_build.c b/GraphBLAS/Source/GB_build.c index c6e41ab200..808fa1960a 100644 --- a/GraphBLAS/Source/GB_build.c +++ b/GraphBLAS/Source/GB_build.c @@ -2,7 +2,7 @@ // GB_build: build a matrix //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_build_factory.c b/GraphBLAS/Source/GB_build_factory.c index c580d78d66..181c979f0d 100644 --- a/GraphBLAS/Source/GB_build_factory.c +++ b/GraphBLAS/Source/GB_build_factory.c @@ -2,7 +2,7 @@ // GB_build_factory: build a matrix from sorted tuples //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_builder.c b/GraphBLAS/Source/GB_builder.c index 38cbe5228e..27f043aed3 100644 --- a/GraphBLAS/Source/GB_builder.c +++ b/GraphBLAS/Source/GB_builder.c @@ -2,7 +2,7 @@ // GB_builder: build a matrix from tuples //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_calloc_memory.c b/GraphBLAS/Source/GB_calloc_memory.c index baf65a5bbb..674e2bf9cb 100644 --- a/GraphBLAS/Source/GB_calloc_memory.c +++ b/GraphBLAS/Source/GB_calloc_memory.c @@ -2,7 +2,7 @@ // GB_calloc_memory: wrapper for calloc //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_cast_array.c b/GraphBLAS/Source/GB_cast_array.c index 3d13a435bf..51751fe730 100644 --- a/GraphBLAS/Source/GB_cast_array.c +++ b/GraphBLAS/Source/GB_cast_array.c @@ -2,7 +2,7 @@ // GB_cast_array: typecast an array //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_cast_factory.c b/GraphBLAS/Source/GB_cast_factory.c index cd5cb6c03d..c91542e7de 100644 --- a/GraphBLAS/Source/GB_cast_factory.c +++ b/GraphBLAS/Source/GB_cast_factory.c @@ -2,7 +2,7 @@ // GB_cast_factory: return a pointer to a typecasting function //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_code_print.c b/GraphBLAS/Source/GB_code_print.c index 5ce8712ad7..86b25253ed 100644 --- a/GraphBLAS/Source/GB_code_print.c +++ b/GraphBLAS/Source/GB_code_print.c @@ -2,7 +2,7 @@ // GB_code_print: print an entry using a type code //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_code_string.c b/GraphBLAS/Source/GB_code_string.c index 5d60b1efce..3334be9201 100644 --- a/GraphBLAS/Source/GB_code_string.c +++ b/GraphBLAS/Source/GB_code_string.c @@ -2,6 +2,11 @@ // GB_code_string: convert a type code into a string //------------------------------------------------------------------------------ +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. +// http://suitesparse.com See GraphBLAS/Doc/License.txt for license. + +//------------------------------------------------------------------------------ + // Given GB_Type_code, return a string with the name of the type #include "GB.h" diff --git a/GraphBLAS/Source/GB_compatible.c b/GraphBLAS/Source/GB_compatible.c index e95c69568b..e2c49725f1 100644 --- a/GraphBLAS/Source/GB_compatible.c +++ b/GraphBLAS/Source/GB_compatible.c @@ -2,7 +2,7 @@ // GB_compatible: check input and operators for type compatibility //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_cumsum.c b/GraphBLAS/Source/GB_cumsum.c index b09f17a630..ddc5ca6946 100644 --- a/GraphBLAS/Source/GB_cumsum.c +++ b/GraphBLAS/Source/GB_cumsum.c @@ -2,7 +2,7 @@ // GB_cumsum: cumlative sum of an array //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_eWise.c b/GraphBLAS/Source/GB_eWise.c index 6785bf69d3..d622d3b89a 100644 --- a/GraphBLAS/Source/GB_eWise.c +++ b/GraphBLAS/Source/GB_eWise.c @@ -2,7 +2,7 @@ // GB_eWise: C = accum (C, A+B) or A.*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_extract.c b/GraphBLAS/Source/GB_extract.c index 10cee46d5c..910b18370e 100644 --- a/GraphBLAS/Source/GB_extract.c +++ b/GraphBLAS/Source/GB_extract.c @@ -2,7 +2,7 @@ // GB_extract: C = A (I,J) with Mask, descriptor, and accum //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_extractElement.c b/GraphBLAS/Source/GB_extractElement.c index 8196e02f44..9046a31aa5 100644 --- a/GraphBLAS/Source/GB_extractElement.c +++ b/GraphBLAS/Source/GB_extractElement.c @@ -2,7 +2,7 @@ // GB_extractElement: x = A(i,j) //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_extractTuples.c b/GraphBLAS/Source/GB_extractTuples.c index 69e86a35d8..ce162c57f2 100644 --- a/GraphBLAS/Source/GB_extractTuples.c +++ b/GraphBLAS/Source/GB_extractTuples.c @@ -2,7 +2,7 @@ // GB_extractTuples: extract all the tuples from a matrix //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_free_memory.c b/GraphBLAS/Source/GB_free_memory.c index 2910f2ee5f..df60c1792c 100644 --- a/GraphBLAS/Source/GB_free_memory.c +++ b/GraphBLAS/Source/GB_free_memory.c @@ -2,7 +2,7 @@ // GB_free_memory: wrapper for free //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_free_pending.c b/GraphBLAS/Source/GB_free_pending.c index d930775674..545112dd96 100644 --- a/GraphBLAS/Source/GB_free_pending.c +++ b/GraphBLAS/Source/GB_free_pending.c @@ -2,7 +2,7 @@ // GB_free_pending: free all pending tuples //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_ijproperties.c b/GraphBLAS/Source/GB_ijproperties.c index 852c7663f1..4f4540b20a 100644 --- a/GraphBLAS/Source/GB_ijproperties.c +++ b/GraphBLAS/Source/GB_ijproperties.c @@ -2,7 +2,7 @@ // GB_ijproperties: check I and J and determine properties //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_ijsort.c b/GraphBLAS/Source/GB_ijsort.c index 299d92ef36..6742767a59 100644 --- a/GraphBLAS/Source/GB_ijsort.c +++ b/GraphBLAS/Source/GB_ijsort.c @@ -2,7 +2,7 @@ // GB_ijsort: sort an index array I and remove duplicates //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. #include "GB.h" diff --git a/GraphBLAS/Source/GB_kron.c b/GraphBLAS/Source/GB_kron.c new file mode 100644 index 0000000000..6c97be002e --- /dev/null +++ b/GraphBLAS/Source/GB_kron.c @@ -0,0 +1,181 @@ +//------------------------------------------------------------------------------ +// GB_kron: C = accum (C, kron(A,B)) +//------------------------------------------------------------------------------ + +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. +// http://suitesparse.com See GraphBLAS/Doc/License.txt for license. + +//------------------------------------------------------------------------------ + +// C = accum (C, kron(A,B)) + +// The input matrices A and B are optionally transposed. + +// Not user-callable. Does the work for GxB_kron + +#include "GB.h" + +GrB_Info GB_kron // C = accum (C, kron(A,B)) +( + GrB_Matrix C, // input/output matrix for results + const bool C_replace, // if true, clear C before writing to it + const GrB_Matrix Mask, // optional mask for C, unused if NULL + const bool Mask_comp, // if true, use ~Mask + const GrB_BinaryOp accum, // optional accum for Z=accum(C,T) + const GrB_BinaryOp op, // defines '*' for kron(A,B) + const GrB_Matrix A, // input matrix + const bool A_transpose, // if true, use A' instead of A + const GrB_Matrix B, // input matrix + const bool B_transpose // if true, use B' instead of B +) +{ + + //-------------------------------------------------------------------------- + // check inputs + //-------------------------------------------------------------------------- + + RETURN_IF_NULL_OR_UNINITIALIZED (C) ; + RETURN_IF_NULL_OR_UNINITIALIZED (A) ; + RETURN_IF_NULL_OR_UNINITIALIZED (B) ; + RETURN_IF_UNINITIALIZED (Mask) ; + RETURN_IF_NULL_OR_UNINITIALIZED (op) ; + RETURN_IF_UNINITIALIZED (accum) ; + + ASSERT_OK (GB_check (C, "C input for GB_kron", 0)) ; + ASSERT_OK_OR_NULL (GB_check (Mask, "Mask for GB_kron", 0)) ; + ASSERT_OK_OR_NULL (GB_check (accum, "accum for GB_kron", 0)) ; + ASSERT_OK (GB_check (op, "op for GB_kron", 0)) ; + ASSERT_OK (GB_check (A, "A for GB_kron", 0)) ; + ASSERT_OK (GB_check (B, "B for GB_kron", 0)) ; + + // check domains and dimensions for C = accum (C,T) + GrB_Info info = GB_compatible (C->type, C, Mask, accum, op->ztype) ; + if (info != GrB_SUCCESS) + { + return (info) ; + } + + // T=op(A,B) via op operator, so A and B must be compatible with z=op(a,b) + info = GB_BinaryOp_compatible (op, NULL, A->type, B->type, 0) ; + if (info != GrB_SUCCESS) + { + return (info) ; + } + + // delete any lingering zombies and assemble any pending tuples in A and B, + // so that cnz = NNZ(A) * NNZ(B) can be computed + APPLY_PENDING_UPDATES (A) ; + APPLY_PENDING_UPDATES (B) ; + + // check the dimensions of C + int64_t anrows = (A_transpose) ? A->ncols : A->nrows ; + int64_t ancols = (A_transpose) ? A->nrows : A->ncols ; + int64_t bnrows = (B_transpose) ? B->ncols : B->nrows ; + int64_t bncols = (B_transpose) ? B->nrows : B->ncols ; + GrB_Index cnrows, cncols, cnz = 0 ; + bool ok = GB_Index_multiply (&cnrows, anrows, bnrows) ; + ok = ok && GB_Index_multiply (&cncols, ancols, bncols) ; + ok = ok && GB_Index_multiply (&cnz, NNZ (A), NNZ (B)) ; + if (!ok || C->nrows != cnrows || C->ncols != cncols) + { + return (ERROR (GrB_DIMENSION_MISMATCH, (LOG, "%s:\n" + "output is "GBd"-by-"GBd"; must be "GBd"-by-"GBd"\n" + "first input is "GBd"-by-"GBd"%s with "GBd" entries\n" + "second input is "GBd"-by-"GBd"%s with "GBd" entries", + ok ? "Dimensions not compatible:" : "Problem too large:", + C->nrows, C->ncols, cnrows, cncols, + anrows, ancols, A_transpose ? " (transposed)" : "", NNZ (A), + bnrows, bncols, B_transpose ? " (transposed)" : "", NNZ (B)))) ; + } + + // quick return if an empty Mask is complemented + RETURN_IF_QUICK_MASK (C, C_replace, Mask, Mask_comp) ; + + // delete any lingering zombies and assemble any pending tuples + APPLY_PENDING_UPDATES (C) ; + APPLY_PENDING_UPDATES (Mask) ; + + //-------------------------------------------------------------------------- + // allocate the output matrix T + //-------------------------------------------------------------------------- + + // T has the same type as z for the multiply operator, z=op(x,y) + GrB_Matrix T ; + GB_NEW (&T, op->ztype, C->nrows, C->ncols, true, false) ; + if (info != GrB_SUCCESS) + { + return (info) ; + } + + double memory = 0 ; + if (!GB_Matrix_alloc (T, cnz, true, &memory)) + { + // out of memory + GB_Matrix_clear (C) ; // C is now initialized, just empty + GB_MATRIX_FREE (&T) ; + ASSERT_OK (GB_check (C, "C cleared", 0)) ; + return (ERROR (GrB_OUT_OF_MEMORY, (LOG, + "out of memory, %g GBytes required", memory))) ; + } + + //-------------------------------------------------------------------------- + // transpose A and B if requested + //-------------------------------------------------------------------------- + + GrB_Matrix AT = NULL ; + if (A_transpose) + { + // AT = A' and typecast to op->xtype + GB_NEW (&AT, op->xtype, anrows, ancols, false, true) ; + if (info != GrB_SUCCESS) + { + GB_MATRIX_FREE (&T) ; + return (info) ; + } + info = GB_Matrix_transpose (AT, A, NULL, true) ; + if (info != GrB_SUCCESS) + { + GB_MATRIX_FREE (&AT) ; + GB_MATRIX_FREE (&T) ; + return (info) ; + } + } + + GrB_Matrix BT = NULL ; + if (B_transpose) + { + // BT = B' and typecast to op->ytype + GB_NEW (&BT, op->ytype, bnrows, bncols, false, true) ; + if (info != GrB_SUCCESS) + { + GB_MATRIX_FREE (&AT) ; + GB_MATRIX_FREE (&T) ; + return (info) ; + } + info = GB_Matrix_transpose (BT, B, NULL, true) ; + if (info != GrB_SUCCESS) + { + GB_MATRIX_FREE (&AT) ; + GB_MATRIX_FREE (&BT) ; + GB_MATRIX_FREE (&T) ; + return (info) ; + } + } + + //-------------------------------------------------------------------------- + // T = kron(A,B) + //-------------------------------------------------------------------------- + + GB_kron_kernel (T, op, A_transpose ? AT : A, B_transpose ? BT : B) ; + + // free workspace + GB_MATRIX_FREE (&AT) ; + GB_MATRIX_FREE (&BT) ; + + //-------------------------------------------------------------------------- + // C = accum (C,T): accumulate the results into C via the Mask + //-------------------------------------------------------------------------- + + return (GB_accum_mask (C, Mask, accum, &T, C_replace, Mask_comp)) ; +} + diff --git a/GraphBLAS/Source/GB_kron_kernel.c b/GraphBLAS/Source/GB_kron_kernel.c new file mode 100644 index 0000000000..d115150320 --- /dev/null +++ b/GraphBLAS/Source/GB_kron_kernel.c @@ -0,0 +1,130 @@ +//------------------------------------------------------------------------------ +// GB_kron_kernel: Kronecker product, C = kron (A,B) +//------------------------------------------------------------------------------ + +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. +// http://suitesparse.com See GraphBLAS/Doc/License.txt for license. + +//------------------------------------------------------------------------------ + +// C = kron(A,B) where op determines the binary multiplier to use. The type of +// A and B are compatible with the x and y inputs of z=op(x,y), but can be +// different. The type of C always matches the type of z. The caller +// (GB_kron) has been already allocated C with the right size and nzmax, so +// this function cannot fail. + +#include "GB.h" + +void GB_kron_kernel // C = kron (A,B) +( + GrB_Matrix C, // output matrix + const GrB_BinaryOp op, // multiply operator + const GrB_Matrix A, // input matrix + const GrB_Matrix B // input matrix +) +{ + + //-------------------------------------------------------------------------- + // check inputs + //-------------------------------------------------------------------------- + + ASSERT_OK (GB_check (A, "A for kron (A,B)", 0)) ; + ASSERT_OK (GB_check (B, "B for kron (A,B)", 0)) ; + ASSERT_OK (GB_check (C, "C for kron (A,B)", 0)) ; + ASSERT (!PENDING (A)) ; ASSERT (!ZOMBIES (A)) ; + ASSERT (!PENDING (B)) ; ASSERT (!ZOMBIES (B)) ; + ASSERT (!PENDING (C)) ; ASSERT (!ZOMBIES (C)) ; + + //-------------------------------------------------------------------------- + // get inputs + //-------------------------------------------------------------------------- + + const int64_t *restrict Ap = A->p ; + const int64_t *restrict Ai = A->i ; + const void *restrict Ax = A->x ; + const int64_t asize = A->type->size ; + const int64_t anrows = A->nrows ; + const int64_t ancols = A->ncols ; + + const int64_t *restrict Bp = B->p ; + const int64_t *restrict Bi = B->i ; + const void *restrict Bx = B->x ; + const int64_t bsize = B->type->size ; + const int64_t bnrows = B->nrows ; + const int64_t bncols = B->ncols ; + + int64_t *restrict Cp = C->p ; + int64_t *restrict Ci = C->i ; + void *restrict Cx = C->x ; + const int64_t csize = C->type->size ; + GrB_Index cncols, cnz ; + + #ifndef NDEBUG + // check the dimensions, type, and nnz of C + GrB_Index cnrows ; + bool ok = GB_Index_multiply (&cnrows, anrows, bnrows) ; + ok = ok & GB_Index_multiply (&cncols, ancols, bncols) ; + ok = ok & GB_Index_multiply (&cnz, NNZ (A), NNZ (B)) ; + ASSERT (ok) ; + ASSERT (cnrows == C->nrows) ; + ASSERT (cncols == C->ncols) ; + ASSERT (C->nzmax >= cnz) ; + ASSERT (C->type == op->ztype) ; + #endif + + cncols = C->ncols ; + + GB_binary_function fmult = op->function ; + + char awork [asize] ; + char bwork [bsize] ; + + cnz = 0 ; + + //-------------------------------------------------------------------------- + // C = kron (A,B) + //-------------------------------------------------------------------------- + + GB_cast_function + cast_A = GB_cast_factory (op->xtype->code, A->type->code), + cast_B = GB_cast_factory (op->ytype->code, B->type->code) ; + + // FUTURE: this could be done faster with built-in types and operators + + for (int64_t cj = 0 ; cj < cncols ; cj++) + { + // log the start of column C(:,cj) + Cp [cj] = cnz ; + + int64_t aj = cj / bncols ; + int64_t bj = cj % bncols ; + + for (int64_t pa = Ap [aj] ; pa < Ap [aj+1] ; pa++) + { + // awork = A(ai,aj), typecasted to op->xtype + int64_t ai = Ai [pa] ; + int64_t aiblock = ai * bnrows ; + cast_A (awork, Ax + (pa*asize), asize) ; + + for (int64_t pb = Bp [bj] ; pb < Bp [bj+1] ; pb++) + { + // bwork = B(bi,bj), typecasted to op->ytype + int64_t bi = Bi [pb] ; + cast_B (bwork, Bx + (pb*bsize), bsize) ; + + // C(ci,cj) = A(ai,aj) * B(bi,bj) + int64_t ci = aiblock + bi ; + Ci [cnz] = ci ; + fmult (Cx + (cnz*csize), awork, bwork) ; + cnz++ ; + } + } + } + + Cp [cncols] = cnz ; + C->magic = MAGIC ; + + ASSERT (cnz == NNZ (A) * NNZ (B)) ; + ASSERT_OK (GB_check (C, "C=kron(A,B)", 0)) ; +} + diff --git a/GraphBLAS/Source/GB_malloc_memory.c b/GraphBLAS/Source/GB_malloc_memory.c index d75804a9d2..6d1effb8ff 100644 --- a/GraphBLAS/Source/GB_malloc_memory.c +++ b/GraphBLAS/Source/GB_malloc_memory.c @@ -2,7 +2,7 @@ // GB_malloc_memory: wrapper for malloc //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_mask.c b/GraphBLAS/Source/GB_mask.c index 57be8abc44..f17add6a03 100644 --- a/GraphBLAS/Source/GB_mask.c +++ b/GraphBLAS/Source/GB_mask.c @@ -2,7 +2,7 @@ // GB_mask: apply a mask: C = Z //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ @@ -150,6 +150,8 @@ GrB_Info GB_mask // C = Z ASSERT_OK_OR_NULL (GB_check (*Zhandle, "Z", 0)) ; ASSERT (!PENDING (*Zhandle)) ; ASSERT (!ZOMBIES (*Zhandle)) ; ASSERT ((*Zhandle)->type == C->type) ; + // *Zhandle and C are never aliased. C and Mask might be, however. + ASSERT ((*Zhandle) != C) ; } // Mask must be compatible with C @@ -215,10 +217,32 @@ GrB_Info GB_mask // C = Z // the Mask is present //---------------------------------------------------------------------- + GrB_Info info ; + GrB_Matrix C2 = C ; + GrB_Matrix C_cleared = NULL ; + if (C_replace) { - // C = 0 - GB_Matrix_clear (C) ; + if (C == Mask) + { + // C and Mask are aliased. This is OK, unless C_replace is + // true. In this case, Mask mst be left unchanged but C must + // be cleared. To resolve this, a new matrix C_cleared is + // created, which is what C would look like if cleared. C is + // left unchanged since changing it would change the Mask. + GB_NEW (&C_cleared, C->type, C->nrows, C->ncols, true, false) ; + if (info != GrB_SUCCESS) + { + GB_MATRIX_FREE (Zhandle) ; + return (info) ; + } + C2 = C_cleared ; + } + else + { + // Clear all entries from C + GB_Matrix_clear (C) ; + } } // these conditions must be enforced in the caller @@ -232,10 +256,10 @@ GrB_Info GB_mask // C = Z // [ allocate the result R; R->p is malloc'd double memory = GBYTES (C->ncols + 1, sizeof (int64_t)) ; GrB_Matrix R ; - GrB_Info info ; GB_NEW (&R, C->type, C->nrows, C->ncols, false, true) ; if (info != GrB_SUCCESS) { + GB_MATRIX_FREE (&C_cleared) ; GB_MATRIX_FREE (Zhandle) ; return (info) ; } @@ -244,6 +268,7 @@ GrB_Info GB_mask // C = Z if (!GB_Matrix_alloc (R, NNZ (Z) + NNZ (C), true, &memory)) { GB_MATRIX_FREE (&R) ; + GB_MATRIX_FREE (&C_cleared) ; GB_MATRIX_FREE (Zhandle) ; return (ERROR (GrB_OUT_OF_MEMORY, (LOG, "out of memory, %g GBytes required", memory))) ; @@ -265,9 +290,9 @@ GrB_Info GB_mask // C = Z int64_t *Ri = R->i ; void *Rx = R->x ; - const int64_t *Cp = C->p ; - const int64_t *Ci = C->i ; - const void *Cx = C->x ; + const int64_t *Cp = C2->p ; + const int64_t *Ci = C2->i ; + const void *Cx = C2->x ; const int64_t *Zp = Z->p ; const int64_t *Zi = Z->i ; @@ -748,10 +773,14 @@ GrB_Info GB_mask // C = Z // transplant takes no time. It just does pointer transplants. // The header of R is freed by GB_Matrix_transplant. - ASSERT (R->type == C->type) ; + ASSERT (R->type == C2->type) ; ASSERT (R->p != NULL && !R->p_shallow) ; - ASSERT (C->p != NULL && !C->p_shallow) ; - return (GB_Matrix_transplant (C, C->type, &R)) ; + ASSERT (C2->p != NULL && !C2->p_shallow) ; + + // free the cleared version of C, if created + GB_MATRIX_FREE (&C_cleared) ; + + return (GB_Matrix_transplant (C, R->type, &R)) ; } } diff --git a/GraphBLAS/Source/GB_mxm.c b/GraphBLAS/Source/GB_mxm.c index 631cdba2ce..d1e155994f 100644 --- a/GraphBLAS/Source/GB_mxm.c +++ b/GraphBLAS/Source/GB_mxm.c @@ -2,7 +2,7 @@ // GB_mxm: matrix-matrix multiply for GrB_mxm, GrB_mxv, and GrB_vxm //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_new.c b/GraphBLAS/Source/GB_new.c index a2e5cc1de3..a8ca2ab1ee 100644 --- a/GraphBLAS/Source/GB_new.c +++ b/GraphBLAS/Source/GB_new.c @@ -2,7 +2,7 @@ // GB_new: create a new GraphBLAS matrix //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ @@ -22,16 +22,16 @@ // descriptor, for example, and are typically not transposed internally as well // since it is costly to do so. -// Two structs with identical content must be defined. so that the two types +// Two structs with identical content must be defined so that the two types // can be safely typecasted from one to the other. It would be much cleaner to // declare a single struct GrB_object_opaque, and then do -// typedef GB_object_opaque *GrB_Vector ; -// typedef GB_object_opaque *GrB_Matrix ; +// typedef struct GB_object_opaque *GrB_Vector ; +// typedef struct GB_object_opaque *GrB_Matrix ; // However, in this case the compiler complains that _Generic(x) can't // distinguish between GrB_Vector and GrB_Matrix. Therefore, GrB_Matrix -// and GrB_Vector are defined separately in GraphBLAS.h. +// and GrB_Vector are defined separately in GB.h. // Below are details of the content of a GrB_Matrix as defined in GraphBLAS.h: @@ -246,7 +246,7 @@ GrB_Info GB_new // create a new matrix //-------------------------------------------------------------------------- // allocate the matrix - GB_CALLOC_MEMORY (*matrix_handle, 1, sizeof (GB_Matrix_opaque)) ; + GB_CALLOC_MEMORY (*matrix_handle, 1, sizeof (struct GB_Matrix_opaque)) ; if (*matrix_handle == NULL) { // out of memory @@ -312,7 +312,7 @@ GrB_Info GB_new // create a new matrix if ((Ap_calloc || Ap_malloc) && A->p == NULL) { // out of memory - GB_FREE_MEMORY (*matrix_handle, 1, sizeof (GB_Matrix_opaque)) ; + GB_FREE_MEMORY (*matrix_handle, 1, sizeof (struct GB_Matrix_opaque)) ; return (ERROR (GrB_OUT_OF_MEMORY, (LOG, "out of memory, %g GBytes required", GBYTES (A->ncols+1, sizeof (int64_t))))) ; diff --git a/GraphBLAS/Source/GB_object_check.c b/GraphBLAS/Source/GB_object_check.c index 5c74ff9ac0..9e3fcdc8f1 100644 --- a/GraphBLAS/Source/GB_object_check.c +++ b/GraphBLAS/Source/GB_object_check.c @@ -2,7 +2,7 @@ // GB_object_check: print a GraphBLAS matrix and check if it is valid //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_op_is_second.c b/GraphBLAS/Source/GB_op_is_second.c index 02c4757279..a0a2f3dac7 100644 --- a/GraphBLAS/Source/GB_op_is_second.c +++ b/GraphBLAS/Source/GB_op_is_second.c @@ -2,7 +2,7 @@ // GB_op_is_second: return true if op is the SECOND operator of the right type //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_ops.c b/GraphBLAS/Source/GB_ops.c index d08e84b7a1..6332dfd1e0 100644 --- a/GraphBLAS/Source/GB_ops.c +++ b/GraphBLAS/Source/GB_ops.c @@ -2,7 +2,7 @@ // GB_builtin.c: built-in types, functions, operators, and other externs //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ @@ -17,7 +17,7 @@ //------------------------------------------------------------------------------ // extern predefined type objects but opaque to the user -GB_Type_opaque +struct GB_Type_opaque GB_opaque_BOOL = { MAGIC, sizeof (bool), GB_BOOL_code , "bool" }, GB_opaque_INT8 = { MAGIC, sizeof (int8_t), GB_INT8_code , "int8_t" }, GB_opaque_UINT8 = { MAGIC, sizeof (uint8_t), GB_UINT8_code , "uint8_t" }, @@ -50,7 +50,7 @@ GrB_Type // helper macro to define unary operators; z and x have the same type #define UNARY(PREFIX,OPERATOR,OPNAME) \ -GB_UnaryOp_opaque GB (OPERATOR ## _opaque) = \ +struct GB_UnaryOp_opaque GB (OPERATOR ## _opaque) = \ { \ MAGIC, \ & GB (opaque), \ @@ -64,7 +64,7 @@ GrB_UnaryOp GRB_NAME (PREFIX,OPERATOR) = & GB (OPERATOR ## _opaque) ; // helper macro to define binary operators: all x,y,z types the same #define BINARY(PREFIX,OPERATOR,OPNAME) \ -GB_BinaryOp_opaque GB (OPERATOR ## _opaque) = \ +struct GB_BinaryOp_opaque GB (OPERATOR ## _opaque) = \ { \ MAGIC, \ & GB (opaque), \ @@ -78,7 +78,7 @@ GrB_BinaryOp GRB_NAME (PREFIX,OPERATOR) = & GB (OPERATOR ## _opaque) ; // helper macro to define binary operators that return BOOL #define BINARY_BOOL(PREFIX,OPERATOR,OPNAME) \ -GB_BinaryOp_opaque GB (OPERATOR ## _opaque) = \ +struct GB_BinaryOp_opaque GB (OPERATOR ## _opaque) = \ { \ MAGIC, \ & GB (opaque), \ @@ -184,27 +184,27 @@ GrB_BinaryOp GrB_LXOR = & GB_LXOR_opaque_BOOL ; // built-in select operators //------------------------------------------------------------------------------ -GB_SelectOp_opaque GB_TRIL_opaque = +struct GB_SelectOp_opaque GB_TRIL_opaque = { MAGIC, NULL, NULL, "tril", GB_TRIL_opcode } ; -GB_SelectOp_opaque GB_TRIU_opaque = +struct GB_SelectOp_opaque GB_TRIU_opaque = { MAGIC, NULL, NULL, "triu", GB_TRIU_opcode } ; -GB_SelectOp_opaque GB_DIAG_opaque = +struct GB_SelectOp_opaque GB_DIAG_opaque = { MAGIC, NULL, NULL, "diag", GB_DIAG_opcode } ; -GB_SelectOp_opaque GB_OFFDIAG_opaque = +struct GB_SelectOp_opaque GB_OFFDIAG_opaque = { MAGIC, NULL, NULL, "offdiag", GB_OFFDIAG_opcode } ; -GB_SelectOp_opaque GB_NONZERO_opaque = +struct GB_SelectOp_opaque GB_NONZERO_opaque = { MAGIC, NULL, NULL, "nonzero", GB_NONZERO_opcode } ; @@ -232,7 +232,7 @@ const GrB_Index *GrB_ALL = & GB_ALL_opaque ; // helper macro to define built-in monoids #define MONOID(OP,T,CTYPE,IDENTITY,IDZERO) \ CTYPE GB_identity_ ## OP ## opaque_ ## T = IDENTITY ; \ -GB_Monoid_opaque GB_ ## OP ## T ## _MONOID_opaque = \ +struct GB_Monoid_opaque GB_ ## OP ## T ## _MONOID_opaque = \ { \ MAGIC, \ & GB_ ## OP ## opaque_ ## T, \ @@ -302,7 +302,7 @@ MONOID ( EQ_ , BOOL , bool , true , true ) ; // helper macro to define semirings: all x,y,z types the same #define SEMIRING(ADD,MULT) \ -GB_Semiring_opaque GB (ADD ## _ ## MULT ## _opaque) = \ +struct GB_Semiring_opaque GB (ADD ## _ ## MULT ## _opaque) = \ { \ MAGIC, \ & GM (ADD), \ @@ -313,7 +313,7 @@ GrB_Semiring GRB (ADD ## _ ## MULT) = & GB (ADD ## _ ## MULT ## _opaque) ; // helper macro to define semirings: x,y types the same, z boolean #define SEMIRING_COMPARE(ADD,MULT) \ -GB_Semiring_opaque GB (ADD ## _ ## MULT ## _opaque) = \ +struct GB_Semiring_opaque GB (ADD ## _ ## MULT ## _opaque) = \ { \ MAGIC, \ & GMBOOL (ADD), \ diff --git a/GraphBLAS/Source/GB_qsort_1.c b/GraphBLAS/Source/GB_qsort_1.c index 6da4006f33..40168c4f1c 100644 --- a/GraphBLAS/Source/GB_qsort_1.c +++ b/GraphBLAS/Source/GB_qsort_1.c @@ -2,7 +2,7 @@ // GB_qsort_1: sort an n-by-1 list of integers //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_qsort_2a.c b/GraphBLAS/Source/GB_qsort_2a.c index 3ccd60da10..9adc96b05f 100644 --- a/GraphBLAS/Source/GB_qsort_2a.c +++ b/GraphBLAS/Source/GB_qsort_2a.c @@ -2,7 +2,7 @@ // GB_qsort_2a: sort a 2-by-n list of integers, using A [0][ ] as the sort key //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_qsort_2b.c b/GraphBLAS/Source/GB_qsort_2b.c index 2c2971ee3a..c874375a6c 100644 --- a/GraphBLAS/Source/GB_qsort_2b.c +++ b/GraphBLAS/Source/GB_qsort_2b.c @@ -2,7 +2,7 @@ // GB_qsort_2b: sort a 2-by-n list of integers, using A[0:1][ ] as the key //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_qsort_3.c b/GraphBLAS/Source/GB_qsort_3.c index 7dbfa5c677..5331171b29 100644 --- a/GraphBLAS/Source/GB_qsort_3.c +++ b/GraphBLAS/Source/GB_qsort_3.c @@ -2,7 +2,7 @@ // GB_qsort_3: sort a 3-by-n list of integers, using A[0:2][] as the key //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_queue_check.c b/GraphBLAS/Source/GB_queue_check.c index a644523a4d..cc5d497727 100644 --- a/GraphBLAS/Source/GB_queue_check.c +++ b/GraphBLAS/Source/GB_queue_check.c @@ -2,7 +2,7 @@ // GB_queue_check: check the status of the queue for a particular matrix //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_queue_insert.c b/GraphBLAS/Source/GB_queue_insert.c index ef49a4b949..d8a99066eb 100644 --- a/GraphBLAS/Source/GB_queue_insert.c +++ b/GraphBLAS/Source/GB_queue_insert.c @@ -2,7 +2,7 @@ // GB_queue_insert: insert a matrix at the head of the matrix queue //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_queue_remove.c b/GraphBLAS/Source/GB_queue_remove.c index 1aa047eb43..1d9a9d2517 100644 --- a/GraphBLAS/Source/GB_queue_remove.c +++ b/GraphBLAS/Source/GB_queue_remove.c @@ -2,7 +2,7 @@ // GB_queue_remove: remove a matrix from the matrix queue //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_queue_remove_head.c b/GraphBLAS/Source/GB_queue_remove_head.c index 3c0300cb84..ed24d88018 100644 --- a/GraphBLAS/Source/GB_queue_remove_head.c +++ b/GraphBLAS/Source/GB_queue_remove_head.c @@ -2,7 +2,7 @@ // GB_queue_remove_head: remove the matrix at the head of the matrix queue //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_realloc_memory.c b/GraphBLAS/Source/GB_realloc_memory.c index 01cfd2438d..ed92a51868 100644 --- a/GraphBLAS/Source/GB_realloc_memory.c +++ b/GraphBLAS/Source/GB_realloc_memory.c @@ -2,7 +2,7 @@ // GB_realloc_memory: wrapper for realloc //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_reduce_to_column.c b/GraphBLAS/Source/GB_reduce_to_column.c index c94d6db72c..5a687fc420 100644 --- a/GraphBLAS/Source/GB_reduce_to_column.c +++ b/GraphBLAS/Source/GB_reduce_to_column.c @@ -2,7 +2,7 @@ // GB_reduce_to_column: reduce a matrix to a column using a binary op //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_reduce_to_scalar.c b/GraphBLAS/Source/GB_reduce_to_scalar.c index aaeef6436d..fa27f1e966 100644 --- a/GraphBLAS/Source/GB_reduce_to_scalar.c +++ b/GraphBLAS/Source/GB_reduce_to_scalar.c @@ -2,7 +2,7 @@ // GB_reduce_to_scalar: reduce a matrix to a scalar //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_resize.c b/GraphBLAS/Source/GB_resize.c new file mode 100644 index 0000000000..a615e1998b --- /dev/null +++ b/GraphBLAS/Source/GB_resize.c @@ -0,0 +1,95 @@ +//------------------------------------------------------------------------------ +// GB_resize: change the size of a matrix +//------------------------------------------------------------------------------ + +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. +// http://suitesparse.com See GraphBLAS/Doc/License.txt for license. + +//------------------------------------------------------------------------------ + +#include "GB.h" + +GrB_Info GB_resize // change the size of a matrix +( + GrB_Matrix A, // matrix to modify + const GrB_Index nrows_new, // new number of rows in matrix + const GrB_Index ncols_new // new number of columns in matrix +) +{ + + //-------------------------------------------------------------------------- + // check inputs + //-------------------------------------------------------------------------- + + ASSERT_OK (GB_check (A, "A to resize", 0)) ; + + // delete any lingering zombies and assemble any pending tuples + APPLY_PENDING_UPDATES (A) ; + + //-------------------------------------------------------------------------- + // resize the matrix + //-------------------------------------------------------------------------- + + // change the size of A->p + if (ncols_new != A->ncols) + { + bool ok = true ; + GB_REALLOC_MEMORY (A->p, ncols_new+1, A->ncols+1, sizeof (int64_t), + &ok) ; + if (!ok) + { + // out of memory + double memory = GBYTES (ncols_new + 1, sizeof (int64_t)) ; + return (ERROR (GrB_OUT_OF_MEMORY, (LOG, + "out of memory, %g GBytes required", memory))) ; + } + } + + int64_t *restrict Ap = A->p ; + int64_t *restrict Ai = A->i ; + void *restrict Ax = A->x ; + + // extend the column pointers + int64_t anz = Ap [A->ncols] ; + for (int64_t j = A->ncols + 1 ; j <= ncols_new ; j++) + { + Ap [j] = anz ; + } + A->ncols = ncols_new ; + ASSERT_OK (GB_check (A, "A col resized", 0)) ; + + if (nrows_new < A->nrows) + { + // # of rows is shrinking; delete entries outside the new matrix + anz = 0 ; + int64_t asize = A->type->size ; + for (int64_t j = 0 ; j < ncols_new ; j++) + { + int64_t p = Ap [j] ; + Ap [j] = anz ; + for ( ; p < Ap [j+1] ; p++) + { + int64_t i = Ai [p] ; + if (i < nrows_new) + { + // keep this entry + Ai [anz] = i ; + memcpy (Ax +(anz*asize), Ax +(p*asize), asize) ; + anz++ ; + } + } + } + Ap [ncols_new] = anz ; + } + + // matrix has been resized + A->nrows = nrows_new ; + + //-------------------------------------------------------------------------- + // return the result + //-------------------------------------------------------------------------- + + ASSERT_OK (GB_check (A, "A resized", 0)) ; + return (REPORT_SUCCESS) ; +} + diff --git a/GraphBLAS/Source/GB_select.c b/GraphBLAS/Source/GB_select.c index 97d64071d7..4417ab687d 100644 --- a/GraphBLAS/Source/GB_select.c +++ b/GraphBLAS/Source/GB_select.c @@ -2,7 +2,7 @@ // GB_select: apply a select operator; optionally transpose a matrix //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ @@ -59,14 +59,6 @@ GrB_Info GB_select // C = accum (C, select(A,k)) or select(A',k) ASSERT_OK (GB_check (op, "selectop for GB_select", 0)) ; ASSERT_OK (GB_check (A, "A input for GB_select", 0)) ; -/* -(GB_check (C, "C input for GB_select", 3)) ; -if (Mask != NULL) (GB_check (Mask, "Mask for GB_select", 3)) ; -if (accum != NULL) (GB_check (accum, "accum for GB_select", 3)) ; -(GB_check (op, "selectop for GB_select", 3)) ; -(GB_check (A, "A input for GB_select", 3)) ; -*/ - // check domains and dimensions for C = accum (C,T) GrB_Info info = GB_compatible (C->type, C, Mask, accum, A->type) ; if (info != GrB_SUCCESS) diff --git a/GraphBLAS/Source/GB_semiring_builtin.c b/GraphBLAS/Source/GB_semiring_builtin.c index 7260ae34fc..c34fbc12d4 100644 --- a/GraphBLAS/Source/GB_semiring_builtin.c +++ b/GraphBLAS/Source/GB_semiring_builtin.c @@ -2,9 +2,11 @@ // GB_semiring_builtin: determine if semiring is built-in //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. +//------------------------------------------------------------------------------ + #include "GB.h" #ifndef GBCOMPACT diff --git a/GraphBLAS/Source/GB_setElement.c b/GraphBLAS/Source/GB_setElement.c index 6cfe114c85..2ab4929346 100644 --- a/GraphBLAS/Source/GB_setElement.c +++ b/GraphBLAS/Source/GB_setElement.c @@ -2,7 +2,7 @@ // GB_setElement: C(i,j) = x //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_shallow_cast.c b/GraphBLAS/Source/GB_shallow_cast.c index 0f073000ca..8987e4980a 100644 --- a/GraphBLAS/Source/GB_shallow_cast.c +++ b/GraphBLAS/Source/GB_shallow_cast.c @@ -2,7 +2,7 @@ // GB_shallow_cast: create a shallow copy of a matrix, optionally typecasted //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_shallow_op.c b/GraphBLAS/Source/GB_shallow_op.c index adc91b7530..a845e1722f 100644 --- a/GraphBLAS/Source/GB_shallow_op.c +++ b/GraphBLAS/Source/GB_shallow_op.c @@ -2,7 +2,7 @@ // GB_shallow_op: create a shallow copy and apply a unary operator to a matrix //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_size_t_multiply.c b/GraphBLAS/Source/GB_size_t_multiply.c index 6cc4a26a7b..aef2800213 100644 --- a/GraphBLAS/Source/GB_size_t_multiply.c +++ b/GraphBLAS/Source/GB_size_t_multiply.c @@ -2,7 +2,7 @@ // GB_size_t_multiply: multiply two size_t and guard against overflow //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_subassign.c b/GraphBLAS/Source/GB_subassign.c index 37737b358d..636d2530bd 100644 --- a/GraphBLAS/Source/GB_subassign.c +++ b/GraphBLAS/Source/GB_subassign.c @@ -2,7 +2,7 @@ // GB_subassign: submatrix assignment: C(I,J) = accum (C(I,J),A) //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_subassign_kernel.c b/GraphBLAS/Source/GB_subassign_kernel.c index ebb08c9178..8468c7346b 100644 --- a/GraphBLAS/Source/GB_subassign_kernel.c +++ b/GraphBLAS/Source/GB_subassign_kernel.c @@ -2,7 +2,7 @@ // GB_subassign_kernel: C (I,J) = accum (C (I,J), A) //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_subassign_scalar.c b/GraphBLAS/Source/GB_subassign_scalar.c index 3facb2eb41..3a79f843f7 100644 --- a/GraphBLAS/Source/GB_subassign_scalar.c +++ b/GraphBLAS/Source/GB_subassign_scalar.c @@ -2,7 +2,7 @@ // GB_subassign_scalar: scalar expansion: C(I,J) = accum (C(I,J),x) //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_subref_numeric.c b/GraphBLAS/Source/GB_subref_numeric.c index 7fc77f87bc..66c5b154d9 100644 --- a/GraphBLAS/Source/GB_subref_numeric.c +++ b/GraphBLAS/Source/GB_subref_numeric.c @@ -2,7 +2,7 @@ // GB_subref_numeric: C = A(I,J) or C = (A(J,I))', extract the values //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_subref_symbolic.c b/GraphBLAS/Source/GB_subref_symbolic.c index 03077ba207..fc50e25ea6 100644 --- a/GraphBLAS/Source/GB_subref_symbolic.c +++ b/GraphBLAS/Source/GB_subref_symbolic.c @@ -2,7 +2,7 @@ // GB_subref_symbolic: C = A(I,J), extract the pattern //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_transpose_ix.c b/GraphBLAS/Source/GB_transpose_ix.c index f193252ec2..4dba24c15c 100644 --- a/GraphBLAS/Source/GB_transpose_ix.c +++ b/GraphBLAS/Source/GB_transpose_ix.c @@ -2,7 +2,7 @@ // GB_transpose_ix: transpose the values and pattern of a matrix //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_transpose_op.c b/GraphBLAS/Source/GB_transpose_op.c index f2a3a552a3..ee43acb098 100644 --- a/GraphBLAS/Source/GB_transpose_op.c +++ b/GraphBLAS/Source/GB_transpose_op.c @@ -2,7 +2,7 @@ // GB_transpose_op: transpose and apply an operator to a matrix //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_transpose_pattern.c b/GraphBLAS/Source/GB_transpose_pattern.c index 053f8a30f0..760b9cf942 100644 --- a/GraphBLAS/Source/GB_transpose_pattern.c +++ b/GraphBLAS/Source/GB_transpose_pattern.c @@ -2,7 +2,7 @@ // GB_transpose_pattern: transpose the pattern of a matrix //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GB_wait.c b/GraphBLAS/Source/GB_wait.c index 7a7e5e1ec3..20dd28f8a2 100644 --- a/GraphBLAS/Source/GB_wait.c +++ b/GraphBLAS/Source/GB_wait.c @@ -2,7 +2,7 @@ // GB_wait: finish all pending computations on a single matrix //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_eq_bool.c b/GraphBLAS/Source/Generated/GB_AxB__eq_eq_bool.c index 93f4cf9a39..94a7687548 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_eq_bool.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_eq_bool.c @@ -2,7 +2,7 @@ // GB_AxB__eq_eq_bool: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_eq_bool GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_eq_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__eq_eq_fp32.c index f57b60ab78..8eb376106a 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_eq_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_eq_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__eq_eq_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_eq_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_eq_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__eq_eq_fp64.c index 440cce2eb4..8a85e770e5 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_eq_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_eq_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__eq_eq_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_eq_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_eq_int16.c b/GraphBLAS/Source/Generated/GB_AxB__eq_eq_int16.c index a441065712..cc9e3af940 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_eq_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_eq_int16.c @@ -2,7 +2,7 @@ // GB_AxB__eq_eq_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_eq_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_eq_int32.c b/GraphBLAS/Source/Generated/GB_AxB__eq_eq_int32.c index c19301e6b2..28b49726d7 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_eq_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_eq_int32.c @@ -2,7 +2,7 @@ // GB_AxB__eq_eq_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_eq_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_eq_int64.c b/GraphBLAS/Source/Generated/GB_AxB__eq_eq_int64.c index 64db5e1bcb..b4bf376a16 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_eq_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_eq_int64.c @@ -2,7 +2,7 @@ // GB_AxB__eq_eq_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_eq_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_eq_int8.c b/GraphBLAS/Source/Generated/GB_AxB__eq_eq_int8.c index 5318b4a239..3ee3b666de 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_eq_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_eq_int8.c @@ -2,7 +2,7 @@ // GB_AxB__eq_eq_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_eq_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_eq_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__eq_eq_uint16.c index f78c068da0..82e0df9f98 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_eq_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_eq_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__eq_eq_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_eq_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_eq_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__eq_eq_uint32.c index 876dcbcb9a..4961dea7f9 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_eq_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_eq_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__eq_eq_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_eq_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_eq_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__eq_eq_uint64.c index d030c9de73..5bb4c672a7 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_eq_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_eq_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__eq_eq_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_eq_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_eq_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__eq_eq_uint8.c index 93c34572a5..336f558d65 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_eq_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_eq_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__eq_eq_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_eq_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_first_bool.c b/GraphBLAS/Source/Generated/GB_AxB__eq_first_bool.c index 5744c328ff..3e5e79a8f1 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_first_bool.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_first_bool.c @@ -2,7 +2,7 @@ // GB_AxB__eq_first_bool: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_first_bool GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_ge_bool.c b/GraphBLAS/Source/Generated/GB_AxB__eq_ge_bool.c index 1923b42ce3..f337b5ec37 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_ge_bool.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_ge_bool.c @@ -2,7 +2,7 @@ // GB_AxB__eq_ge_bool: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_ge_bool GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_ge_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__eq_ge_fp32.c index 19fa854a42..4833785e22 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_ge_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_ge_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__eq_ge_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_ge_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_ge_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__eq_ge_fp64.c index 5b8b8f13ab..1a1c05d9ba 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_ge_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_ge_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__eq_ge_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_ge_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_ge_int16.c b/GraphBLAS/Source/Generated/GB_AxB__eq_ge_int16.c index ea6c4ce249..6753a85f83 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_ge_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_ge_int16.c @@ -2,7 +2,7 @@ // GB_AxB__eq_ge_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_ge_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_ge_int32.c b/GraphBLAS/Source/Generated/GB_AxB__eq_ge_int32.c index d3fc3869c8..89df3961b8 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_ge_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_ge_int32.c @@ -2,7 +2,7 @@ // GB_AxB__eq_ge_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_ge_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_ge_int64.c b/GraphBLAS/Source/Generated/GB_AxB__eq_ge_int64.c index 0959d934c4..07b5904b70 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_ge_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_ge_int64.c @@ -2,7 +2,7 @@ // GB_AxB__eq_ge_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_ge_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_ge_int8.c b/GraphBLAS/Source/Generated/GB_AxB__eq_ge_int8.c index 8811291d11..5d7c94a1da 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_ge_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_ge_int8.c @@ -2,7 +2,7 @@ // GB_AxB__eq_ge_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_ge_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_ge_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__eq_ge_uint16.c index 9ca255bf04..0b7c11e6a7 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_ge_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_ge_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__eq_ge_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_ge_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_ge_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__eq_ge_uint32.c index da00e1c337..dd567715a1 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_ge_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_ge_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__eq_ge_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_ge_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_ge_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__eq_ge_uint64.c index f926122b4a..84e10178bd 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_ge_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_ge_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__eq_ge_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_ge_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_ge_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__eq_ge_uint8.c index c233dc71be..8e3cf648f0 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_ge_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_ge_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__eq_ge_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_ge_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_gt_bool.c b/GraphBLAS/Source/Generated/GB_AxB__eq_gt_bool.c index 9366d97712..0cf63bbb91 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_gt_bool.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_gt_bool.c @@ -2,7 +2,7 @@ // GB_AxB__eq_gt_bool: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_gt_bool GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_gt_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__eq_gt_fp32.c index 115cf478ff..0bb50df037 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_gt_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_gt_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__eq_gt_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_gt_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_gt_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__eq_gt_fp64.c index a72839c3e8..212f9c40b9 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_gt_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_gt_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__eq_gt_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_gt_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_gt_int16.c b/GraphBLAS/Source/Generated/GB_AxB__eq_gt_int16.c index eca56530c7..c41daca5db 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_gt_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_gt_int16.c @@ -2,7 +2,7 @@ // GB_AxB__eq_gt_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_gt_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_gt_int32.c b/GraphBLAS/Source/Generated/GB_AxB__eq_gt_int32.c index e00fbe5a20..a41883602e 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_gt_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_gt_int32.c @@ -2,7 +2,7 @@ // GB_AxB__eq_gt_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_gt_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_gt_int64.c b/GraphBLAS/Source/Generated/GB_AxB__eq_gt_int64.c index ac7e2851a7..7358954e8b 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_gt_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_gt_int64.c @@ -2,7 +2,7 @@ // GB_AxB__eq_gt_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_gt_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_gt_int8.c b/GraphBLAS/Source/Generated/GB_AxB__eq_gt_int8.c index 03891752b3..f13cd49a1d 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_gt_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_gt_int8.c @@ -2,7 +2,7 @@ // GB_AxB__eq_gt_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_gt_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_gt_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__eq_gt_uint16.c index 3d3786c62d..9350d99b6e 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_gt_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_gt_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__eq_gt_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_gt_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_gt_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__eq_gt_uint32.c index ba4d997eb5..5babef73e9 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_gt_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_gt_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__eq_gt_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_gt_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_gt_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__eq_gt_uint64.c index f6304260c7..6a2eb6594c 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_gt_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_gt_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__eq_gt_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_gt_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_gt_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__eq_gt_uint8.c index a62c6c3ff0..da15122d6e 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_gt_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_gt_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__eq_gt_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_gt_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_land_bool.c b/GraphBLAS/Source/Generated/GB_AxB__eq_land_bool.c index 3c8271d9d2..193bdb3ae2 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_land_bool.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_land_bool.c @@ -2,7 +2,7 @@ // GB_AxB__eq_land_bool: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_land_bool GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_le_bool.c b/GraphBLAS/Source/Generated/GB_AxB__eq_le_bool.c index f1a7052514..a3cb482b0a 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_le_bool.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_le_bool.c @@ -2,7 +2,7 @@ // GB_AxB__eq_le_bool: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_le_bool GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_le_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__eq_le_fp32.c index 55cc010fa9..d21ecc970f 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_le_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_le_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__eq_le_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_le_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_le_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__eq_le_fp64.c index 5911419028..d14dd2c69b 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_le_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_le_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__eq_le_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_le_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_le_int16.c b/GraphBLAS/Source/Generated/GB_AxB__eq_le_int16.c index 80c47b6f80..a93e912917 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_le_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_le_int16.c @@ -2,7 +2,7 @@ // GB_AxB__eq_le_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_le_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_le_int32.c b/GraphBLAS/Source/Generated/GB_AxB__eq_le_int32.c index dc3794ea37..6b2c1080bc 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_le_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_le_int32.c @@ -2,7 +2,7 @@ // GB_AxB__eq_le_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_le_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_le_int64.c b/GraphBLAS/Source/Generated/GB_AxB__eq_le_int64.c index f89cd297fc..6d2ccdb78d 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_le_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_le_int64.c @@ -2,7 +2,7 @@ // GB_AxB__eq_le_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_le_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_le_int8.c b/GraphBLAS/Source/Generated/GB_AxB__eq_le_int8.c index 595d67b8d6..a9f2261eea 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_le_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_le_int8.c @@ -2,7 +2,7 @@ // GB_AxB__eq_le_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_le_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_le_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__eq_le_uint16.c index ac8e65676e..dd861974dc 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_le_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_le_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__eq_le_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_le_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_le_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__eq_le_uint32.c index f0d2b75289..282d6a7aca 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_le_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_le_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__eq_le_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_le_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_le_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__eq_le_uint64.c index b0a7b29bc5..c0308a09dd 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_le_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_le_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__eq_le_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_le_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_le_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__eq_le_uint8.c index e2e4b57a1f..accd9f2776 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_le_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_le_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__eq_le_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_le_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_lor_bool.c b/GraphBLAS/Source/Generated/GB_AxB__eq_lor_bool.c index 7f8c10acb9..2129faeccf 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_lor_bool.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_lor_bool.c @@ -2,7 +2,7 @@ // GB_AxB__eq_lor_bool: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_lor_bool GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_lt_bool.c b/GraphBLAS/Source/Generated/GB_AxB__eq_lt_bool.c index d58bbd647e..6faab7f6ac 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_lt_bool.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_lt_bool.c @@ -2,7 +2,7 @@ // GB_AxB__eq_lt_bool: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_lt_bool GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_lt_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__eq_lt_fp32.c index a823c061d0..ed7bf35c22 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_lt_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_lt_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__eq_lt_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_lt_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_lt_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__eq_lt_fp64.c index a7099a2eb3..cc3d9f4fbc 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_lt_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_lt_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__eq_lt_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_lt_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_lt_int16.c b/GraphBLAS/Source/Generated/GB_AxB__eq_lt_int16.c index 6d82e08895..98477640dd 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_lt_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_lt_int16.c @@ -2,7 +2,7 @@ // GB_AxB__eq_lt_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_lt_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_lt_int32.c b/GraphBLAS/Source/Generated/GB_AxB__eq_lt_int32.c index 0f7f4b1fe3..da0654937a 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_lt_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_lt_int32.c @@ -2,7 +2,7 @@ // GB_AxB__eq_lt_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_lt_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_lt_int64.c b/GraphBLAS/Source/Generated/GB_AxB__eq_lt_int64.c index cfb6679e3a..704066e600 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_lt_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_lt_int64.c @@ -2,7 +2,7 @@ // GB_AxB__eq_lt_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_lt_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_lt_int8.c b/GraphBLAS/Source/Generated/GB_AxB__eq_lt_int8.c index 1152a9b710..7603d0d3a7 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_lt_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_lt_int8.c @@ -2,7 +2,7 @@ // GB_AxB__eq_lt_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_lt_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_lt_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__eq_lt_uint16.c index aee185b47a..2a351224ca 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_lt_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_lt_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__eq_lt_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_lt_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_lt_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__eq_lt_uint32.c index 887b796972..d5b0290ef4 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_lt_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_lt_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__eq_lt_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_lt_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_lt_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__eq_lt_uint64.c index 9ea10354c3..9a4495dc95 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_lt_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_lt_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__eq_lt_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_lt_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_lt_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__eq_lt_uint8.c index bc20306b57..be47fc0d49 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_lt_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_lt_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__eq_lt_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_lt_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_lxor_bool.c b/GraphBLAS/Source/Generated/GB_AxB__eq_lxor_bool.c index ed6e4ce497..fcd70727c0 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_lxor_bool.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_lxor_bool.c @@ -2,7 +2,7 @@ // GB_AxB__eq_lxor_bool: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_lxor_bool GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_ne_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__eq_ne_fp32.c index 3530b1f668..0087154bba 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_ne_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_ne_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__eq_ne_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_ne_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_ne_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__eq_ne_fp64.c index b547026cb7..dbd8329d2d 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_ne_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_ne_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__eq_ne_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_ne_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_ne_int16.c b/GraphBLAS/Source/Generated/GB_AxB__eq_ne_int16.c index dc5fdf5638..6997f2470a 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_ne_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_ne_int16.c @@ -2,7 +2,7 @@ // GB_AxB__eq_ne_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_ne_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_ne_int32.c b/GraphBLAS/Source/Generated/GB_AxB__eq_ne_int32.c index bc6c920591..0092ab0f7a 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_ne_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_ne_int32.c @@ -2,7 +2,7 @@ // GB_AxB__eq_ne_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_ne_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_ne_int64.c b/GraphBLAS/Source/Generated/GB_AxB__eq_ne_int64.c index 69a4cf07e9..c7a2ac0ca5 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_ne_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_ne_int64.c @@ -2,7 +2,7 @@ // GB_AxB__eq_ne_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_ne_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_ne_int8.c b/GraphBLAS/Source/Generated/GB_AxB__eq_ne_int8.c index 29cc761bd0..f0bd754ed7 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_ne_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_ne_int8.c @@ -2,7 +2,7 @@ // GB_AxB__eq_ne_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_ne_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_ne_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__eq_ne_uint16.c index f7864540ea..3ff6608423 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_ne_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_ne_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__eq_ne_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_ne_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_ne_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__eq_ne_uint32.c index e098e12471..306d6eac0e 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_ne_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_ne_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__eq_ne_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_ne_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_ne_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__eq_ne_uint64.c index 5af3db8787..b3576b8b91 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_ne_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_ne_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__eq_ne_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_ne_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_ne_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__eq_ne_uint8.c index 2f11961f68..3e5180d4e5 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_ne_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_ne_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__eq_ne_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_ne_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__eq_second_bool.c b/GraphBLAS/Source/Generated/GB_AxB__eq_second_bool.c index a1a4795dc0..342ba51258 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__eq_second_bool.c +++ b/GraphBLAS/Source/Generated/GB_AxB__eq_second_bool.c @@ -2,7 +2,7 @@ // GB_AxB__eq_second_bool: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__eq_second_bool GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_eq_bool.c b/GraphBLAS/Source/Generated/GB_AxB__land_eq_bool.c index c080fa9712..8e62db566b 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_eq_bool.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_eq_bool.c @@ -2,7 +2,7 @@ // GB_AxB__land_eq_bool: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_eq_bool GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_eq_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__land_eq_fp32.c index 5bf469eb50..f5a6e6f7a9 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_eq_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_eq_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__land_eq_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_eq_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_eq_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__land_eq_fp64.c index 918abfa98a..202bf6f1a4 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_eq_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_eq_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__land_eq_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_eq_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_eq_int16.c b/GraphBLAS/Source/Generated/GB_AxB__land_eq_int16.c index b684aa11e5..bd98a414a7 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_eq_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_eq_int16.c @@ -2,7 +2,7 @@ // GB_AxB__land_eq_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_eq_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_eq_int32.c b/GraphBLAS/Source/Generated/GB_AxB__land_eq_int32.c index b41ac705e2..bb6a4bc674 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_eq_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_eq_int32.c @@ -2,7 +2,7 @@ // GB_AxB__land_eq_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_eq_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_eq_int64.c b/GraphBLAS/Source/Generated/GB_AxB__land_eq_int64.c index 9685f7dced..39f9db632a 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_eq_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_eq_int64.c @@ -2,7 +2,7 @@ // GB_AxB__land_eq_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_eq_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_eq_int8.c b/GraphBLAS/Source/Generated/GB_AxB__land_eq_int8.c index 0de694f603..fc212f1800 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_eq_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_eq_int8.c @@ -2,7 +2,7 @@ // GB_AxB__land_eq_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_eq_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_eq_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__land_eq_uint16.c index 2401a5e8f0..03457cc3c1 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_eq_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_eq_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__land_eq_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_eq_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_eq_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__land_eq_uint32.c index c0f4477e91..7cd4c09d06 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_eq_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_eq_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__land_eq_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_eq_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_eq_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__land_eq_uint64.c index 491166bb4f..343107d619 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_eq_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_eq_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__land_eq_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_eq_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_eq_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__land_eq_uint8.c index 125250700d..ab3c6ec55c 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_eq_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_eq_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__land_eq_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_eq_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_first_bool.c b/GraphBLAS/Source/Generated/GB_AxB__land_first_bool.c index 55972d8f38..2a6ef2404a 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_first_bool.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_first_bool.c @@ -2,7 +2,7 @@ // GB_AxB__land_first_bool: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_first_bool GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_ge_bool.c b/GraphBLAS/Source/Generated/GB_AxB__land_ge_bool.c index 63ddb740ad..6359434006 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_ge_bool.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_ge_bool.c @@ -2,7 +2,7 @@ // GB_AxB__land_ge_bool: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_ge_bool GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_ge_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__land_ge_fp32.c index 9ed81520b2..ceda271587 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_ge_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_ge_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__land_ge_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_ge_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_ge_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__land_ge_fp64.c index 25344e26a3..8dd121bc6a 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_ge_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_ge_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__land_ge_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_ge_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_ge_int16.c b/GraphBLAS/Source/Generated/GB_AxB__land_ge_int16.c index 2911a99d8e..7342ba3d2a 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_ge_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_ge_int16.c @@ -2,7 +2,7 @@ // GB_AxB__land_ge_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_ge_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_ge_int32.c b/GraphBLAS/Source/Generated/GB_AxB__land_ge_int32.c index e4fd407c22..0fc4fc6798 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_ge_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_ge_int32.c @@ -2,7 +2,7 @@ // GB_AxB__land_ge_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_ge_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_ge_int64.c b/GraphBLAS/Source/Generated/GB_AxB__land_ge_int64.c index 8aed18ed02..409e3a3928 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_ge_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_ge_int64.c @@ -2,7 +2,7 @@ // GB_AxB__land_ge_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_ge_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_ge_int8.c b/GraphBLAS/Source/Generated/GB_AxB__land_ge_int8.c index bd05e1e857..1f228d400c 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_ge_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_ge_int8.c @@ -2,7 +2,7 @@ // GB_AxB__land_ge_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_ge_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_ge_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__land_ge_uint16.c index 990783fc75..9580a0f09e 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_ge_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_ge_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__land_ge_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_ge_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_ge_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__land_ge_uint32.c index ba68c276ac..511c340efa 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_ge_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_ge_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__land_ge_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_ge_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_ge_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__land_ge_uint64.c index 494e2e6899..4a06094c19 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_ge_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_ge_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__land_ge_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_ge_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_ge_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__land_ge_uint8.c index 4f20fcc4ac..dfee8a1cac 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_ge_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_ge_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__land_ge_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_ge_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_gt_bool.c b/GraphBLAS/Source/Generated/GB_AxB__land_gt_bool.c index 971bb08ea4..ab7362ff05 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_gt_bool.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_gt_bool.c @@ -2,7 +2,7 @@ // GB_AxB__land_gt_bool: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_gt_bool GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_gt_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__land_gt_fp32.c index 9261474c57..fe668dfaf5 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_gt_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_gt_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__land_gt_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_gt_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_gt_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__land_gt_fp64.c index 93db58da9e..aa9fc7dd94 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_gt_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_gt_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__land_gt_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_gt_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_gt_int16.c b/GraphBLAS/Source/Generated/GB_AxB__land_gt_int16.c index a4eecea2b7..a2ac91da3a 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_gt_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_gt_int16.c @@ -2,7 +2,7 @@ // GB_AxB__land_gt_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_gt_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_gt_int32.c b/GraphBLAS/Source/Generated/GB_AxB__land_gt_int32.c index 59ac0d5fcd..f2a894ee7c 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_gt_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_gt_int32.c @@ -2,7 +2,7 @@ // GB_AxB__land_gt_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_gt_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_gt_int64.c b/GraphBLAS/Source/Generated/GB_AxB__land_gt_int64.c index f09a34b8c6..aacf01a447 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_gt_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_gt_int64.c @@ -2,7 +2,7 @@ // GB_AxB__land_gt_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_gt_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_gt_int8.c b/GraphBLAS/Source/Generated/GB_AxB__land_gt_int8.c index 7c8f8cc6cd..8e32678466 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_gt_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_gt_int8.c @@ -2,7 +2,7 @@ // GB_AxB__land_gt_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_gt_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_gt_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__land_gt_uint16.c index 60f1f86eba..97e2fcd0fd 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_gt_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_gt_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__land_gt_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_gt_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_gt_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__land_gt_uint32.c index d5fc75e3e3..f90705ae2f 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_gt_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_gt_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__land_gt_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_gt_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_gt_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__land_gt_uint64.c index e619854a4e..615ae6972a 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_gt_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_gt_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__land_gt_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_gt_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_gt_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__land_gt_uint8.c index 8ff643d9b0..556a140c55 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_gt_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_gt_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__land_gt_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_gt_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_land_bool.c b/GraphBLAS/Source/Generated/GB_AxB__land_land_bool.c index ff87251670..6edd4e2662 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_land_bool.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_land_bool.c @@ -2,7 +2,7 @@ // GB_AxB__land_land_bool: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_land_bool GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_le_bool.c b/GraphBLAS/Source/Generated/GB_AxB__land_le_bool.c index acbeda73e6..e9f5b62cd9 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_le_bool.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_le_bool.c @@ -2,7 +2,7 @@ // GB_AxB__land_le_bool: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_le_bool GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_le_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__land_le_fp32.c index 626dec28fc..fbad5dfe12 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_le_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_le_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__land_le_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_le_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_le_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__land_le_fp64.c index e1da9e93e5..c76387b2cf 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_le_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_le_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__land_le_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_le_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_le_int16.c b/GraphBLAS/Source/Generated/GB_AxB__land_le_int16.c index 907d7fd3a3..de91380992 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_le_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_le_int16.c @@ -2,7 +2,7 @@ // GB_AxB__land_le_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_le_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_le_int32.c b/GraphBLAS/Source/Generated/GB_AxB__land_le_int32.c index 1c205355c2..f466a55ff5 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_le_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_le_int32.c @@ -2,7 +2,7 @@ // GB_AxB__land_le_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_le_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_le_int64.c b/GraphBLAS/Source/Generated/GB_AxB__land_le_int64.c index 28da6fc929..6e1a7731e3 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_le_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_le_int64.c @@ -2,7 +2,7 @@ // GB_AxB__land_le_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_le_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_le_int8.c b/GraphBLAS/Source/Generated/GB_AxB__land_le_int8.c index 0ac675ddfa..b9f7c14cc5 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_le_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_le_int8.c @@ -2,7 +2,7 @@ // GB_AxB__land_le_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_le_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_le_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__land_le_uint16.c index 3c48953723..b0a063bcf0 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_le_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_le_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__land_le_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_le_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_le_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__land_le_uint32.c index 10b09eecdb..6ca0f76997 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_le_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_le_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__land_le_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_le_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_le_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__land_le_uint64.c index c44915d030..3354dc37ab 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_le_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_le_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__land_le_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_le_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_le_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__land_le_uint8.c index f5d50513f1..de4d612625 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_le_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_le_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__land_le_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_le_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_lor_bool.c b/GraphBLAS/Source/Generated/GB_AxB__land_lor_bool.c index c61c085d52..bfa3db68eb 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_lor_bool.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_lor_bool.c @@ -2,7 +2,7 @@ // GB_AxB__land_lor_bool: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_lor_bool GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_lt_bool.c b/GraphBLAS/Source/Generated/GB_AxB__land_lt_bool.c index f7b8000f17..d3bca7b448 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_lt_bool.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_lt_bool.c @@ -2,7 +2,7 @@ // GB_AxB__land_lt_bool: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_lt_bool GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_lt_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__land_lt_fp32.c index 40726731f6..48a93c0481 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_lt_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_lt_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__land_lt_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_lt_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_lt_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__land_lt_fp64.c index b934c30263..f7c3c5b843 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_lt_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_lt_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__land_lt_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_lt_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_lt_int16.c b/GraphBLAS/Source/Generated/GB_AxB__land_lt_int16.c index 16ae765039..6e8cdb4902 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_lt_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_lt_int16.c @@ -2,7 +2,7 @@ // GB_AxB__land_lt_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_lt_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_lt_int32.c b/GraphBLAS/Source/Generated/GB_AxB__land_lt_int32.c index ff26bef2c2..28a6cf2f08 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_lt_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_lt_int32.c @@ -2,7 +2,7 @@ // GB_AxB__land_lt_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_lt_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_lt_int64.c b/GraphBLAS/Source/Generated/GB_AxB__land_lt_int64.c index f8de86ec22..5cbf434e5a 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_lt_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_lt_int64.c @@ -2,7 +2,7 @@ // GB_AxB__land_lt_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_lt_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_lt_int8.c b/GraphBLAS/Source/Generated/GB_AxB__land_lt_int8.c index fb4cbf0168..c239f1b9b6 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_lt_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_lt_int8.c @@ -2,7 +2,7 @@ // GB_AxB__land_lt_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_lt_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_lt_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__land_lt_uint16.c index 48082b6679..21e071e9e2 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_lt_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_lt_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__land_lt_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_lt_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_lt_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__land_lt_uint32.c index eac8fe51c4..dd11c74124 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_lt_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_lt_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__land_lt_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_lt_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_lt_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__land_lt_uint64.c index cd348194be..dbb0fdb0c4 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_lt_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_lt_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__land_lt_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_lt_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_lt_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__land_lt_uint8.c index 4990af833d..c83bf821ec 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_lt_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_lt_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__land_lt_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_lt_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_lxor_bool.c b/GraphBLAS/Source/Generated/GB_AxB__land_lxor_bool.c index 34ad8230e1..7260272eca 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_lxor_bool.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_lxor_bool.c @@ -2,7 +2,7 @@ // GB_AxB__land_lxor_bool: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_lxor_bool GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_ne_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__land_ne_fp32.c index 8173fdc512..c9f9ff34f4 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_ne_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_ne_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__land_ne_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_ne_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_ne_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__land_ne_fp64.c index 2cba6bc41e..1becd3501f 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_ne_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_ne_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__land_ne_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_ne_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_ne_int16.c b/GraphBLAS/Source/Generated/GB_AxB__land_ne_int16.c index d1b90a7eba..bd3bb37e88 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_ne_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_ne_int16.c @@ -2,7 +2,7 @@ // GB_AxB__land_ne_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_ne_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_ne_int32.c b/GraphBLAS/Source/Generated/GB_AxB__land_ne_int32.c index a84958d74c..0eafcbb22e 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_ne_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_ne_int32.c @@ -2,7 +2,7 @@ // GB_AxB__land_ne_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_ne_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_ne_int64.c b/GraphBLAS/Source/Generated/GB_AxB__land_ne_int64.c index d8cb1af870..9257f6abb0 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_ne_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_ne_int64.c @@ -2,7 +2,7 @@ // GB_AxB__land_ne_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_ne_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_ne_int8.c b/GraphBLAS/Source/Generated/GB_AxB__land_ne_int8.c index ce6f08c997..a5883e6773 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_ne_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_ne_int8.c @@ -2,7 +2,7 @@ // GB_AxB__land_ne_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_ne_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_ne_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__land_ne_uint16.c index 6b66c53cb7..d9e1fb5c0a 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_ne_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_ne_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__land_ne_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_ne_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_ne_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__land_ne_uint32.c index bcc19dd77f..85937c5b99 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_ne_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_ne_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__land_ne_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_ne_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_ne_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__land_ne_uint64.c index 4e39c4367a..b0fb4cc71c 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_ne_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_ne_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__land_ne_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_ne_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_ne_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__land_ne_uint8.c index d2664367c5..7acc960d79 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_ne_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_ne_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__land_ne_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_ne_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__land_second_bool.c b/GraphBLAS/Source/Generated/GB_AxB__land_second_bool.c index 7b500c26ae..af6a515114 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__land_second_bool.c +++ b/GraphBLAS/Source/Generated/GB_AxB__land_second_bool.c @@ -2,7 +2,7 @@ // GB_AxB__land_second_bool: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__land_second_bool GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_eq_bool.c b/GraphBLAS/Source/Generated/GB_AxB__lor_eq_bool.c index 4423387f5b..0b77e7b39b 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_eq_bool.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_eq_bool.c @@ -2,7 +2,7 @@ // GB_AxB__lor_eq_bool: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_eq_bool GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_eq_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__lor_eq_fp32.c index 295f67ba8a..f0fe247a12 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_eq_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_eq_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__lor_eq_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_eq_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_eq_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__lor_eq_fp64.c index 875e0bd26c..a11def4852 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_eq_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_eq_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__lor_eq_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_eq_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_eq_int16.c b/GraphBLAS/Source/Generated/GB_AxB__lor_eq_int16.c index 00e6ea71f8..12ddcda15c 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_eq_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_eq_int16.c @@ -2,7 +2,7 @@ // GB_AxB__lor_eq_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_eq_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_eq_int32.c b/GraphBLAS/Source/Generated/GB_AxB__lor_eq_int32.c index 037e42cb08..760de96eca 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_eq_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_eq_int32.c @@ -2,7 +2,7 @@ // GB_AxB__lor_eq_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_eq_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_eq_int64.c b/GraphBLAS/Source/Generated/GB_AxB__lor_eq_int64.c index fe69a33ad4..6e80b25c50 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_eq_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_eq_int64.c @@ -2,7 +2,7 @@ // GB_AxB__lor_eq_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_eq_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_eq_int8.c b/GraphBLAS/Source/Generated/GB_AxB__lor_eq_int8.c index 7cf58a2a50..0e6918a144 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_eq_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_eq_int8.c @@ -2,7 +2,7 @@ // GB_AxB__lor_eq_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_eq_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_eq_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__lor_eq_uint16.c index a1c6d7d7dd..16beb64ad1 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_eq_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_eq_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__lor_eq_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_eq_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_eq_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__lor_eq_uint32.c index 3acee2898d..02adc25bd3 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_eq_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_eq_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__lor_eq_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_eq_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_eq_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__lor_eq_uint64.c index 6a98d74aef..d84ba11475 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_eq_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_eq_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__lor_eq_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_eq_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_eq_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__lor_eq_uint8.c index 974fefd6d1..4c080bd3c0 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_eq_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_eq_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__lor_eq_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_eq_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_first_bool.c b/GraphBLAS/Source/Generated/GB_AxB__lor_first_bool.c index c5ff649896..471cd87cc1 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_first_bool.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_first_bool.c @@ -2,7 +2,7 @@ // GB_AxB__lor_first_bool: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_first_bool GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_ge_bool.c b/GraphBLAS/Source/Generated/GB_AxB__lor_ge_bool.c index 9cb12286a8..b6b6ce9001 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_ge_bool.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_ge_bool.c @@ -2,7 +2,7 @@ // GB_AxB__lor_ge_bool: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_ge_bool GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_ge_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__lor_ge_fp32.c index 5950e39f6a..66b0aff909 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_ge_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_ge_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__lor_ge_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_ge_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_ge_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__lor_ge_fp64.c index be03aba5d7..2c8a39788f 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_ge_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_ge_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__lor_ge_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_ge_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_ge_int16.c b/GraphBLAS/Source/Generated/GB_AxB__lor_ge_int16.c index d2eb0b260b..4afa153842 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_ge_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_ge_int16.c @@ -2,7 +2,7 @@ // GB_AxB__lor_ge_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_ge_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_ge_int32.c b/GraphBLAS/Source/Generated/GB_AxB__lor_ge_int32.c index 7affbb7bb4..48b1e2da08 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_ge_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_ge_int32.c @@ -2,7 +2,7 @@ // GB_AxB__lor_ge_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_ge_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_ge_int64.c b/GraphBLAS/Source/Generated/GB_AxB__lor_ge_int64.c index 613ce99edc..05e8cb4aaa 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_ge_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_ge_int64.c @@ -2,7 +2,7 @@ // GB_AxB__lor_ge_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_ge_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_ge_int8.c b/GraphBLAS/Source/Generated/GB_AxB__lor_ge_int8.c index bff58a4ae3..5fefa93bfb 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_ge_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_ge_int8.c @@ -2,7 +2,7 @@ // GB_AxB__lor_ge_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_ge_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_ge_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__lor_ge_uint16.c index d4a659e4af..9a40eaca9a 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_ge_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_ge_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__lor_ge_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_ge_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_ge_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__lor_ge_uint32.c index 067caaf868..4e909a265a 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_ge_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_ge_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__lor_ge_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_ge_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_ge_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__lor_ge_uint64.c index 5825a8a4c1..66d032aadf 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_ge_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_ge_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__lor_ge_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_ge_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_ge_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__lor_ge_uint8.c index 9d01a9f8b0..98858708aa 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_ge_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_ge_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__lor_ge_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_ge_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_gt_bool.c b/GraphBLAS/Source/Generated/GB_AxB__lor_gt_bool.c index 393e892396..b4c3be1f1e 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_gt_bool.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_gt_bool.c @@ -2,7 +2,7 @@ // GB_AxB__lor_gt_bool: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_gt_bool GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_gt_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__lor_gt_fp32.c index f175c210b6..5e4184a8a5 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_gt_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_gt_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__lor_gt_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_gt_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_gt_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__lor_gt_fp64.c index 91b74140da..713942c427 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_gt_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_gt_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__lor_gt_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_gt_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_gt_int16.c b/GraphBLAS/Source/Generated/GB_AxB__lor_gt_int16.c index e0ff9b7940..8d6477c932 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_gt_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_gt_int16.c @@ -2,7 +2,7 @@ // GB_AxB__lor_gt_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_gt_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_gt_int32.c b/GraphBLAS/Source/Generated/GB_AxB__lor_gt_int32.c index 7fb24d9a83..2a7feafa42 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_gt_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_gt_int32.c @@ -2,7 +2,7 @@ // GB_AxB__lor_gt_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_gt_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_gt_int64.c b/GraphBLAS/Source/Generated/GB_AxB__lor_gt_int64.c index 31bd062820..9813914d31 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_gt_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_gt_int64.c @@ -2,7 +2,7 @@ // GB_AxB__lor_gt_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_gt_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_gt_int8.c b/GraphBLAS/Source/Generated/GB_AxB__lor_gt_int8.c index 3882ca0740..ef6df0d8b9 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_gt_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_gt_int8.c @@ -2,7 +2,7 @@ // GB_AxB__lor_gt_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_gt_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_gt_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__lor_gt_uint16.c index 617fbfd113..9ca8e932b7 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_gt_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_gt_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__lor_gt_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_gt_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_gt_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__lor_gt_uint32.c index 0b8c083ecb..12c8a328fe 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_gt_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_gt_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__lor_gt_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_gt_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_gt_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__lor_gt_uint64.c index e6e3b5f2da..5755553f03 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_gt_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_gt_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__lor_gt_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_gt_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_gt_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__lor_gt_uint8.c index aa74bb262e..59490fcc18 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_gt_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_gt_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__lor_gt_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_gt_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_land_bool.c b/GraphBLAS/Source/Generated/GB_AxB__lor_land_bool.c index eb82b62b87..7a9f2fbad9 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_land_bool.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_land_bool.c @@ -2,7 +2,7 @@ // GB_AxB__lor_land_bool: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_land_bool GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_le_bool.c b/GraphBLAS/Source/Generated/GB_AxB__lor_le_bool.c index 5df6165d2f..1620d4ac93 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_le_bool.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_le_bool.c @@ -2,7 +2,7 @@ // GB_AxB__lor_le_bool: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_le_bool GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_le_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__lor_le_fp32.c index 170520310c..938275ca71 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_le_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_le_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__lor_le_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_le_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_le_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__lor_le_fp64.c index d0e1f4673b..2a70ef6967 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_le_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_le_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__lor_le_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_le_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_le_int16.c b/GraphBLAS/Source/Generated/GB_AxB__lor_le_int16.c index 794ba59027..88a302d466 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_le_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_le_int16.c @@ -2,7 +2,7 @@ // GB_AxB__lor_le_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_le_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_le_int32.c b/GraphBLAS/Source/Generated/GB_AxB__lor_le_int32.c index e2bc5d9fd1..0a738b5a63 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_le_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_le_int32.c @@ -2,7 +2,7 @@ // GB_AxB__lor_le_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_le_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_le_int64.c b/GraphBLAS/Source/Generated/GB_AxB__lor_le_int64.c index 078189cfba..329a4d9b72 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_le_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_le_int64.c @@ -2,7 +2,7 @@ // GB_AxB__lor_le_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_le_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_le_int8.c b/GraphBLAS/Source/Generated/GB_AxB__lor_le_int8.c index 237d05c1ad..b7f5cd11b9 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_le_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_le_int8.c @@ -2,7 +2,7 @@ // GB_AxB__lor_le_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_le_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_le_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__lor_le_uint16.c index afe90be16b..064f48df23 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_le_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_le_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__lor_le_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_le_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_le_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__lor_le_uint32.c index d78be1cd4e..abdcd58a5c 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_le_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_le_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__lor_le_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_le_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_le_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__lor_le_uint64.c index e8d0e1aea2..47989f6f0d 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_le_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_le_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__lor_le_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_le_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_le_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__lor_le_uint8.c index 4dd48edbb8..cf78459d74 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_le_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_le_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__lor_le_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_le_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_lor_bool.c b/GraphBLAS/Source/Generated/GB_AxB__lor_lor_bool.c index f3a6dc85bf..8fd1f2fe43 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_lor_bool.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_lor_bool.c @@ -2,7 +2,7 @@ // GB_AxB__lor_lor_bool: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_lor_bool GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_lt_bool.c b/GraphBLAS/Source/Generated/GB_AxB__lor_lt_bool.c index 914004df0c..bdfde121c0 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_lt_bool.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_lt_bool.c @@ -2,7 +2,7 @@ // GB_AxB__lor_lt_bool: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_lt_bool GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_lt_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__lor_lt_fp32.c index 3783fa554c..865f6e9fd1 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_lt_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_lt_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__lor_lt_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_lt_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_lt_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__lor_lt_fp64.c index 549a3c470e..db3eae9728 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_lt_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_lt_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__lor_lt_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_lt_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_lt_int16.c b/GraphBLAS/Source/Generated/GB_AxB__lor_lt_int16.c index f96789fc53..28bc5d6c49 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_lt_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_lt_int16.c @@ -2,7 +2,7 @@ // GB_AxB__lor_lt_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_lt_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_lt_int32.c b/GraphBLAS/Source/Generated/GB_AxB__lor_lt_int32.c index f5edf09599..b6eebf3b83 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_lt_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_lt_int32.c @@ -2,7 +2,7 @@ // GB_AxB__lor_lt_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_lt_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_lt_int64.c b/GraphBLAS/Source/Generated/GB_AxB__lor_lt_int64.c index 77aca146d6..c72560e33f 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_lt_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_lt_int64.c @@ -2,7 +2,7 @@ // GB_AxB__lor_lt_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_lt_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_lt_int8.c b/GraphBLAS/Source/Generated/GB_AxB__lor_lt_int8.c index b2bfcc030e..0ceb74b475 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_lt_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_lt_int8.c @@ -2,7 +2,7 @@ // GB_AxB__lor_lt_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_lt_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_lt_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__lor_lt_uint16.c index c137511e52..98f6c035b8 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_lt_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_lt_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__lor_lt_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_lt_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_lt_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__lor_lt_uint32.c index ac35907021..25d82687ee 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_lt_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_lt_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__lor_lt_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_lt_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_lt_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__lor_lt_uint64.c index 0003f4a69b..852fb627f0 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_lt_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_lt_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__lor_lt_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_lt_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_lt_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__lor_lt_uint8.c index 0e32970990..0638c713e8 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_lt_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_lt_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__lor_lt_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_lt_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_lxor_bool.c b/GraphBLAS/Source/Generated/GB_AxB__lor_lxor_bool.c index 7da8f89ace..341a4c1eac 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_lxor_bool.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_lxor_bool.c @@ -2,7 +2,7 @@ // GB_AxB__lor_lxor_bool: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_lxor_bool GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_ne_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__lor_ne_fp32.c index 27a288f61d..b2843140de 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_ne_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_ne_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__lor_ne_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_ne_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_ne_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__lor_ne_fp64.c index 2ad3beba8d..e8c80fb754 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_ne_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_ne_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__lor_ne_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_ne_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_ne_int16.c b/GraphBLAS/Source/Generated/GB_AxB__lor_ne_int16.c index f07091c3ac..b47fc24a67 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_ne_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_ne_int16.c @@ -2,7 +2,7 @@ // GB_AxB__lor_ne_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_ne_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_ne_int32.c b/GraphBLAS/Source/Generated/GB_AxB__lor_ne_int32.c index 2c4ecc57a1..2b71b6014b 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_ne_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_ne_int32.c @@ -2,7 +2,7 @@ // GB_AxB__lor_ne_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_ne_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_ne_int64.c b/GraphBLAS/Source/Generated/GB_AxB__lor_ne_int64.c index 56dc1f4a3e..a35eb13364 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_ne_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_ne_int64.c @@ -2,7 +2,7 @@ // GB_AxB__lor_ne_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_ne_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_ne_int8.c b/GraphBLAS/Source/Generated/GB_AxB__lor_ne_int8.c index 357fa25040..8efbb56388 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_ne_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_ne_int8.c @@ -2,7 +2,7 @@ // GB_AxB__lor_ne_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_ne_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_ne_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__lor_ne_uint16.c index a154f487ce..348db46bfd 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_ne_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_ne_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__lor_ne_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_ne_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_ne_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__lor_ne_uint32.c index e4b650b524..b6716dc532 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_ne_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_ne_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__lor_ne_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_ne_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_ne_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__lor_ne_uint64.c index a137c3e216..c90094bed6 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_ne_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_ne_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__lor_ne_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_ne_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_ne_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__lor_ne_uint8.c index 84ea4c23c3..e2a40ccc46 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_ne_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_ne_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__lor_ne_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_ne_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lor_second_bool.c b/GraphBLAS/Source/Generated/GB_AxB__lor_second_bool.c index 7518f1d861..5f96530eb5 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lor_second_bool.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lor_second_bool.c @@ -2,7 +2,7 @@ // GB_AxB__lor_second_bool: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lor_second_bool GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_eq_bool.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_eq_bool.c index 6aa567761b..055eb25493 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_eq_bool.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_eq_bool.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_eq_bool: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_eq_bool GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_eq_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_eq_fp32.c index 63c7112df7..60c7c0233b 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_eq_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_eq_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_eq_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_eq_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_eq_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_eq_fp64.c index 3d283d056a..1eb3d970ee 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_eq_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_eq_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_eq_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_eq_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_eq_int16.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_eq_int16.c index d54f3adc8d..72650feb6f 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_eq_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_eq_int16.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_eq_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_eq_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_eq_int32.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_eq_int32.c index 57f269635d..13ea97bfe1 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_eq_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_eq_int32.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_eq_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_eq_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_eq_int64.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_eq_int64.c index c5ac120b04..b55ec554a8 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_eq_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_eq_int64.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_eq_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_eq_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_eq_int8.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_eq_int8.c index c33d4f642b..5cab443220 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_eq_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_eq_int8.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_eq_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_eq_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_eq_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_eq_uint16.c index 591bc72cde..2d3d6e2e06 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_eq_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_eq_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_eq_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_eq_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_eq_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_eq_uint32.c index 3649aee704..6053f3c58b 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_eq_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_eq_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_eq_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_eq_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_eq_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_eq_uint64.c index 28001b4464..68533f2c6b 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_eq_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_eq_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_eq_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_eq_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_eq_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_eq_uint8.c index a9198425f1..185a7b2cb9 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_eq_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_eq_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_eq_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_eq_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_first_bool.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_first_bool.c index 7c7fb87883..d6826f9967 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_first_bool.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_first_bool.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_first_bool: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_first_bool GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_ge_bool.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_ge_bool.c index 2df57b08e4..2188db921a 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_ge_bool.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_ge_bool.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_ge_bool: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_ge_bool GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_ge_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_ge_fp32.c index 71cbe5111d..550108871b 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_ge_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_ge_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_ge_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_ge_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_ge_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_ge_fp64.c index 92053f1856..4488d95895 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_ge_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_ge_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_ge_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_ge_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_ge_int16.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_ge_int16.c index 4d9db48d70..d409774fb8 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_ge_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_ge_int16.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_ge_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_ge_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_ge_int32.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_ge_int32.c index bca1305ef2..d943c26b10 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_ge_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_ge_int32.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_ge_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_ge_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_ge_int64.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_ge_int64.c index 02b9c4c19a..2e3a494e5e 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_ge_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_ge_int64.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_ge_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_ge_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_ge_int8.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_ge_int8.c index 69b0c2c4f4..0e1f84eb36 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_ge_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_ge_int8.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_ge_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_ge_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_ge_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_ge_uint16.c index 6ec6be3679..32b595ee4b 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_ge_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_ge_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_ge_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_ge_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_ge_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_ge_uint32.c index 20a46dae8b..613b9c29c0 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_ge_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_ge_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_ge_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_ge_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_ge_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_ge_uint64.c index 22216b0bff..fa44afd8b1 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_ge_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_ge_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_ge_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_ge_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_ge_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_ge_uint8.c index 32f7d798ad..7d518270ce 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_ge_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_ge_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_ge_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_ge_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_gt_bool.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_gt_bool.c index 49224e92ee..45893b9c19 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_gt_bool.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_gt_bool.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_gt_bool: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_gt_bool GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_gt_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_gt_fp32.c index 353bf0f0c5..47ef7852db 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_gt_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_gt_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_gt_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_gt_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_gt_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_gt_fp64.c index b2bdbdda9e..09f3c3cc37 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_gt_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_gt_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_gt_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_gt_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_gt_int16.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_gt_int16.c index 3295402cff..f4ccc0f3b3 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_gt_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_gt_int16.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_gt_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_gt_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_gt_int32.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_gt_int32.c index 1956ef8ce3..be2e7f8c4c 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_gt_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_gt_int32.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_gt_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_gt_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_gt_int64.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_gt_int64.c index 1ebac11fbc..4f17cb279c 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_gt_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_gt_int64.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_gt_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_gt_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_gt_int8.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_gt_int8.c index 83d2d03fc9..18f2078b20 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_gt_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_gt_int8.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_gt_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_gt_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_gt_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_gt_uint16.c index 87eb7d986d..70dedd78be 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_gt_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_gt_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_gt_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_gt_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_gt_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_gt_uint32.c index d2b646cd44..6262fcc0ca 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_gt_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_gt_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_gt_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_gt_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_gt_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_gt_uint64.c index ff68d6aa36..7c7a0b76dd 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_gt_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_gt_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_gt_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_gt_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_gt_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_gt_uint8.c index 4f32c97a9b..70c445ea4e 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_gt_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_gt_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_gt_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_gt_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_land_bool.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_land_bool.c index 9bf64b0566..879af0d638 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_land_bool.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_land_bool.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_land_bool: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_land_bool GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_le_bool.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_le_bool.c index 62cb908b4b..337a44e0f2 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_le_bool.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_le_bool.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_le_bool: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_le_bool GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_le_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_le_fp32.c index 10a9d72fec..b1c3566f29 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_le_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_le_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_le_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_le_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_le_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_le_fp64.c index 23c900a8ca..cdd6b6de7c 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_le_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_le_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_le_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_le_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_le_int16.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_le_int16.c index 83649ed98d..b9158dceea 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_le_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_le_int16.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_le_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_le_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_le_int32.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_le_int32.c index a217ebdf10..fc4f61d7f1 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_le_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_le_int32.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_le_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_le_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_le_int64.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_le_int64.c index 0956436170..b8cf7fc1d8 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_le_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_le_int64.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_le_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_le_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_le_int8.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_le_int8.c index 18af7165ca..146761d23f 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_le_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_le_int8.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_le_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_le_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_le_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_le_uint16.c index 5412975180..40f17821ba 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_le_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_le_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_le_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_le_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_le_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_le_uint32.c index fbcffecae7..3f893c6a98 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_le_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_le_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_le_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_le_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_le_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_le_uint64.c index 328d29fb54..6feeb1672c 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_le_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_le_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_le_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_le_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_le_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_le_uint8.c index 99cecca4be..a02ecf28c5 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_le_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_le_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_le_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_le_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_lor_bool.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_lor_bool.c index 191a32f67a..2f5fddfe02 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_lor_bool.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_lor_bool.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_lor_bool: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_lor_bool GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_lt_bool.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_lt_bool.c index f1145e83e4..565534658d 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_lt_bool.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_lt_bool.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_lt_bool: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_lt_bool GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_lt_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_lt_fp32.c index 373b93ce9f..a6e6054fbb 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_lt_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_lt_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_lt_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_lt_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_lt_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_lt_fp64.c index fa89b0d056..542fb13e8f 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_lt_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_lt_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_lt_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_lt_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_lt_int16.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_lt_int16.c index 754e3daaf8..f52c0f5c1a 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_lt_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_lt_int16.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_lt_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_lt_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_lt_int32.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_lt_int32.c index d5ed77875b..6c452cf5fc 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_lt_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_lt_int32.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_lt_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_lt_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_lt_int64.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_lt_int64.c index 5701761a95..5e1208c46a 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_lt_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_lt_int64.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_lt_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_lt_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_lt_int8.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_lt_int8.c index 46196131dc..e29b52c6fd 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_lt_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_lt_int8.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_lt_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_lt_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_lt_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_lt_uint16.c index 5dd8564172..d2c0649209 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_lt_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_lt_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_lt_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_lt_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_lt_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_lt_uint32.c index 17fe9d30a3..d7fac5df67 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_lt_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_lt_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_lt_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_lt_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_lt_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_lt_uint64.c index eb196d810e..b57b4e0bfe 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_lt_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_lt_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_lt_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_lt_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_lt_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_lt_uint8.c index 2e4347a5df..403cca5117 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_lt_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_lt_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_lt_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_lt_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_lxor_bool.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_lxor_bool.c index 8aac7cb990..8014246914 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_lxor_bool.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_lxor_bool.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_lxor_bool: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_lxor_bool GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_ne_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_ne_fp32.c index 0d2ad19f17..e9eb9b431e 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_ne_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_ne_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_ne_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_ne_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_ne_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_ne_fp64.c index 750fa42eff..643b4ba631 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_ne_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_ne_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_ne_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_ne_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_ne_int16.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_ne_int16.c index c2f01ae19a..6170724349 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_ne_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_ne_int16.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_ne_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_ne_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_ne_int32.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_ne_int32.c index 08caa73f68..767db3c79f 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_ne_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_ne_int32.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_ne_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_ne_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_ne_int64.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_ne_int64.c index 77f47a5d5c..26a15dfc41 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_ne_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_ne_int64.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_ne_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_ne_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_ne_int8.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_ne_int8.c index 948a11cf35..df216a69e3 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_ne_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_ne_int8.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_ne_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_ne_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_ne_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_ne_uint16.c index b273cc0b45..6866dbe577 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_ne_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_ne_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_ne_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_ne_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_ne_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_ne_uint32.c index 2ff4a57930..101fe3a0e6 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_ne_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_ne_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_ne_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_ne_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_ne_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_ne_uint64.c index 21e79a104a..eb763de902 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_ne_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_ne_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_ne_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_ne_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_ne_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_ne_uint8.c index 21b94da7f0..3ffa3095a3 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_ne_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_ne_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_ne_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_ne_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__lxor_second_bool.c b/GraphBLAS/Source/Generated/GB_AxB__lxor_second_bool.c index a36ec88ff0..867bf9aa1d 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__lxor_second_bool.c +++ b/GraphBLAS/Source/Generated/GB_AxB__lxor_second_bool.c @@ -2,7 +2,7 @@ // GB_AxB__lxor_second_bool: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__lxor_second_bool GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_div_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__max_div_fp32.c index f93cdacabe..9b3844b9ab 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_div_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_div_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__max_div_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_div_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_div_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__max_div_fp64.c index 43404d2998..337bdac35b 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_div_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_div_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__max_div_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_div_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_div_int16.c b/GraphBLAS/Source/Generated/GB_AxB__max_div_int16.c index 378c412050..e07efe4e1c 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_div_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_div_int16.c @@ -2,7 +2,7 @@ // GB_AxB__max_div_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_div_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_div_int32.c b/GraphBLAS/Source/Generated/GB_AxB__max_div_int32.c index 7fbb1edd51..99a2778d74 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_div_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_div_int32.c @@ -2,7 +2,7 @@ // GB_AxB__max_div_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_div_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_div_int64.c b/GraphBLAS/Source/Generated/GB_AxB__max_div_int64.c index 5c1bee5122..320fc3d6a8 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_div_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_div_int64.c @@ -2,7 +2,7 @@ // GB_AxB__max_div_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_div_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_div_int8.c b/GraphBLAS/Source/Generated/GB_AxB__max_div_int8.c index ffcc3a9fd9..17c4f65372 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_div_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_div_int8.c @@ -2,7 +2,7 @@ // GB_AxB__max_div_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_div_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_div_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__max_div_uint16.c index fa362157b1..87aa0e3dba 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_div_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_div_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__max_div_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_div_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_div_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__max_div_uint32.c index 369ac23555..6748202628 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_div_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_div_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__max_div_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_div_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_div_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__max_div_uint64.c index ab6e41f545..b81c544805 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_div_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_div_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__max_div_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_div_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_div_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__max_div_uint8.c index 29f344e53a..e95f1657d2 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_div_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_div_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__max_div_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_div_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_first_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__max_first_fp32.c index d6040796e7..e95a718fa3 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_first_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_first_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__max_first_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_first_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_first_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__max_first_fp64.c index 2a90b0ae54..961b8e7fba 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_first_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_first_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__max_first_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_first_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_first_int16.c b/GraphBLAS/Source/Generated/GB_AxB__max_first_int16.c index 2350633e41..ad5e6934bd 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_first_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_first_int16.c @@ -2,7 +2,7 @@ // GB_AxB__max_first_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_first_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_first_int32.c b/GraphBLAS/Source/Generated/GB_AxB__max_first_int32.c index cf8d6879ec..8bf565b76f 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_first_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_first_int32.c @@ -2,7 +2,7 @@ // GB_AxB__max_first_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_first_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_first_int64.c b/GraphBLAS/Source/Generated/GB_AxB__max_first_int64.c index 43ead2d61c..50c914226a 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_first_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_first_int64.c @@ -2,7 +2,7 @@ // GB_AxB__max_first_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_first_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_first_int8.c b/GraphBLAS/Source/Generated/GB_AxB__max_first_int8.c index c3129fe772..e8d90cd39b 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_first_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_first_int8.c @@ -2,7 +2,7 @@ // GB_AxB__max_first_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_first_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_first_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__max_first_uint16.c index 8b3dab4724..ca454dad09 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_first_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_first_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__max_first_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_first_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_first_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__max_first_uint32.c index 3fb2be62f8..b37fbc671b 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_first_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_first_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__max_first_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_first_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_first_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__max_first_uint64.c index 456b8331a4..3f911fe65b 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_first_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_first_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__max_first_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_first_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_first_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__max_first_uint8.c index 9cb638dd54..da9c6b36b9 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_first_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_first_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__max_first_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_first_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_iseq_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__max_iseq_fp32.c index 779cf24808..7feec31b54 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_iseq_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_iseq_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__max_iseq_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_iseq_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_iseq_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__max_iseq_fp64.c index 0672dc597a..446d9e76f7 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_iseq_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_iseq_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__max_iseq_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_iseq_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_iseq_int16.c b/GraphBLAS/Source/Generated/GB_AxB__max_iseq_int16.c index b76a39db15..f736e1126a 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_iseq_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_iseq_int16.c @@ -2,7 +2,7 @@ // GB_AxB__max_iseq_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_iseq_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_iseq_int32.c b/GraphBLAS/Source/Generated/GB_AxB__max_iseq_int32.c index dd0a17e88d..21ca763f18 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_iseq_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_iseq_int32.c @@ -2,7 +2,7 @@ // GB_AxB__max_iseq_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_iseq_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_iseq_int64.c b/GraphBLAS/Source/Generated/GB_AxB__max_iseq_int64.c index 802e4acd5e..3ade722125 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_iseq_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_iseq_int64.c @@ -2,7 +2,7 @@ // GB_AxB__max_iseq_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_iseq_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_iseq_int8.c b/GraphBLAS/Source/Generated/GB_AxB__max_iseq_int8.c index c7d8680e74..286e6f7959 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_iseq_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_iseq_int8.c @@ -2,7 +2,7 @@ // GB_AxB__max_iseq_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_iseq_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_iseq_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__max_iseq_uint16.c index 17379b5959..8b1b9150e4 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_iseq_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_iseq_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__max_iseq_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_iseq_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_iseq_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__max_iseq_uint32.c index 8dbc700394..61d37858cd 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_iseq_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_iseq_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__max_iseq_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_iseq_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_iseq_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__max_iseq_uint64.c index 3731158dcb..4cb4ea83ff 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_iseq_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_iseq_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__max_iseq_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_iseq_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_iseq_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__max_iseq_uint8.c index b3f59a0641..bc18b79fa4 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_iseq_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_iseq_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__max_iseq_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_iseq_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_isge_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__max_isge_fp32.c index 8ce4358918..24ce5a2a96 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_isge_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_isge_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__max_isge_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_isge_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_isge_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__max_isge_fp64.c index 65cfa04dc5..a1fcbc1fab 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_isge_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_isge_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__max_isge_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_isge_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_isge_int16.c b/GraphBLAS/Source/Generated/GB_AxB__max_isge_int16.c index 9a3ae3382c..548f6cbd43 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_isge_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_isge_int16.c @@ -2,7 +2,7 @@ // GB_AxB__max_isge_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_isge_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_isge_int32.c b/GraphBLAS/Source/Generated/GB_AxB__max_isge_int32.c index a8c19efbc7..c520b5f7ca 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_isge_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_isge_int32.c @@ -2,7 +2,7 @@ // GB_AxB__max_isge_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_isge_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_isge_int64.c b/GraphBLAS/Source/Generated/GB_AxB__max_isge_int64.c index 81f920c4b4..ee59b2723f 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_isge_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_isge_int64.c @@ -2,7 +2,7 @@ // GB_AxB__max_isge_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_isge_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_isge_int8.c b/GraphBLAS/Source/Generated/GB_AxB__max_isge_int8.c index 0a22dae348..a3e9483eb5 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_isge_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_isge_int8.c @@ -2,7 +2,7 @@ // GB_AxB__max_isge_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_isge_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_isge_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__max_isge_uint16.c index e1a8c23040..28b4c6a4e6 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_isge_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_isge_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__max_isge_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_isge_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_isge_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__max_isge_uint32.c index a34851b3db..c3e6b032e4 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_isge_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_isge_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__max_isge_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_isge_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_isge_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__max_isge_uint64.c index 1f77ae7adf..3b5e3f25e4 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_isge_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_isge_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__max_isge_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_isge_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_isge_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__max_isge_uint8.c index 71b59dc11d..68e326a630 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_isge_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_isge_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__max_isge_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_isge_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_isgt_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__max_isgt_fp32.c index b7377b07d3..a6afc3a0ec 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_isgt_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_isgt_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__max_isgt_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_isgt_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_isgt_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__max_isgt_fp64.c index 5f6c3dba3f..ff4552201f 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_isgt_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_isgt_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__max_isgt_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_isgt_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_isgt_int16.c b/GraphBLAS/Source/Generated/GB_AxB__max_isgt_int16.c index d8cca8049e..0deb58f249 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_isgt_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_isgt_int16.c @@ -2,7 +2,7 @@ // GB_AxB__max_isgt_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_isgt_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_isgt_int32.c b/GraphBLAS/Source/Generated/GB_AxB__max_isgt_int32.c index fe97278230..0bdcd85415 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_isgt_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_isgt_int32.c @@ -2,7 +2,7 @@ // GB_AxB__max_isgt_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_isgt_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_isgt_int64.c b/GraphBLAS/Source/Generated/GB_AxB__max_isgt_int64.c index 641a4fcc68..778732d10b 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_isgt_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_isgt_int64.c @@ -2,7 +2,7 @@ // GB_AxB__max_isgt_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_isgt_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_isgt_int8.c b/GraphBLAS/Source/Generated/GB_AxB__max_isgt_int8.c index cf96559d4d..29264bf26a 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_isgt_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_isgt_int8.c @@ -2,7 +2,7 @@ // GB_AxB__max_isgt_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_isgt_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_isgt_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__max_isgt_uint16.c index bc158d4f1a..57edf28ebf 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_isgt_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_isgt_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__max_isgt_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_isgt_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_isgt_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__max_isgt_uint32.c index 81d92ed57d..2b582af222 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_isgt_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_isgt_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__max_isgt_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_isgt_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_isgt_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__max_isgt_uint64.c index b1e08f5d01..0aa8a26a01 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_isgt_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_isgt_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__max_isgt_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_isgt_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_isgt_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__max_isgt_uint8.c index dfcc0c0f3d..a14c41eedc 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_isgt_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_isgt_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__max_isgt_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_isgt_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_isle_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__max_isle_fp32.c index 7db2a02fb6..c83345ec9d 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_isle_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_isle_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__max_isle_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_isle_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_isle_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__max_isle_fp64.c index 21ae933611..4753063327 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_isle_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_isle_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__max_isle_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_isle_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_isle_int16.c b/GraphBLAS/Source/Generated/GB_AxB__max_isle_int16.c index 19045b5103..21e8cb5dc4 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_isle_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_isle_int16.c @@ -2,7 +2,7 @@ // GB_AxB__max_isle_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_isle_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_isle_int32.c b/GraphBLAS/Source/Generated/GB_AxB__max_isle_int32.c index d8baec1340..7aa610ff3b 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_isle_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_isle_int32.c @@ -2,7 +2,7 @@ // GB_AxB__max_isle_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_isle_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_isle_int64.c b/GraphBLAS/Source/Generated/GB_AxB__max_isle_int64.c index ddd0eafad7..5607dde089 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_isle_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_isle_int64.c @@ -2,7 +2,7 @@ // GB_AxB__max_isle_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_isle_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_isle_int8.c b/GraphBLAS/Source/Generated/GB_AxB__max_isle_int8.c index c0f32bbda9..8f64955514 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_isle_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_isle_int8.c @@ -2,7 +2,7 @@ // GB_AxB__max_isle_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_isle_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_isle_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__max_isle_uint16.c index 433039b820..34f69fc796 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_isle_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_isle_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__max_isle_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_isle_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_isle_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__max_isle_uint32.c index 9c061d371c..fe9591f703 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_isle_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_isle_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__max_isle_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_isle_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_isle_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__max_isle_uint64.c index e5a910dddb..97940aca9a 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_isle_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_isle_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__max_isle_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_isle_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_isle_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__max_isle_uint8.c index 98a88f4003..27af04da53 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_isle_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_isle_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__max_isle_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_isle_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_islt_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__max_islt_fp32.c index e6f6e6b1b5..83f956f698 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_islt_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_islt_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__max_islt_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_islt_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_islt_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__max_islt_fp64.c index c322db5b7d..da41138dcb 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_islt_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_islt_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__max_islt_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_islt_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_islt_int16.c b/GraphBLAS/Source/Generated/GB_AxB__max_islt_int16.c index d4e864f47c..80d5d395fd 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_islt_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_islt_int16.c @@ -2,7 +2,7 @@ // GB_AxB__max_islt_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_islt_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_islt_int32.c b/GraphBLAS/Source/Generated/GB_AxB__max_islt_int32.c index 004a0949d7..7703a61579 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_islt_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_islt_int32.c @@ -2,7 +2,7 @@ // GB_AxB__max_islt_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_islt_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_islt_int64.c b/GraphBLAS/Source/Generated/GB_AxB__max_islt_int64.c index 1382acbd76..50101e77f6 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_islt_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_islt_int64.c @@ -2,7 +2,7 @@ // GB_AxB__max_islt_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_islt_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_islt_int8.c b/GraphBLAS/Source/Generated/GB_AxB__max_islt_int8.c index fbfe5a69a4..636cf982ce 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_islt_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_islt_int8.c @@ -2,7 +2,7 @@ // GB_AxB__max_islt_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_islt_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_islt_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__max_islt_uint16.c index 3266b48c48..85771f0142 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_islt_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_islt_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__max_islt_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_islt_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_islt_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__max_islt_uint32.c index cbaba1468e..1362112e1e 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_islt_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_islt_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__max_islt_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_islt_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_islt_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__max_islt_uint64.c index 63cb6fe4fe..fcdc15eccf 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_islt_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_islt_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__max_islt_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_islt_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_islt_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__max_islt_uint8.c index d925c814d5..ec3e22b24a 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_islt_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_islt_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__max_islt_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_islt_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_isne_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__max_isne_fp32.c index f1e485fd86..bec56f30f4 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_isne_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_isne_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__max_isne_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_isne_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_isne_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__max_isne_fp64.c index 816596f091..a99b9cb587 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_isne_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_isne_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__max_isne_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_isne_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_isne_int16.c b/GraphBLAS/Source/Generated/GB_AxB__max_isne_int16.c index a74677d5b6..215815f228 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_isne_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_isne_int16.c @@ -2,7 +2,7 @@ // GB_AxB__max_isne_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_isne_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_isne_int32.c b/GraphBLAS/Source/Generated/GB_AxB__max_isne_int32.c index 0ce3cf6daa..69afb31c8f 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_isne_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_isne_int32.c @@ -2,7 +2,7 @@ // GB_AxB__max_isne_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_isne_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_isne_int64.c b/GraphBLAS/Source/Generated/GB_AxB__max_isne_int64.c index a71f9ef015..cd4a887ace 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_isne_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_isne_int64.c @@ -2,7 +2,7 @@ // GB_AxB__max_isne_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_isne_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_isne_int8.c b/GraphBLAS/Source/Generated/GB_AxB__max_isne_int8.c index 9e8dff76bb..bd9358d362 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_isne_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_isne_int8.c @@ -2,7 +2,7 @@ // GB_AxB__max_isne_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_isne_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_isne_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__max_isne_uint16.c index defe1d48b8..ff9bbe55a7 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_isne_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_isne_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__max_isne_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_isne_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_isne_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__max_isne_uint32.c index bc39429fd3..b4391b677a 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_isne_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_isne_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__max_isne_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_isne_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_isne_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__max_isne_uint64.c index b8fc232111..050545ca0c 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_isne_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_isne_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__max_isne_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_isne_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_isne_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__max_isne_uint8.c index 2138527669..34caecc1b1 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_isne_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_isne_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__max_isne_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_isne_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_land_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__max_land_fp32.c index f6626e8679..503a1ace87 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_land_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_land_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__max_land_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_land_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_land_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__max_land_fp64.c index 95edd8de7a..74650245ec 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_land_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_land_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__max_land_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_land_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_land_int16.c b/GraphBLAS/Source/Generated/GB_AxB__max_land_int16.c index fcd91ea7bf..5957b034f1 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_land_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_land_int16.c @@ -2,7 +2,7 @@ // GB_AxB__max_land_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_land_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_land_int32.c b/GraphBLAS/Source/Generated/GB_AxB__max_land_int32.c index 241f41f9bf..2f7701dc3f 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_land_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_land_int32.c @@ -2,7 +2,7 @@ // GB_AxB__max_land_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_land_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_land_int64.c b/GraphBLAS/Source/Generated/GB_AxB__max_land_int64.c index 7b8e2b6ec0..d9d878bd58 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_land_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_land_int64.c @@ -2,7 +2,7 @@ // GB_AxB__max_land_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_land_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_land_int8.c b/GraphBLAS/Source/Generated/GB_AxB__max_land_int8.c index 93ab944342..52f3c50874 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_land_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_land_int8.c @@ -2,7 +2,7 @@ // GB_AxB__max_land_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_land_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_land_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__max_land_uint16.c index 78530f89bf..633e35cde2 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_land_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_land_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__max_land_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_land_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_land_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__max_land_uint32.c index 013200365a..b5aa520290 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_land_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_land_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__max_land_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_land_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_land_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__max_land_uint64.c index bace9a052f..a5bab6202f 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_land_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_land_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__max_land_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_land_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_land_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__max_land_uint8.c index 647f23ab13..6d5014c313 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_land_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_land_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__max_land_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_land_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_lor_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__max_lor_fp32.c index 232e842a2b..99efb62a3d 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_lor_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_lor_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__max_lor_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_lor_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_lor_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__max_lor_fp64.c index 178a7f1b15..c5127dcf44 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_lor_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_lor_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__max_lor_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_lor_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_lor_int16.c b/GraphBLAS/Source/Generated/GB_AxB__max_lor_int16.c index 118c23bb12..b5410889a8 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_lor_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_lor_int16.c @@ -2,7 +2,7 @@ // GB_AxB__max_lor_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_lor_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_lor_int32.c b/GraphBLAS/Source/Generated/GB_AxB__max_lor_int32.c index 6f98fd24cd..16a2a10907 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_lor_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_lor_int32.c @@ -2,7 +2,7 @@ // GB_AxB__max_lor_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_lor_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_lor_int64.c b/GraphBLAS/Source/Generated/GB_AxB__max_lor_int64.c index 653d07153b..54b6fb1c40 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_lor_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_lor_int64.c @@ -2,7 +2,7 @@ // GB_AxB__max_lor_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_lor_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_lor_int8.c b/GraphBLAS/Source/Generated/GB_AxB__max_lor_int8.c index 9674876713..7341c67409 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_lor_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_lor_int8.c @@ -2,7 +2,7 @@ // GB_AxB__max_lor_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_lor_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_lor_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__max_lor_uint16.c index 258a00d0fe..00a75b12e9 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_lor_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_lor_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__max_lor_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_lor_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_lor_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__max_lor_uint32.c index ce7ebbb9d1..d628e207f6 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_lor_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_lor_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__max_lor_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_lor_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_lor_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__max_lor_uint64.c index d8d1a13279..4a3acfb7c5 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_lor_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_lor_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__max_lor_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_lor_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_lor_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__max_lor_uint8.c index dca9014814..6accbf1e45 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_lor_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_lor_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__max_lor_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_lor_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_lxor_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__max_lxor_fp32.c index 4ca21a8089..52a6c35d85 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_lxor_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_lxor_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__max_lxor_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_lxor_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_lxor_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__max_lxor_fp64.c index ad08fc00b0..6429ac632c 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_lxor_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_lxor_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__max_lxor_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_lxor_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_lxor_int16.c b/GraphBLAS/Source/Generated/GB_AxB__max_lxor_int16.c index 901ae9253e..dcf69a61cf 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_lxor_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_lxor_int16.c @@ -2,7 +2,7 @@ // GB_AxB__max_lxor_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_lxor_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_lxor_int32.c b/GraphBLAS/Source/Generated/GB_AxB__max_lxor_int32.c index cee31325e5..46d04025a6 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_lxor_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_lxor_int32.c @@ -2,7 +2,7 @@ // GB_AxB__max_lxor_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_lxor_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_lxor_int64.c b/GraphBLAS/Source/Generated/GB_AxB__max_lxor_int64.c index 7ce114bf04..fa09333e7d 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_lxor_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_lxor_int64.c @@ -2,7 +2,7 @@ // GB_AxB__max_lxor_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_lxor_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_lxor_int8.c b/GraphBLAS/Source/Generated/GB_AxB__max_lxor_int8.c index b69ba4c4ea..8260c0af00 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_lxor_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_lxor_int8.c @@ -2,7 +2,7 @@ // GB_AxB__max_lxor_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_lxor_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_lxor_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__max_lxor_uint16.c index afa4b53011..6beb5c1af7 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_lxor_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_lxor_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__max_lxor_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_lxor_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_lxor_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__max_lxor_uint32.c index 378be11ddf..35448cf6ce 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_lxor_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_lxor_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__max_lxor_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_lxor_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_lxor_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__max_lxor_uint64.c index d3dbdc366a..48fb7519cc 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_lxor_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_lxor_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__max_lxor_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_lxor_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_lxor_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__max_lxor_uint8.c index c30192804a..b512a80890 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_lxor_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_lxor_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__max_lxor_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_lxor_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_max_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__max_max_fp32.c index f31450e1ae..bd2f406b60 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_max_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_max_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__max_max_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_max_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_max_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__max_max_fp64.c index 711b31ffa2..e435e7dc1f 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_max_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_max_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__max_max_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_max_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_max_int16.c b/GraphBLAS/Source/Generated/GB_AxB__max_max_int16.c index 51659fa8ff..58accefbe6 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_max_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_max_int16.c @@ -2,7 +2,7 @@ // GB_AxB__max_max_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_max_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_max_int32.c b/GraphBLAS/Source/Generated/GB_AxB__max_max_int32.c index 716a356d72..9e9198c995 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_max_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_max_int32.c @@ -2,7 +2,7 @@ // GB_AxB__max_max_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_max_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_max_int64.c b/GraphBLAS/Source/Generated/GB_AxB__max_max_int64.c index 097ad8dad9..2fb119c8e4 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_max_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_max_int64.c @@ -2,7 +2,7 @@ // GB_AxB__max_max_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_max_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_max_int8.c b/GraphBLAS/Source/Generated/GB_AxB__max_max_int8.c index 56b01e1764..5701c80f77 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_max_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_max_int8.c @@ -2,7 +2,7 @@ // GB_AxB__max_max_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_max_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_max_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__max_max_uint16.c index 931b8f7317..ba4b51aadb 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_max_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_max_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__max_max_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_max_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_max_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__max_max_uint32.c index a9475ce545..926de1e23f 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_max_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_max_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__max_max_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_max_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_max_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__max_max_uint64.c index d06606c78b..8c5deaed36 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_max_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_max_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__max_max_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_max_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_max_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__max_max_uint8.c index c25e8cfb22..fe30acab81 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_max_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_max_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__max_max_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_max_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_min_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__max_min_fp32.c index 3b50d9e859..654381cefb 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_min_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_min_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__max_min_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_min_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_min_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__max_min_fp64.c index 91ac342ae1..2ce8266173 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_min_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_min_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__max_min_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_min_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_min_int16.c b/GraphBLAS/Source/Generated/GB_AxB__max_min_int16.c index ad2b70277b..7ac260be7e 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_min_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_min_int16.c @@ -2,7 +2,7 @@ // GB_AxB__max_min_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_min_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_min_int32.c b/GraphBLAS/Source/Generated/GB_AxB__max_min_int32.c index 2e25474307..bcce044b49 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_min_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_min_int32.c @@ -2,7 +2,7 @@ // GB_AxB__max_min_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_min_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_min_int64.c b/GraphBLAS/Source/Generated/GB_AxB__max_min_int64.c index 045b53db59..e0405f2963 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_min_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_min_int64.c @@ -2,7 +2,7 @@ // GB_AxB__max_min_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_min_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_min_int8.c b/GraphBLAS/Source/Generated/GB_AxB__max_min_int8.c index b1492abcf0..0cdcad6cdf 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_min_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_min_int8.c @@ -2,7 +2,7 @@ // GB_AxB__max_min_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_min_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_min_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__max_min_uint16.c index 1f50b5d56a..a6333216c5 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_min_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_min_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__max_min_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_min_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_min_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__max_min_uint32.c index d32fd3d7de..ca2a812eb3 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_min_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_min_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__max_min_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_min_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_min_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__max_min_uint64.c index 5f3c5771ca..d88373afd1 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_min_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_min_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__max_min_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_min_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_min_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__max_min_uint8.c index 8771303529..d93ffa69ea 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_min_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_min_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__max_min_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_min_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_minus_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__max_minus_fp32.c index 1b4339e146..21f6b90034 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_minus_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_minus_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__max_minus_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_minus_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_minus_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__max_minus_fp64.c index 6f6f4aed65..e04ed704e4 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_minus_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_minus_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__max_minus_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_minus_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_minus_int16.c b/GraphBLAS/Source/Generated/GB_AxB__max_minus_int16.c index 0f25903c3e..d2a2f2323b 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_minus_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_minus_int16.c @@ -2,7 +2,7 @@ // GB_AxB__max_minus_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_minus_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_minus_int32.c b/GraphBLAS/Source/Generated/GB_AxB__max_minus_int32.c index 0a9ec2091c..2264ecf23b 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_minus_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_minus_int32.c @@ -2,7 +2,7 @@ // GB_AxB__max_minus_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_minus_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_minus_int64.c b/GraphBLAS/Source/Generated/GB_AxB__max_minus_int64.c index 4bcf24e7c1..d332553582 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_minus_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_minus_int64.c @@ -2,7 +2,7 @@ // GB_AxB__max_minus_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_minus_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_minus_int8.c b/GraphBLAS/Source/Generated/GB_AxB__max_minus_int8.c index abf556d739..29c92c468b 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_minus_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_minus_int8.c @@ -2,7 +2,7 @@ // GB_AxB__max_minus_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_minus_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_minus_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__max_minus_uint16.c index 90670510c3..119a8b174d 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_minus_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_minus_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__max_minus_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_minus_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_minus_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__max_minus_uint32.c index f39065e7ec..a2119ac16b 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_minus_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_minus_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__max_minus_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_minus_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_minus_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__max_minus_uint64.c index 9f73a1f8b4..efe4f77aba 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_minus_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_minus_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__max_minus_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_minus_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_minus_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__max_minus_uint8.c index a47bd6c79b..8a59d5840b 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_minus_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_minus_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__max_minus_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_minus_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_plus_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__max_plus_fp32.c index f10dffff7a..1f6629c26c 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_plus_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_plus_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__max_plus_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_plus_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_plus_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__max_plus_fp64.c index 8ef9233fc8..8b139ec930 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_plus_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_plus_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__max_plus_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_plus_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_plus_int16.c b/GraphBLAS/Source/Generated/GB_AxB__max_plus_int16.c index 523e0e6762..c44806af0d 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_plus_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_plus_int16.c @@ -2,7 +2,7 @@ // GB_AxB__max_plus_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_plus_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_plus_int32.c b/GraphBLAS/Source/Generated/GB_AxB__max_plus_int32.c index 0c08c1d96c..d89114d296 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_plus_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_plus_int32.c @@ -2,7 +2,7 @@ // GB_AxB__max_plus_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_plus_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_plus_int64.c b/GraphBLAS/Source/Generated/GB_AxB__max_plus_int64.c index e0cf34212e..d6b8f6bc82 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_plus_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_plus_int64.c @@ -2,7 +2,7 @@ // GB_AxB__max_plus_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_plus_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_plus_int8.c b/GraphBLAS/Source/Generated/GB_AxB__max_plus_int8.c index 9f22af0196..09343d5ca9 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_plus_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_plus_int8.c @@ -2,7 +2,7 @@ // GB_AxB__max_plus_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_plus_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_plus_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__max_plus_uint16.c index ff84be2e2f..22068b7f8c 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_plus_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_plus_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__max_plus_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_plus_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_plus_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__max_plus_uint32.c index 4eb9c02581..e2330315ae 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_plus_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_plus_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__max_plus_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_plus_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_plus_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__max_plus_uint64.c index 659622e544..fd7ac1c7d8 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_plus_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_plus_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__max_plus_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_plus_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_plus_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__max_plus_uint8.c index 0578c87003..7cf50a78f1 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_plus_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_plus_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__max_plus_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_plus_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_second_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__max_second_fp32.c index bb7f2b747c..ae5d1758e9 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_second_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_second_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__max_second_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_second_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_second_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__max_second_fp64.c index 1a79e436e0..384a04a99c 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_second_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_second_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__max_second_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_second_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_second_int16.c b/GraphBLAS/Source/Generated/GB_AxB__max_second_int16.c index 0124d718b0..d346cb6654 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_second_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_second_int16.c @@ -2,7 +2,7 @@ // GB_AxB__max_second_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_second_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_second_int32.c b/GraphBLAS/Source/Generated/GB_AxB__max_second_int32.c index e9361699c8..23e6913659 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_second_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_second_int32.c @@ -2,7 +2,7 @@ // GB_AxB__max_second_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_second_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_second_int64.c b/GraphBLAS/Source/Generated/GB_AxB__max_second_int64.c index 5acfc364c1..6905357730 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_second_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_second_int64.c @@ -2,7 +2,7 @@ // GB_AxB__max_second_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_second_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_second_int8.c b/GraphBLAS/Source/Generated/GB_AxB__max_second_int8.c index e242a50091..ec5c79f9b6 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_second_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_second_int8.c @@ -2,7 +2,7 @@ // GB_AxB__max_second_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_second_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_second_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__max_second_uint16.c index 7a107595f9..afdb45476b 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_second_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_second_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__max_second_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_second_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_second_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__max_second_uint32.c index 08cbc0d05d..36911d51e2 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_second_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_second_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__max_second_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_second_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_second_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__max_second_uint64.c index b2f0a0c068..c35053cbb1 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_second_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_second_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__max_second_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_second_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_second_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__max_second_uint8.c index 49e521c6c7..3518834695 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_second_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_second_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__max_second_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_second_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_times_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__max_times_fp32.c index b641baebd1..907cf9bf9a 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_times_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_times_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__max_times_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_times_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_times_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__max_times_fp64.c index 3955947608..cc5bf2bd68 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_times_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_times_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__max_times_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_times_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_times_int16.c b/GraphBLAS/Source/Generated/GB_AxB__max_times_int16.c index 7a5e96f6b8..b9add4e0f1 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_times_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_times_int16.c @@ -2,7 +2,7 @@ // GB_AxB__max_times_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_times_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_times_int32.c b/GraphBLAS/Source/Generated/GB_AxB__max_times_int32.c index ac11ba2248..60f240c69b 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_times_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_times_int32.c @@ -2,7 +2,7 @@ // GB_AxB__max_times_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_times_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_times_int64.c b/GraphBLAS/Source/Generated/GB_AxB__max_times_int64.c index d9e5f32856..1e309cd0bc 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_times_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_times_int64.c @@ -2,7 +2,7 @@ // GB_AxB__max_times_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_times_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_times_int8.c b/GraphBLAS/Source/Generated/GB_AxB__max_times_int8.c index 8509f98983..83f4ef861e 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_times_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_times_int8.c @@ -2,7 +2,7 @@ // GB_AxB__max_times_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_times_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_times_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__max_times_uint16.c index 8615151574..55cb82ae73 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_times_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_times_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__max_times_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_times_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_times_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__max_times_uint32.c index 72bb99bff7..53c3c81a2a 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_times_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_times_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__max_times_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_times_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_times_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__max_times_uint64.c index 2a82e6a128..37164be4ce 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_times_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_times_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__max_times_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_times_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__max_times_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__max_times_uint8.c index afeb1e1770..5a5704ec32 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__max_times_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__max_times_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__max_times_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__max_times_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_div_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__min_div_fp32.c index a3d19df21a..7734fbe75a 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_div_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_div_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__min_div_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_div_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_div_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__min_div_fp64.c index 11dcb9a4f3..e3e7e2652d 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_div_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_div_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__min_div_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_div_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_div_int16.c b/GraphBLAS/Source/Generated/GB_AxB__min_div_int16.c index 189e09694e..fdaf826430 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_div_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_div_int16.c @@ -2,7 +2,7 @@ // GB_AxB__min_div_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_div_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_div_int32.c b/GraphBLAS/Source/Generated/GB_AxB__min_div_int32.c index 3274c53f50..0f61a2aee1 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_div_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_div_int32.c @@ -2,7 +2,7 @@ // GB_AxB__min_div_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_div_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_div_int64.c b/GraphBLAS/Source/Generated/GB_AxB__min_div_int64.c index 8b23503e11..98b96be5d5 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_div_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_div_int64.c @@ -2,7 +2,7 @@ // GB_AxB__min_div_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_div_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_div_int8.c b/GraphBLAS/Source/Generated/GB_AxB__min_div_int8.c index dbd400cd5d..9e5198597a 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_div_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_div_int8.c @@ -2,7 +2,7 @@ // GB_AxB__min_div_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_div_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_div_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__min_div_uint16.c index a08b86bd12..11325ba7f1 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_div_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_div_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__min_div_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_div_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_div_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__min_div_uint32.c index 569f4f500a..fd9d25dc72 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_div_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_div_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__min_div_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_div_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_div_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__min_div_uint64.c index 3ff04947de..97e554cb16 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_div_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_div_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__min_div_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_div_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_div_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__min_div_uint8.c index a68076998f..ec2b45d917 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_div_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_div_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__min_div_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_div_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_first_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__min_first_fp32.c index 31d9f1fcde..61c6af2f75 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_first_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_first_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__min_first_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_first_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_first_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__min_first_fp64.c index 1c0d5e451e..1352ece0cf 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_first_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_first_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__min_first_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_first_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_first_int16.c b/GraphBLAS/Source/Generated/GB_AxB__min_first_int16.c index 2e56375843..b28d5cc3c7 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_first_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_first_int16.c @@ -2,7 +2,7 @@ // GB_AxB__min_first_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_first_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_first_int32.c b/GraphBLAS/Source/Generated/GB_AxB__min_first_int32.c index ac9a5cd7f6..0ecced1010 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_first_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_first_int32.c @@ -2,7 +2,7 @@ // GB_AxB__min_first_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_first_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_first_int64.c b/GraphBLAS/Source/Generated/GB_AxB__min_first_int64.c index a9ac13a469..2f2e364f41 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_first_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_first_int64.c @@ -2,7 +2,7 @@ // GB_AxB__min_first_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_first_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_first_int8.c b/GraphBLAS/Source/Generated/GB_AxB__min_first_int8.c index bac2d6fb3e..79bd1f5c39 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_first_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_first_int8.c @@ -2,7 +2,7 @@ // GB_AxB__min_first_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_first_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_first_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__min_first_uint16.c index 59f18ed089..9777918e4a 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_first_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_first_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__min_first_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_first_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_first_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__min_first_uint32.c index 5f52562a53..5779527cba 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_first_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_first_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__min_first_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_first_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_first_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__min_first_uint64.c index 53f6915eeb..4c7c0eb18a 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_first_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_first_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__min_first_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_first_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_first_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__min_first_uint8.c index 60b3923d1b..603ba3916e 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_first_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_first_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__min_first_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_first_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_iseq_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__min_iseq_fp32.c index 38cb189206..7fd0f4992e 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_iseq_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_iseq_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__min_iseq_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_iseq_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_iseq_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__min_iseq_fp64.c index fcbf64d7a3..3e888dc2f7 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_iseq_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_iseq_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__min_iseq_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_iseq_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_iseq_int16.c b/GraphBLAS/Source/Generated/GB_AxB__min_iseq_int16.c index fd97466d7d..a8b0ac6147 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_iseq_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_iseq_int16.c @@ -2,7 +2,7 @@ // GB_AxB__min_iseq_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_iseq_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_iseq_int32.c b/GraphBLAS/Source/Generated/GB_AxB__min_iseq_int32.c index 81d328e7de..6be9cbf43f 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_iseq_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_iseq_int32.c @@ -2,7 +2,7 @@ // GB_AxB__min_iseq_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_iseq_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_iseq_int64.c b/GraphBLAS/Source/Generated/GB_AxB__min_iseq_int64.c index 933b1f39fd..e12d1a607a 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_iseq_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_iseq_int64.c @@ -2,7 +2,7 @@ // GB_AxB__min_iseq_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_iseq_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_iseq_int8.c b/GraphBLAS/Source/Generated/GB_AxB__min_iseq_int8.c index a30efb8924..d9251ec8b3 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_iseq_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_iseq_int8.c @@ -2,7 +2,7 @@ // GB_AxB__min_iseq_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_iseq_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_iseq_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__min_iseq_uint16.c index 2ccac2c52c..80bf95b33f 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_iseq_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_iseq_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__min_iseq_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_iseq_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_iseq_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__min_iseq_uint32.c index 3a45a16c3b..a705d82398 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_iseq_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_iseq_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__min_iseq_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_iseq_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_iseq_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__min_iseq_uint64.c index e65478a3b2..c4b40c65f4 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_iseq_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_iseq_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__min_iseq_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_iseq_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_iseq_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__min_iseq_uint8.c index 5dd2eb0b99..2c4b13176a 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_iseq_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_iseq_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__min_iseq_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_iseq_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_isge_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__min_isge_fp32.c index c59b81bc3a..e5c7392410 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_isge_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_isge_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__min_isge_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_isge_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_isge_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__min_isge_fp64.c index 630fb76bd4..3bb08c699d 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_isge_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_isge_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__min_isge_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_isge_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_isge_int16.c b/GraphBLAS/Source/Generated/GB_AxB__min_isge_int16.c index 90f7b76586..0dd48fc443 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_isge_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_isge_int16.c @@ -2,7 +2,7 @@ // GB_AxB__min_isge_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_isge_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_isge_int32.c b/GraphBLAS/Source/Generated/GB_AxB__min_isge_int32.c index 8350ba052a..2f9e967902 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_isge_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_isge_int32.c @@ -2,7 +2,7 @@ // GB_AxB__min_isge_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_isge_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_isge_int64.c b/GraphBLAS/Source/Generated/GB_AxB__min_isge_int64.c index 108591f134..885a4d8ac7 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_isge_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_isge_int64.c @@ -2,7 +2,7 @@ // GB_AxB__min_isge_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_isge_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_isge_int8.c b/GraphBLAS/Source/Generated/GB_AxB__min_isge_int8.c index 650a40016f..c50f99eea7 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_isge_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_isge_int8.c @@ -2,7 +2,7 @@ // GB_AxB__min_isge_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_isge_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_isge_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__min_isge_uint16.c index cb8b59f1a1..dd4906d785 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_isge_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_isge_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__min_isge_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_isge_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_isge_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__min_isge_uint32.c index 80385b5402..9e5e75c6d0 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_isge_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_isge_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__min_isge_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_isge_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_isge_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__min_isge_uint64.c index ebd96dd7a5..6da0b192d4 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_isge_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_isge_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__min_isge_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_isge_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_isge_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__min_isge_uint8.c index a8e42150fb..4f87e4c33d 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_isge_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_isge_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__min_isge_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_isge_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_isgt_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__min_isgt_fp32.c index 6b5547c182..7e4d337591 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_isgt_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_isgt_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__min_isgt_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_isgt_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_isgt_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__min_isgt_fp64.c index 3b25d7b62b..5fa8f2f36e 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_isgt_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_isgt_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__min_isgt_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_isgt_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_isgt_int16.c b/GraphBLAS/Source/Generated/GB_AxB__min_isgt_int16.c index 6e8525d60c..b9ebcb4816 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_isgt_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_isgt_int16.c @@ -2,7 +2,7 @@ // GB_AxB__min_isgt_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_isgt_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_isgt_int32.c b/GraphBLAS/Source/Generated/GB_AxB__min_isgt_int32.c index 2303122e68..c6fe61febc 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_isgt_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_isgt_int32.c @@ -2,7 +2,7 @@ // GB_AxB__min_isgt_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_isgt_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_isgt_int64.c b/GraphBLAS/Source/Generated/GB_AxB__min_isgt_int64.c index 6b024bc893..c324f32265 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_isgt_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_isgt_int64.c @@ -2,7 +2,7 @@ // GB_AxB__min_isgt_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_isgt_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_isgt_int8.c b/GraphBLAS/Source/Generated/GB_AxB__min_isgt_int8.c index 70e22adb74..7b86870ecb 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_isgt_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_isgt_int8.c @@ -2,7 +2,7 @@ // GB_AxB__min_isgt_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_isgt_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_isgt_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__min_isgt_uint16.c index 0ce4efef6f..216a29fc8c 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_isgt_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_isgt_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__min_isgt_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_isgt_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_isgt_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__min_isgt_uint32.c index bdb99a32c6..cf90c29604 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_isgt_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_isgt_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__min_isgt_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_isgt_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_isgt_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__min_isgt_uint64.c index 704ddd60f3..4dea77f37c 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_isgt_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_isgt_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__min_isgt_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_isgt_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_isgt_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__min_isgt_uint8.c index fa73f4db7c..916079e46a 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_isgt_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_isgt_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__min_isgt_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_isgt_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_isle_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__min_isle_fp32.c index 31b1c2c1ae..4cd6ced4d1 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_isle_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_isle_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__min_isle_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_isle_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_isle_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__min_isle_fp64.c index f2436ea446..e02dcfa783 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_isle_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_isle_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__min_isle_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_isle_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_isle_int16.c b/GraphBLAS/Source/Generated/GB_AxB__min_isle_int16.c index fe080f504c..9f20f407fa 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_isle_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_isle_int16.c @@ -2,7 +2,7 @@ // GB_AxB__min_isle_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_isle_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_isle_int32.c b/GraphBLAS/Source/Generated/GB_AxB__min_isle_int32.c index cbe66a22c4..f1cb2ed9b3 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_isle_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_isle_int32.c @@ -2,7 +2,7 @@ // GB_AxB__min_isle_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_isle_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_isle_int64.c b/GraphBLAS/Source/Generated/GB_AxB__min_isle_int64.c index 1fb5318cbb..19cd3654cc 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_isle_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_isle_int64.c @@ -2,7 +2,7 @@ // GB_AxB__min_isle_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_isle_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_isle_int8.c b/GraphBLAS/Source/Generated/GB_AxB__min_isle_int8.c index dc14bd7b67..1501dc074f 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_isle_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_isle_int8.c @@ -2,7 +2,7 @@ // GB_AxB__min_isle_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_isle_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_isle_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__min_isle_uint16.c index dcd2d31829..cd362fd62e 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_isle_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_isle_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__min_isle_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_isle_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_isle_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__min_isle_uint32.c index ed368b5ef1..3d669808b5 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_isle_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_isle_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__min_isle_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_isle_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_isle_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__min_isle_uint64.c index f55baa153a..aed1d2251e 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_isle_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_isle_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__min_isle_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_isle_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_isle_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__min_isle_uint8.c index c04eba74f2..fc37de7148 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_isle_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_isle_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__min_isle_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_isle_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_islt_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__min_islt_fp32.c index 2a348b86f0..5cfa84306f 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_islt_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_islt_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__min_islt_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_islt_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_islt_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__min_islt_fp64.c index da24acda90..40d9a24a64 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_islt_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_islt_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__min_islt_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_islt_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_islt_int16.c b/GraphBLAS/Source/Generated/GB_AxB__min_islt_int16.c index ed20715c8d..0a2ddc7a16 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_islt_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_islt_int16.c @@ -2,7 +2,7 @@ // GB_AxB__min_islt_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_islt_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_islt_int32.c b/GraphBLAS/Source/Generated/GB_AxB__min_islt_int32.c index 93018eae6f..ff7b6ddebc 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_islt_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_islt_int32.c @@ -2,7 +2,7 @@ // GB_AxB__min_islt_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_islt_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_islt_int64.c b/GraphBLAS/Source/Generated/GB_AxB__min_islt_int64.c index 31ccc833ae..e99fc76c61 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_islt_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_islt_int64.c @@ -2,7 +2,7 @@ // GB_AxB__min_islt_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_islt_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_islt_int8.c b/GraphBLAS/Source/Generated/GB_AxB__min_islt_int8.c index fdc0f82997..9d3a14d614 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_islt_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_islt_int8.c @@ -2,7 +2,7 @@ // GB_AxB__min_islt_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_islt_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_islt_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__min_islt_uint16.c index ce7b01f4b5..1afb44508d 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_islt_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_islt_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__min_islt_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_islt_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_islt_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__min_islt_uint32.c index 2cdf600c80..28ee168c91 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_islt_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_islt_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__min_islt_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_islt_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_islt_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__min_islt_uint64.c index ed73b2f5c8..4d7465f3a1 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_islt_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_islt_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__min_islt_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_islt_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_islt_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__min_islt_uint8.c index 9d76b92b8a..569375de66 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_islt_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_islt_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__min_islt_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_islt_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_isne_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__min_isne_fp32.c index b0951b086d..92d4583ee5 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_isne_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_isne_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__min_isne_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_isne_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_isne_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__min_isne_fp64.c index 05a7c3f4ce..0892090965 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_isne_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_isne_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__min_isne_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_isne_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_isne_int16.c b/GraphBLAS/Source/Generated/GB_AxB__min_isne_int16.c index cb2e87a934..1a5fdbf9ee 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_isne_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_isne_int16.c @@ -2,7 +2,7 @@ // GB_AxB__min_isne_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_isne_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_isne_int32.c b/GraphBLAS/Source/Generated/GB_AxB__min_isne_int32.c index 4777d5d0ee..ed7917675b 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_isne_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_isne_int32.c @@ -2,7 +2,7 @@ // GB_AxB__min_isne_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_isne_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_isne_int64.c b/GraphBLAS/Source/Generated/GB_AxB__min_isne_int64.c index e8897f3568..a65eb69ce3 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_isne_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_isne_int64.c @@ -2,7 +2,7 @@ // GB_AxB__min_isne_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_isne_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_isne_int8.c b/GraphBLAS/Source/Generated/GB_AxB__min_isne_int8.c index 2291dea709..9ae743a977 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_isne_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_isne_int8.c @@ -2,7 +2,7 @@ // GB_AxB__min_isne_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_isne_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_isne_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__min_isne_uint16.c index 7141433147..1b09995610 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_isne_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_isne_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__min_isne_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_isne_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_isne_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__min_isne_uint32.c index 2bfb887c2e..f00bb68d13 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_isne_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_isne_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__min_isne_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_isne_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_isne_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__min_isne_uint64.c index 0ac25fca79..77bd485060 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_isne_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_isne_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__min_isne_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_isne_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_isne_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__min_isne_uint8.c index 6662a6011e..7066de3cbc 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_isne_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_isne_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__min_isne_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_isne_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_land_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__min_land_fp32.c index a0f9f46865..cc1f5c24c1 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_land_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_land_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__min_land_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_land_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_land_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__min_land_fp64.c index 323dc1683d..68f4f54172 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_land_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_land_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__min_land_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_land_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_land_int16.c b/GraphBLAS/Source/Generated/GB_AxB__min_land_int16.c index 47e2e05999..4d67142462 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_land_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_land_int16.c @@ -2,7 +2,7 @@ // GB_AxB__min_land_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_land_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_land_int32.c b/GraphBLAS/Source/Generated/GB_AxB__min_land_int32.c index 49878f0707..f5b869db6f 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_land_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_land_int32.c @@ -2,7 +2,7 @@ // GB_AxB__min_land_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_land_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_land_int64.c b/GraphBLAS/Source/Generated/GB_AxB__min_land_int64.c index 55c268fba4..14b8375b8d 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_land_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_land_int64.c @@ -2,7 +2,7 @@ // GB_AxB__min_land_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_land_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_land_int8.c b/GraphBLAS/Source/Generated/GB_AxB__min_land_int8.c index cf28970355..da6cd5211c 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_land_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_land_int8.c @@ -2,7 +2,7 @@ // GB_AxB__min_land_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_land_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_land_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__min_land_uint16.c index c96b087c8f..d4cb4cb221 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_land_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_land_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__min_land_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_land_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_land_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__min_land_uint32.c index e1c7dc5145..430ad51bc3 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_land_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_land_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__min_land_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_land_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_land_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__min_land_uint64.c index 713b3fd9fa..d53c3d7e04 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_land_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_land_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__min_land_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_land_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_land_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__min_land_uint8.c index f5a08d37f3..29aeb34a53 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_land_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_land_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__min_land_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_land_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_lor_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__min_lor_fp32.c index aa85f5f659..eae9c1e79e 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_lor_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_lor_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__min_lor_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_lor_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_lor_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__min_lor_fp64.c index c5b3a161c0..fbaea136dc 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_lor_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_lor_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__min_lor_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_lor_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_lor_int16.c b/GraphBLAS/Source/Generated/GB_AxB__min_lor_int16.c index 308e050c3c..f8275e6172 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_lor_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_lor_int16.c @@ -2,7 +2,7 @@ // GB_AxB__min_lor_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_lor_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_lor_int32.c b/GraphBLAS/Source/Generated/GB_AxB__min_lor_int32.c index 6f923ef898..31188662eb 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_lor_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_lor_int32.c @@ -2,7 +2,7 @@ // GB_AxB__min_lor_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_lor_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_lor_int64.c b/GraphBLAS/Source/Generated/GB_AxB__min_lor_int64.c index 9ed72e47b3..094305ec04 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_lor_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_lor_int64.c @@ -2,7 +2,7 @@ // GB_AxB__min_lor_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_lor_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_lor_int8.c b/GraphBLAS/Source/Generated/GB_AxB__min_lor_int8.c index ac217b19f3..e98fddb776 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_lor_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_lor_int8.c @@ -2,7 +2,7 @@ // GB_AxB__min_lor_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_lor_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_lor_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__min_lor_uint16.c index d332ca27b4..753592b8ae 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_lor_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_lor_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__min_lor_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_lor_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_lor_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__min_lor_uint32.c index bac693bd49..b48410500a 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_lor_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_lor_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__min_lor_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_lor_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_lor_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__min_lor_uint64.c index b580109f63..edd4348553 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_lor_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_lor_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__min_lor_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_lor_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_lor_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__min_lor_uint8.c index 93fd80d2e0..a345d50d9b 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_lor_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_lor_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__min_lor_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_lor_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_lxor_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__min_lxor_fp32.c index 983bac1b92..3592a3c982 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_lxor_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_lxor_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__min_lxor_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_lxor_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_lxor_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__min_lxor_fp64.c index 2fd22d7204..6c87b0ec82 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_lxor_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_lxor_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__min_lxor_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_lxor_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_lxor_int16.c b/GraphBLAS/Source/Generated/GB_AxB__min_lxor_int16.c index c72ad7d2b8..c46fa68d53 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_lxor_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_lxor_int16.c @@ -2,7 +2,7 @@ // GB_AxB__min_lxor_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_lxor_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_lxor_int32.c b/GraphBLAS/Source/Generated/GB_AxB__min_lxor_int32.c index 39c32502b6..1ef48325b6 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_lxor_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_lxor_int32.c @@ -2,7 +2,7 @@ // GB_AxB__min_lxor_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_lxor_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_lxor_int64.c b/GraphBLAS/Source/Generated/GB_AxB__min_lxor_int64.c index 023c6ec937..a16c1c2cb1 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_lxor_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_lxor_int64.c @@ -2,7 +2,7 @@ // GB_AxB__min_lxor_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_lxor_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_lxor_int8.c b/GraphBLAS/Source/Generated/GB_AxB__min_lxor_int8.c index c78f7e88f7..817024eece 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_lxor_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_lxor_int8.c @@ -2,7 +2,7 @@ // GB_AxB__min_lxor_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_lxor_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_lxor_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__min_lxor_uint16.c index 628b85d409..30be2da955 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_lxor_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_lxor_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__min_lxor_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_lxor_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_lxor_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__min_lxor_uint32.c index 6d0c2925aa..ad0fb0569e 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_lxor_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_lxor_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__min_lxor_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_lxor_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_lxor_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__min_lxor_uint64.c index 0d700f36a9..76c15fa580 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_lxor_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_lxor_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__min_lxor_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_lxor_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_lxor_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__min_lxor_uint8.c index 949c992560..d963e0b8fc 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_lxor_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_lxor_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__min_lxor_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_lxor_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_max_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__min_max_fp32.c index 7864d05478..bf48e2eb68 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_max_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_max_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__min_max_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_max_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_max_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__min_max_fp64.c index 3a11ab1d76..a30f522ca7 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_max_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_max_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__min_max_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_max_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_max_int16.c b/GraphBLAS/Source/Generated/GB_AxB__min_max_int16.c index 52522d7815..f46613425b 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_max_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_max_int16.c @@ -2,7 +2,7 @@ // GB_AxB__min_max_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_max_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_max_int32.c b/GraphBLAS/Source/Generated/GB_AxB__min_max_int32.c index 227c00e8f6..217435efe1 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_max_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_max_int32.c @@ -2,7 +2,7 @@ // GB_AxB__min_max_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_max_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_max_int64.c b/GraphBLAS/Source/Generated/GB_AxB__min_max_int64.c index 42dcb9a76d..9d1ec37927 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_max_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_max_int64.c @@ -2,7 +2,7 @@ // GB_AxB__min_max_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_max_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_max_int8.c b/GraphBLAS/Source/Generated/GB_AxB__min_max_int8.c index d9d814dfa1..b21ca858f5 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_max_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_max_int8.c @@ -2,7 +2,7 @@ // GB_AxB__min_max_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_max_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_max_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__min_max_uint16.c index 3cd0c7f33d..ecad7cdffb 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_max_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_max_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__min_max_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_max_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_max_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__min_max_uint32.c index b72197f02a..686a6a7a22 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_max_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_max_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__min_max_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_max_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_max_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__min_max_uint64.c index d413e78634..9047025f80 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_max_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_max_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__min_max_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_max_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_max_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__min_max_uint8.c index 2cb071f6a4..6dc4d3ffa5 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_max_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_max_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__min_max_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_max_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_min_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__min_min_fp32.c index 9fc2039919..ab42b0175f 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_min_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_min_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__min_min_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_min_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_min_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__min_min_fp64.c index 43d24c220e..33a4128a50 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_min_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_min_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__min_min_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_min_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_min_int16.c b/GraphBLAS/Source/Generated/GB_AxB__min_min_int16.c index 6245775f2c..ef0a026154 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_min_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_min_int16.c @@ -2,7 +2,7 @@ // GB_AxB__min_min_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_min_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_min_int32.c b/GraphBLAS/Source/Generated/GB_AxB__min_min_int32.c index 7df70bd418..1d0f229a2e 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_min_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_min_int32.c @@ -2,7 +2,7 @@ // GB_AxB__min_min_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_min_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_min_int64.c b/GraphBLAS/Source/Generated/GB_AxB__min_min_int64.c index 20339d49cd..655c066c8d 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_min_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_min_int64.c @@ -2,7 +2,7 @@ // GB_AxB__min_min_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_min_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_min_int8.c b/GraphBLAS/Source/Generated/GB_AxB__min_min_int8.c index 7e10822633..03be4e1a4d 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_min_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_min_int8.c @@ -2,7 +2,7 @@ // GB_AxB__min_min_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_min_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_min_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__min_min_uint16.c index e708fe7af5..84147f7e34 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_min_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_min_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__min_min_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_min_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_min_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__min_min_uint32.c index d1244b7885..5665208ac8 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_min_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_min_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__min_min_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_min_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_min_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__min_min_uint64.c index 9bd4dcd99d..1546439412 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_min_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_min_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__min_min_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_min_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_min_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__min_min_uint8.c index c9e90fdc93..84f7f410f7 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_min_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_min_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__min_min_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_min_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_minus_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__min_minus_fp32.c index 124dcf1fca..2227d02504 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_minus_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_minus_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__min_minus_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_minus_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_minus_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__min_minus_fp64.c index ceda1fea65..b83bd63672 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_minus_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_minus_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__min_minus_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_minus_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_minus_int16.c b/GraphBLAS/Source/Generated/GB_AxB__min_minus_int16.c index 7cdcfb3a0f..45a9810bfe 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_minus_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_minus_int16.c @@ -2,7 +2,7 @@ // GB_AxB__min_minus_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_minus_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_minus_int32.c b/GraphBLAS/Source/Generated/GB_AxB__min_minus_int32.c index c6fe00eeea..d2315ab118 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_minus_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_minus_int32.c @@ -2,7 +2,7 @@ // GB_AxB__min_minus_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_minus_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_minus_int64.c b/GraphBLAS/Source/Generated/GB_AxB__min_minus_int64.c index eb6265bd9b..2f3860b39a 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_minus_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_minus_int64.c @@ -2,7 +2,7 @@ // GB_AxB__min_minus_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_minus_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_minus_int8.c b/GraphBLAS/Source/Generated/GB_AxB__min_minus_int8.c index 1a7bcf2f6a..9c0eb322f3 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_minus_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_minus_int8.c @@ -2,7 +2,7 @@ // GB_AxB__min_minus_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_minus_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_minus_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__min_minus_uint16.c index 7dc5a27477..bba9f27935 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_minus_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_minus_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__min_minus_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_minus_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_minus_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__min_minus_uint32.c index 3de3a12d3b..330a8f0cdc 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_minus_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_minus_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__min_minus_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_minus_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_minus_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__min_minus_uint64.c index e6652672b0..adda70197c 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_minus_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_minus_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__min_minus_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_minus_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_minus_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__min_minus_uint8.c index cb6e2dca05..988ceb3463 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_minus_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_minus_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__min_minus_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_minus_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_plus_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__min_plus_fp32.c index e979ab974b..0505e71231 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_plus_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_plus_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__min_plus_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_plus_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_plus_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__min_plus_fp64.c index bdee4e16cd..f6ae8339ac 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_plus_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_plus_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__min_plus_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_plus_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_plus_int16.c b/GraphBLAS/Source/Generated/GB_AxB__min_plus_int16.c index c2528235a6..2d847019bf 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_plus_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_plus_int16.c @@ -2,7 +2,7 @@ // GB_AxB__min_plus_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_plus_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_plus_int32.c b/GraphBLAS/Source/Generated/GB_AxB__min_plus_int32.c index 8428472054..6103378cd4 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_plus_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_plus_int32.c @@ -2,7 +2,7 @@ // GB_AxB__min_plus_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_plus_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_plus_int64.c b/GraphBLAS/Source/Generated/GB_AxB__min_plus_int64.c index d595a9079d..f1084fbc32 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_plus_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_plus_int64.c @@ -2,7 +2,7 @@ // GB_AxB__min_plus_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_plus_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_plus_int8.c b/GraphBLAS/Source/Generated/GB_AxB__min_plus_int8.c index 5102b922ca..998423775e 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_plus_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_plus_int8.c @@ -2,7 +2,7 @@ // GB_AxB__min_plus_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_plus_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_plus_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__min_plus_uint16.c index a87b81caf3..4358394966 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_plus_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_plus_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__min_plus_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_plus_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_plus_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__min_plus_uint32.c index 4bc5c3de2e..b7b77b654d 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_plus_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_plus_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__min_plus_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_plus_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_plus_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__min_plus_uint64.c index 6bdd0df87d..c6289eed43 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_plus_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_plus_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__min_plus_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_plus_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_plus_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__min_plus_uint8.c index cb926fee37..e0aad9d5fe 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_plus_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_plus_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__min_plus_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_plus_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_second_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__min_second_fp32.c index 4cc2abac46..211c7e4da2 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_second_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_second_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__min_second_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_second_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_second_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__min_second_fp64.c index d87dbdc103..b682eb13d0 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_second_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_second_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__min_second_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_second_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_second_int16.c b/GraphBLAS/Source/Generated/GB_AxB__min_second_int16.c index 428064557c..fd22d81c29 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_second_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_second_int16.c @@ -2,7 +2,7 @@ // GB_AxB__min_second_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_second_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_second_int32.c b/GraphBLAS/Source/Generated/GB_AxB__min_second_int32.c index 3321f5f009..b19820f350 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_second_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_second_int32.c @@ -2,7 +2,7 @@ // GB_AxB__min_second_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_second_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_second_int64.c b/GraphBLAS/Source/Generated/GB_AxB__min_second_int64.c index a9ff32374c..f6d6914af5 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_second_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_second_int64.c @@ -2,7 +2,7 @@ // GB_AxB__min_second_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_second_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_second_int8.c b/GraphBLAS/Source/Generated/GB_AxB__min_second_int8.c index d64cadc197..0b04c8f4e3 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_second_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_second_int8.c @@ -2,7 +2,7 @@ // GB_AxB__min_second_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_second_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_second_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__min_second_uint16.c index c5ea5a66e2..03565e7a03 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_second_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_second_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__min_second_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_second_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_second_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__min_second_uint32.c index ee7bcdff08..b197887d21 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_second_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_second_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__min_second_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_second_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_second_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__min_second_uint64.c index 0c425f7ae9..af1bca21f9 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_second_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_second_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__min_second_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_second_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_second_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__min_second_uint8.c index e146b153e3..77062eac3a 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_second_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_second_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__min_second_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_second_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_times_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__min_times_fp32.c index 5908434b7a..dcd29d1681 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_times_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_times_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__min_times_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_times_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_times_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__min_times_fp64.c index 72b47d17bd..6ff043a6ce 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_times_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_times_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__min_times_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_times_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_times_int16.c b/GraphBLAS/Source/Generated/GB_AxB__min_times_int16.c index e6ff11b881..e7796b824c 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_times_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_times_int16.c @@ -2,7 +2,7 @@ // GB_AxB__min_times_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_times_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_times_int32.c b/GraphBLAS/Source/Generated/GB_AxB__min_times_int32.c index 7802bce63b..067bdfe51d 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_times_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_times_int32.c @@ -2,7 +2,7 @@ // GB_AxB__min_times_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_times_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_times_int64.c b/GraphBLAS/Source/Generated/GB_AxB__min_times_int64.c index 4a85c184c7..6fa8ac34e7 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_times_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_times_int64.c @@ -2,7 +2,7 @@ // GB_AxB__min_times_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_times_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_times_int8.c b/GraphBLAS/Source/Generated/GB_AxB__min_times_int8.c index e54c6c1ffc..418587805f 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_times_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_times_int8.c @@ -2,7 +2,7 @@ // GB_AxB__min_times_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_times_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_times_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__min_times_uint16.c index af23667bf3..a254c0e287 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_times_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_times_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__min_times_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_times_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_times_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__min_times_uint32.c index dbe7c62535..5cdf4253df 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_times_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_times_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__min_times_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_times_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_times_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__min_times_uint64.c index 0932a881b4..f14c7c8334 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_times_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_times_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__min_times_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_times_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__min_times_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__min_times_uint8.c index da4233a877..cc2e14b551 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__min_times_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__min_times_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__min_times_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__min_times_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_div_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__plus_div_fp32.c index 519e196af0..796b9e691d 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_div_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_div_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__plus_div_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_div_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_div_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__plus_div_fp64.c index 18b6a2698a..196b76f49e 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_div_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_div_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__plus_div_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_div_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_div_int16.c b/GraphBLAS/Source/Generated/GB_AxB__plus_div_int16.c index e2d0aa77b7..d9d2f5b5ad 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_div_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_div_int16.c @@ -2,7 +2,7 @@ // GB_AxB__plus_div_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_div_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_div_int32.c b/GraphBLAS/Source/Generated/GB_AxB__plus_div_int32.c index 2d3b6931ac..aabb2703a6 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_div_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_div_int32.c @@ -2,7 +2,7 @@ // GB_AxB__plus_div_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_div_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_div_int64.c b/GraphBLAS/Source/Generated/GB_AxB__plus_div_int64.c index d2e242356f..12131403cc 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_div_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_div_int64.c @@ -2,7 +2,7 @@ // GB_AxB__plus_div_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_div_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_div_int8.c b/GraphBLAS/Source/Generated/GB_AxB__plus_div_int8.c index 976e0b6b59..4ce6f6bf52 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_div_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_div_int8.c @@ -2,7 +2,7 @@ // GB_AxB__plus_div_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_div_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_div_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__plus_div_uint16.c index a233aaf140..0bc45a6bee 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_div_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_div_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__plus_div_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_div_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_div_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__plus_div_uint32.c index 52c5ff5d1d..06abb9c0fb 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_div_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_div_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__plus_div_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_div_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_div_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__plus_div_uint64.c index 55732e2d15..ab1362b399 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_div_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_div_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__plus_div_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_div_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_div_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__plus_div_uint8.c index 5da995fdc9..766fa5b232 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_div_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_div_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__plus_div_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_div_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_first_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__plus_first_fp32.c index ca33f5ed16..964a8d9e29 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_first_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_first_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__plus_first_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_first_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_first_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__plus_first_fp64.c index 4443d7c69d..129d6fb646 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_first_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_first_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__plus_first_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_first_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_first_int16.c b/GraphBLAS/Source/Generated/GB_AxB__plus_first_int16.c index 4a0f567f91..1fa33f651f 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_first_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_first_int16.c @@ -2,7 +2,7 @@ // GB_AxB__plus_first_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_first_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_first_int32.c b/GraphBLAS/Source/Generated/GB_AxB__plus_first_int32.c index 579570edff..13ab81c6a1 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_first_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_first_int32.c @@ -2,7 +2,7 @@ // GB_AxB__plus_first_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_first_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_first_int64.c b/GraphBLAS/Source/Generated/GB_AxB__plus_first_int64.c index e5ff679391..32df64f202 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_first_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_first_int64.c @@ -2,7 +2,7 @@ // GB_AxB__plus_first_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_first_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_first_int8.c b/GraphBLAS/Source/Generated/GB_AxB__plus_first_int8.c index dd60a40fc1..edf5fe67c9 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_first_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_first_int8.c @@ -2,7 +2,7 @@ // GB_AxB__plus_first_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_first_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_first_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__plus_first_uint16.c index 843b3177a3..c051d0632f 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_first_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_first_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__plus_first_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_first_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_first_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__plus_first_uint32.c index 5300cdf7dc..c277f998dc 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_first_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_first_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__plus_first_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_first_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_first_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__plus_first_uint64.c index 180e522242..c9a2fffd1d 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_first_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_first_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__plus_first_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_first_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_first_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__plus_first_uint8.c index d978dfba85..2fd2bc27f4 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_first_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_first_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__plus_first_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_first_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_iseq_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__plus_iseq_fp32.c index 8be2c89a18..9dc25d0c2d 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_iseq_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_iseq_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__plus_iseq_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_iseq_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_iseq_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__plus_iseq_fp64.c index 0f452c4cd4..32f27056bd 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_iseq_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_iseq_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__plus_iseq_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_iseq_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_iseq_int16.c b/GraphBLAS/Source/Generated/GB_AxB__plus_iseq_int16.c index 26b24a1c6d..f1def32467 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_iseq_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_iseq_int16.c @@ -2,7 +2,7 @@ // GB_AxB__plus_iseq_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_iseq_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_iseq_int32.c b/GraphBLAS/Source/Generated/GB_AxB__plus_iseq_int32.c index 8a8ea5991b..0175118bdd 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_iseq_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_iseq_int32.c @@ -2,7 +2,7 @@ // GB_AxB__plus_iseq_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_iseq_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_iseq_int64.c b/GraphBLAS/Source/Generated/GB_AxB__plus_iseq_int64.c index 4825217ac3..f872bcdf29 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_iseq_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_iseq_int64.c @@ -2,7 +2,7 @@ // GB_AxB__plus_iseq_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_iseq_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_iseq_int8.c b/GraphBLAS/Source/Generated/GB_AxB__plus_iseq_int8.c index 34119c94e7..d4ab7a97c0 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_iseq_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_iseq_int8.c @@ -2,7 +2,7 @@ // GB_AxB__plus_iseq_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_iseq_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_iseq_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__plus_iseq_uint16.c index 3a9264020b..e7cf500c71 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_iseq_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_iseq_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__plus_iseq_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_iseq_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_iseq_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__plus_iseq_uint32.c index aea50eaaf8..f322f46ece 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_iseq_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_iseq_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__plus_iseq_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_iseq_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_iseq_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__plus_iseq_uint64.c index 5f9e2ccffe..ed008d4c69 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_iseq_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_iseq_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__plus_iseq_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_iseq_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_iseq_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__plus_iseq_uint8.c index e96302b81a..60f4d408b9 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_iseq_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_iseq_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__plus_iseq_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_iseq_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_isge_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__plus_isge_fp32.c index 0dabbb64d3..644dc4f408 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_isge_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_isge_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__plus_isge_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_isge_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_isge_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__plus_isge_fp64.c index b64831d3ff..4ef8da3aa9 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_isge_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_isge_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__plus_isge_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_isge_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_isge_int16.c b/GraphBLAS/Source/Generated/GB_AxB__plus_isge_int16.c index 55c2c56d0d..608f8d604b 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_isge_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_isge_int16.c @@ -2,7 +2,7 @@ // GB_AxB__plus_isge_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_isge_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_isge_int32.c b/GraphBLAS/Source/Generated/GB_AxB__plus_isge_int32.c index d6cf024905..266f755dfa 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_isge_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_isge_int32.c @@ -2,7 +2,7 @@ // GB_AxB__plus_isge_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_isge_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_isge_int64.c b/GraphBLAS/Source/Generated/GB_AxB__plus_isge_int64.c index c9162ebbab..ddf1f4e894 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_isge_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_isge_int64.c @@ -2,7 +2,7 @@ // GB_AxB__plus_isge_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_isge_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_isge_int8.c b/GraphBLAS/Source/Generated/GB_AxB__plus_isge_int8.c index 3d58bbf44d..4e3a952f83 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_isge_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_isge_int8.c @@ -2,7 +2,7 @@ // GB_AxB__plus_isge_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_isge_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_isge_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__plus_isge_uint16.c index eef08917e5..ea68d925ad 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_isge_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_isge_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__plus_isge_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_isge_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_isge_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__plus_isge_uint32.c index 62407fddb8..90bf7a0b5e 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_isge_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_isge_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__plus_isge_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_isge_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_isge_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__plus_isge_uint64.c index 16753b7128..f948ad0df3 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_isge_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_isge_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__plus_isge_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_isge_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_isge_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__plus_isge_uint8.c index ae2957e271..a22679eebd 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_isge_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_isge_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__plus_isge_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_isge_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_isgt_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__plus_isgt_fp32.c index 07d6407657..b4463adb18 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_isgt_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_isgt_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__plus_isgt_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_isgt_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_isgt_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__plus_isgt_fp64.c index 05e631995c..363385f33e 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_isgt_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_isgt_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__plus_isgt_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_isgt_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_isgt_int16.c b/GraphBLAS/Source/Generated/GB_AxB__plus_isgt_int16.c index 8c2983423f..373fb81f25 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_isgt_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_isgt_int16.c @@ -2,7 +2,7 @@ // GB_AxB__plus_isgt_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_isgt_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_isgt_int32.c b/GraphBLAS/Source/Generated/GB_AxB__plus_isgt_int32.c index 13ba5b2bab..cba074b8a0 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_isgt_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_isgt_int32.c @@ -2,7 +2,7 @@ // GB_AxB__plus_isgt_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_isgt_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_isgt_int64.c b/GraphBLAS/Source/Generated/GB_AxB__plus_isgt_int64.c index e6b45a1e7a..8d3c3acdc6 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_isgt_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_isgt_int64.c @@ -2,7 +2,7 @@ // GB_AxB__plus_isgt_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_isgt_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_isgt_int8.c b/GraphBLAS/Source/Generated/GB_AxB__plus_isgt_int8.c index b810e331c9..eca9f40434 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_isgt_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_isgt_int8.c @@ -2,7 +2,7 @@ // GB_AxB__plus_isgt_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_isgt_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_isgt_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__plus_isgt_uint16.c index b8878b1ca8..4870edeeb2 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_isgt_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_isgt_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__plus_isgt_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_isgt_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_isgt_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__plus_isgt_uint32.c index 655f101ec1..e47694fa86 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_isgt_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_isgt_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__plus_isgt_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_isgt_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_isgt_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__plus_isgt_uint64.c index 3aa92a756c..570b2cdfda 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_isgt_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_isgt_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__plus_isgt_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_isgt_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_isgt_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__plus_isgt_uint8.c index bddc08e778..e1afd941b0 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_isgt_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_isgt_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__plus_isgt_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_isgt_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_isle_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__plus_isle_fp32.c index 04e4b2b0ea..f7ba70a063 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_isle_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_isle_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__plus_isle_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_isle_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_isle_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__plus_isle_fp64.c index cb2ad50b50..d3f41d5607 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_isle_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_isle_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__plus_isle_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_isle_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_isle_int16.c b/GraphBLAS/Source/Generated/GB_AxB__plus_isle_int16.c index 6a92d15c27..1a072307a8 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_isle_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_isle_int16.c @@ -2,7 +2,7 @@ // GB_AxB__plus_isle_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_isle_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_isle_int32.c b/GraphBLAS/Source/Generated/GB_AxB__plus_isle_int32.c index 99386cd9af..3e1b433997 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_isle_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_isle_int32.c @@ -2,7 +2,7 @@ // GB_AxB__plus_isle_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_isle_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_isle_int64.c b/GraphBLAS/Source/Generated/GB_AxB__plus_isle_int64.c index de9a7f06a5..c874429f89 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_isle_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_isle_int64.c @@ -2,7 +2,7 @@ // GB_AxB__plus_isle_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_isle_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_isle_int8.c b/GraphBLAS/Source/Generated/GB_AxB__plus_isle_int8.c index 5f6842f4e9..e687fabb9a 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_isle_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_isle_int8.c @@ -2,7 +2,7 @@ // GB_AxB__plus_isle_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_isle_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_isle_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__plus_isle_uint16.c index 86585601f5..7402415017 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_isle_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_isle_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__plus_isle_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_isle_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_isle_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__plus_isle_uint32.c index 851d696041..76d3d41627 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_isle_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_isle_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__plus_isle_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_isle_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_isle_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__plus_isle_uint64.c index 76fc7f1291..10be6d68a8 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_isle_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_isle_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__plus_isle_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_isle_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_isle_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__plus_isle_uint8.c index dcb7a46b23..355d168f30 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_isle_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_isle_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__plus_isle_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_isle_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_islt_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__plus_islt_fp32.c index 9b79ce2cdc..e90aaa71a2 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_islt_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_islt_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__plus_islt_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_islt_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_islt_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__plus_islt_fp64.c index 0644136589..b76e1781ff 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_islt_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_islt_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__plus_islt_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_islt_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_islt_int16.c b/GraphBLAS/Source/Generated/GB_AxB__plus_islt_int16.c index 4033761076..9b72bcd171 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_islt_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_islt_int16.c @@ -2,7 +2,7 @@ // GB_AxB__plus_islt_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_islt_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_islt_int32.c b/GraphBLAS/Source/Generated/GB_AxB__plus_islt_int32.c index a220b5bc5a..5a6e0a457f 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_islt_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_islt_int32.c @@ -2,7 +2,7 @@ // GB_AxB__plus_islt_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_islt_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_islt_int64.c b/GraphBLAS/Source/Generated/GB_AxB__plus_islt_int64.c index 10b8eaf9b4..b71d6e34f9 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_islt_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_islt_int64.c @@ -2,7 +2,7 @@ // GB_AxB__plus_islt_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_islt_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_islt_int8.c b/GraphBLAS/Source/Generated/GB_AxB__plus_islt_int8.c index 47b1f26e1e..195b435640 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_islt_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_islt_int8.c @@ -2,7 +2,7 @@ // GB_AxB__plus_islt_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_islt_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_islt_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__plus_islt_uint16.c index f7d7ad97c1..15b89f2983 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_islt_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_islt_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__plus_islt_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_islt_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_islt_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__plus_islt_uint32.c index 7f7aefe1e0..4ba35f0986 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_islt_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_islt_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__plus_islt_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_islt_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_islt_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__plus_islt_uint64.c index 509b3774d7..ce18d40e38 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_islt_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_islt_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__plus_islt_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_islt_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_islt_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__plus_islt_uint8.c index 74133eaf89..b5f707104c 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_islt_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_islt_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__plus_islt_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_islt_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_isne_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__plus_isne_fp32.c index a770d91db1..be0c292310 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_isne_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_isne_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__plus_isne_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_isne_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_isne_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__plus_isne_fp64.c index 18f4bdcc4f..1fdcd32d53 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_isne_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_isne_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__plus_isne_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_isne_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_isne_int16.c b/GraphBLAS/Source/Generated/GB_AxB__plus_isne_int16.c index 6972813202..05863af81d 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_isne_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_isne_int16.c @@ -2,7 +2,7 @@ // GB_AxB__plus_isne_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_isne_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_isne_int32.c b/GraphBLAS/Source/Generated/GB_AxB__plus_isne_int32.c index 8995900ce0..c893a8210c 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_isne_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_isne_int32.c @@ -2,7 +2,7 @@ // GB_AxB__plus_isne_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_isne_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_isne_int64.c b/GraphBLAS/Source/Generated/GB_AxB__plus_isne_int64.c index e90e470adb..81a5f6a82b 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_isne_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_isne_int64.c @@ -2,7 +2,7 @@ // GB_AxB__plus_isne_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_isne_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_isne_int8.c b/GraphBLAS/Source/Generated/GB_AxB__plus_isne_int8.c index a8d64ada02..86f0a269c2 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_isne_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_isne_int8.c @@ -2,7 +2,7 @@ // GB_AxB__plus_isne_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_isne_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_isne_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__plus_isne_uint16.c index caf95a2df0..e05e478721 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_isne_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_isne_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__plus_isne_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_isne_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_isne_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__plus_isne_uint32.c index ce479c90b9..d97135e351 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_isne_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_isne_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__plus_isne_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_isne_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_isne_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__plus_isne_uint64.c index 563a99188f..51a304aa4a 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_isne_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_isne_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__plus_isne_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_isne_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_isne_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__plus_isne_uint8.c index 4ab2f3ea4c..5b55e4abee 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_isne_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_isne_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__plus_isne_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_isne_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_land_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__plus_land_fp32.c index 4976f241f1..d358012df5 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_land_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_land_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__plus_land_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_land_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_land_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__plus_land_fp64.c index 549030ecdc..9bfc6f2b2e 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_land_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_land_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__plus_land_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_land_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_land_int16.c b/GraphBLAS/Source/Generated/GB_AxB__plus_land_int16.c index 3e82267d5e..fb7af90d25 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_land_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_land_int16.c @@ -2,7 +2,7 @@ // GB_AxB__plus_land_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_land_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_land_int32.c b/GraphBLAS/Source/Generated/GB_AxB__plus_land_int32.c index 8c30c42d3f..e5f7f43b4e 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_land_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_land_int32.c @@ -2,7 +2,7 @@ // GB_AxB__plus_land_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_land_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_land_int64.c b/GraphBLAS/Source/Generated/GB_AxB__plus_land_int64.c index c7e460b252..8ec21f404f 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_land_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_land_int64.c @@ -2,7 +2,7 @@ // GB_AxB__plus_land_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_land_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_land_int8.c b/GraphBLAS/Source/Generated/GB_AxB__plus_land_int8.c index 539fd91b0c..c2284d634b 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_land_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_land_int8.c @@ -2,7 +2,7 @@ // GB_AxB__plus_land_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_land_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_land_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__plus_land_uint16.c index 10e6bc87ff..4f9d606602 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_land_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_land_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__plus_land_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_land_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_land_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__plus_land_uint32.c index 36bd248cba..a442202b45 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_land_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_land_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__plus_land_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_land_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_land_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__plus_land_uint64.c index 967735cb7d..b427ccc7ef 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_land_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_land_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__plus_land_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_land_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_land_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__plus_land_uint8.c index 2809f5760d..783efe2b93 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_land_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_land_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__plus_land_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_land_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_lor_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__plus_lor_fp32.c index c1c285b33e..e8b9e301fb 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_lor_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_lor_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__plus_lor_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_lor_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_lor_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__plus_lor_fp64.c index 035abf8aea..ad04b59795 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_lor_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_lor_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__plus_lor_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_lor_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_lor_int16.c b/GraphBLAS/Source/Generated/GB_AxB__plus_lor_int16.c index acd6c06ddc..70c6fe7c2d 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_lor_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_lor_int16.c @@ -2,7 +2,7 @@ // GB_AxB__plus_lor_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_lor_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_lor_int32.c b/GraphBLAS/Source/Generated/GB_AxB__plus_lor_int32.c index 3b372ec8f2..3d17fd0360 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_lor_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_lor_int32.c @@ -2,7 +2,7 @@ // GB_AxB__plus_lor_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_lor_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_lor_int64.c b/GraphBLAS/Source/Generated/GB_AxB__plus_lor_int64.c index 86972bd250..6a70d50a96 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_lor_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_lor_int64.c @@ -2,7 +2,7 @@ // GB_AxB__plus_lor_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_lor_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_lor_int8.c b/GraphBLAS/Source/Generated/GB_AxB__plus_lor_int8.c index 8fc8bd6caa..72682e8c4f 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_lor_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_lor_int8.c @@ -2,7 +2,7 @@ // GB_AxB__plus_lor_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_lor_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_lor_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__plus_lor_uint16.c index bc90d78864..d4be9e9239 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_lor_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_lor_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__plus_lor_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_lor_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_lor_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__plus_lor_uint32.c index fe13d4a116..6c4179b19e 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_lor_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_lor_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__plus_lor_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_lor_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_lor_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__plus_lor_uint64.c index 3da599525e..9171f00a2b 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_lor_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_lor_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__plus_lor_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_lor_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_lor_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__plus_lor_uint8.c index 4db5a712f7..4eac94d89f 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_lor_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_lor_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__plus_lor_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_lor_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_lxor_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__plus_lxor_fp32.c index 7138b485c8..02877326e9 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_lxor_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_lxor_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__plus_lxor_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_lxor_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_lxor_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__plus_lxor_fp64.c index 0706480fdf..cff7908586 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_lxor_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_lxor_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__plus_lxor_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_lxor_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_lxor_int16.c b/GraphBLAS/Source/Generated/GB_AxB__plus_lxor_int16.c index 6500a0abd1..247c537a61 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_lxor_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_lxor_int16.c @@ -2,7 +2,7 @@ // GB_AxB__plus_lxor_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_lxor_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_lxor_int32.c b/GraphBLAS/Source/Generated/GB_AxB__plus_lxor_int32.c index e529153c70..a8fbb001c3 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_lxor_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_lxor_int32.c @@ -2,7 +2,7 @@ // GB_AxB__plus_lxor_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_lxor_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_lxor_int64.c b/GraphBLAS/Source/Generated/GB_AxB__plus_lxor_int64.c index 2818aebda3..8321021046 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_lxor_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_lxor_int64.c @@ -2,7 +2,7 @@ // GB_AxB__plus_lxor_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_lxor_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_lxor_int8.c b/GraphBLAS/Source/Generated/GB_AxB__plus_lxor_int8.c index f75d70e8fa..ace335182a 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_lxor_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_lxor_int8.c @@ -2,7 +2,7 @@ // GB_AxB__plus_lxor_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_lxor_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_lxor_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__plus_lxor_uint16.c index 7fa7320ce6..e4a498934a 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_lxor_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_lxor_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__plus_lxor_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_lxor_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_lxor_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__plus_lxor_uint32.c index 0459198926..e9f2efad72 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_lxor_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_lxor_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__plus_lxor_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_lxor_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_lxor_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__plus_lxor_uint64.c index e2850f8e3a..113b6e2fe8 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_lxor_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_lxor_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__plus_lxor_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_lxor_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_lxor_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__plus_lxor_uint8.c index 314e089361..fa97424bac 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_lxor_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_lxor_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__plus_lxor_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_lxor_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_max_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__plus_max_fp32.c index 4f081249b0..c798a81e43 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_max_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_max_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__plus_max_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_max_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_max_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__plus_max_fp64.c index e5fc45d151..454c932e25 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_max_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_max_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__plus_max_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_max_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_max_int16.c b/GraphBLAS/Source/Generated/GB_AxB__plus_max_int16.c index f15eeee93c..9ce285b8b3 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_max_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_max_int16.c @@ -2,7 +2,7 @@ // GB_AxB__plus_max_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_max_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_max_int32.c b/GraphBLAS/Source/Generated/GB_AxB__plus_max_int32.c index af30247a8a..1c06b27288 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_max_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_max_int32.c @@ -2,7 +2,7 @@ // GB_AxB__plus_max_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_max_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_max_int64.c b/GraphBLAS/Source/Generated/GB_AxB__plus_max_int64.c index f468559c52..07306145ab 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_max_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_max_int64.c @@ -2,7 +2,7 @@ // GB_AxB__plus_max_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_max_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_max_int8.c b/GraphBLAS/Source/Generated/GB_AxB__plus_max_int8.c index cefc05c79b..cfea35724d 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_max_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_max_int8.c @@ -2,7 +2,7 @@ // GB_AxB__plus_max_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_max_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_max_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__plus_max_uint16.c index 82d7d6dbdf..36432fb196 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_max_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_max_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__plus_max_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_max_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_max_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__plus_max_uint32.c index 3a1844cad7..67c5a3e148 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_max_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_max_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__plus_max_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_max_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_max_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__plus_max_uint64.c index 3ad0387a34..bd91cb3495 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_max_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_max_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__plus_max_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_max_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_max_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__plus_max_uint8.c index 2f22736fa7..8f970b9476 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_max_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_max_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__plus_max_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_max_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_min_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__plus_min_fp32.c index c117ede5ff..4dcf640111 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_min_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_min_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__plus_min_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_min_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_min_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__plus_min_fp64.c index bf3669fd1b..383e80296e 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_min_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_min_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__plus_min_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_min_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_min_int16.c b/GraphBLAS/Source/Generated/GB_AxB__plus_min_int16.c index 7cf3e352ef..93a92cc9c9 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_min_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_min_int16.c @@ -2,7 +2,7 @@ // GB_AxB__plus_min_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_min_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_min_int32.c b/GraphBLAS/Source/Generated/GB_AxB__plus_min_int32.c index dea57be029..a37974e3ab 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_min_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_min_int32.c @@ -2,7 +2,7 @@ // GB_AxB__plus_min_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_min_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_min_int64.c b/GraphBLAS/Source/Generated/GB_AxB__plus_min_int64.c index cb05f1d077..02582d0453 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_min_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_min_int64.c @@ -2,7 +2,7 @@ // GB_AxB__plus_min_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_min_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_min_int8.c b/GraphBLAS/Source/Generated/GB_AxB__plus_min_int8.c index f7883a2090..d2e9f72ab3 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_min_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_min_int8.c @@ -2,7 +2,7 @@ // GB_AxB__plus_min_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_min_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_min_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__plus_min_uint16.c index 1cc4a740a0..fed810d835 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_min_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_min_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__plus_min_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_min_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_min_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__plus_min_uint32.c index 945e3c2e0f..fcda138c0a 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_min_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_min_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__plus_min_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_min_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_min_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__plus_min_uint64.c index 45791a5535..b2e460d897 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_min_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_min_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__plus_min_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_min_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_min_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__plus_min_uint8.c index f4b97d56e0..949f685c75 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_min_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_min_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__plus_min_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_min_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_minus_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__plus_minus_fp32.c index 949849925e..bf842baf24 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_minus_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_minus_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__plus_minus_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_minus_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_minus_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__plus_minus_fp64.c index 69063c09cf..ff99c8623c 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_minus_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_minus_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__plus_minus_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_minus_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_minus_int16.c b/GraphBLAS/Source/Generated/GB_AxB__plus_minus_int16.c index d9735e92d0..e313917eec 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_minus_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_minus_int16.c @@ -2,7 +2,7 @@ // GB_AxB__plus_minus_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_minus_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_minus_int32.c b/GraphBLAS/Source/Generated/GB_AxB__plus_minus_int32.c index 330c930a1b..fdcb11e1cf 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_minus_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_minus_int32.c @@ -2,7 +2,7 @@ // GB_AxB__plus_minus_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_minus_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_minus_int64.c b/GraphBLAS/Source/Generated/GB_AxB__plus_minus_int64.c index 3565ae6fb2..6fad78a631 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_minus_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_minus_int64.c @@ -2,7 +2,7 @@ // GB_AxB__plus_minus_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_minus_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_minus_int8.c b/GraphBLAS/Source/Generated/GB_AxB__plus_minus_int8.c index d76d25e404..4dca0e3195 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_minus_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_minus_int8.c @@ -2,7 +2,7 @@ // GB_AxB__plus_minus_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_minus_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_minus_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__plus_minus_uint16.c index 0a3d82fe57..fd07ac0ac2 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_minus_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_minus_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__plus_minus_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_minus_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_minus_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__plus_minus_uint32.c index 4a7de945fa..001ef5cb01 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_minus_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_minus_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__plus_minus_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_minus_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_minus_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__plus_minus_uint64.c index ade729133b..c55baf164e 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_minus_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_minus_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__plus_minus_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_minus_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_minus_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__plus_minus_uint8.c index 1072f6dae3..43bdb07a05 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_minus_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_minus_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__plus_minus_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_minus_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_plus_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__plus_plus_fp32.c index 1a55d17e98..79339c86ec 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_plus_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_plus_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__plus_plus_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_plus_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_plus_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__plus_plus_fp64.c index 7ebc197e06..4820f7ccc6 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_plus_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_plus_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__plus_plus_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_plus_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_plus_int16.c b/GraphBLAS/Source/Generated/GB_AxB__plus_plus_int16.c index f6f74c0ab1..3944bd2b06 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_plus_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_plus_int16.c @@ -2,7 +2,7 @@ // GB_AxB__plus_plus_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_plus_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_plus_int32.c b/GraphBLAS/Source/Generated/GB_AxB__plus_plus_int32.c index 8c57a1f8b1..e804ec62e0 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_plus_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_plus_int32.c @@ -2,7 +2,7 @@ // GB_AxB__plus_plus_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_plus_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_plus_int64.c b/GraphBLAS/Source/Generated/GB_AxB__plus_plus_int64.c index d853d20785..69eb470516 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_plus_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_plus_int64.c @@ -2,7 +2,7 @@ // GB_AxB__plus_plus_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_plus_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_plus_int8.c b/GraphBLAS/Source/Generated/GB_AxB__plus_plus_int8.c index 3bbd5a68e7..84c8cc95e6 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_plus_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_plus_int8.c @@ -2,7 +2,7 @@ // GB_AxB__plus_plus_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_plus_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_plus_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__plus_plus_uint16.c index a8f0dc3946..bbebcb2ee2 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_plus_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_plus_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__plus_plus_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_plus_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_plus_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__plus_plus_uint32.c index 4283994b4b..9646c5c5dd 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_plus_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_plus_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__plus_plus_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_plus_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_plus_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__plus_plus_uint64.c index 2d3ca76387..5f7d101633 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_plus_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_plus_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__plus_plus_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_plus_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_plus_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__plus_plus_uint8.c index c955afe82a..bdf100f022 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_plus_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_plus_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__plus_plus_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_plus_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_second_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__plus_second_fp32.c index 5ccdd5a5ba..a3baa1e477 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_second_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_second_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__plus_second_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_second_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_second_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__plus_second_fp64.c index bf6e266f3d..2f82473460 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_second_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_second_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__plus_second_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_second_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_second_int16.c b/GraphBLAS/Source/Generated/GB_AxB__plus_second_int16.c index 21a0cdf59d..52fd6b763d 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_second_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_second_int16.c @@ -2,7 +2,7 @@ // GB_AxB__plus_second_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_second_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_second_int32.c b/GraphBLAS/Source/Generated/GB_AxB__plus_second_int32.c index d914126d0e..c26dcfc7d0 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_second_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_second_int32.c @@ -2,7 +2,7 @@ // GB_AxB__plus_second_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_second_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_second_int64.c b/GraphBLAS/Source/Generated/GB_AxB__plus_second_int64.c index 9605d0dbb7..7a45d8f753 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_second_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_second_int64.c @@ -2,7 +2,7 @@ // GB_AxB__plus_second_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_second_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_second_int8.c b/GraphBLAS/Source/Generated/GB_AxB__plus_second_int8.c index 8a3b7591f4..09d04fdbaa 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_second_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_second_int8.c @@ -2,7 +2,7 @@ // GB_AxB__plus_second_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_second_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_second_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__plus_second_uint16.c index f4748abc7e..677a2ca54f 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_second_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_second_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__plus_second_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_second_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_second_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__plus_second_uint32.c index f6cc31ccac..5c31985964 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_second_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_second_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__plus_second_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_second_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_second_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__plus_second_uint64.c index c452e34a26..33efa07386 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_second_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_second_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__plus_second_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_second_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_second_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__plus_second_uint8.c index a371cbbb71..f76af525ec 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_second_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_second_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__plus_second_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_second_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_times_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__plus_times_fp32.c index 6ff0c77c89..7917a07494 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_times_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_times_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__plus_times_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_times_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_times_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__plus_times_fp64.c index 2286398923..d456f8349d 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_times_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_times_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__plus_times_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_times_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_times_int16.c b/GraphBLAS/Source/Generated/GB_AxB__plus_times_int16.c index bd07228296..d07bf7289d 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_times_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_times_int16.c @@ -2,7 +2,7 @@ // GB_AxB__plus_times_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_times_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_times_int32.c b/GraphBLAS/Source/Generated/GB_AxB__plus_times_int32.c index 5a0cc98616..1897747307 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_times_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_times_int32.c @@ -2,7 +2,7 @@ // GB_AxB__plus_times_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_times_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_times_int64.c b/GraphBLAS/Source/Generated/GB_AxB__plus_times_int64.c index 1951c7e3c1..40376ac64f 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_times_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_times_int64.c @@ -2,7 +2,7 @@ // GB_AxB__plus_times_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_times_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_times_int8.c b/GraphBLAS/Source/Generated/GB_AxB__plus_times_int8.c index d74b4edfed..4953c51d9e 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_times_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_times_int8.c @@ -2,7 +2,7 @@ // GB_AxB__plus_times_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_times_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_times_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__plus_times_uint16.c index 4c23ca6ad6..b00218433a 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_times_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_times_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__plus_times_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_times_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_times_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__plus_times_uint32.c index bfa99d2b5e..96fa47d474 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_times_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_times_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__plus_times_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_times_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_times_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__plus_times_uint64.c index 4351ad3767..0c7831dd70 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_times_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_times_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__plus_times_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_times_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__plus_times_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__plus_times_uint8.c index 4543d6d449..ce1d1512db 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__plus_times_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__plus_times_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__plus_times_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__plus_times_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__semirings.h b/GraphBLAS/Source/Generated/GB_AxB__semirings.h index a0bc6ee581..005a7d416e 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__semirings.h +++ b/GraphBLAS/Source/Generated/GB_AxB__semirings.h @@ -2,7 +2,7 @@ // GB_AxB__semirings.h: definitions for GB_AxB__*.c //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // This file has been automatically generated from Template/GB_AxB.h diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_div_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__times_div_fp32.c index 6dd296c5d5..4e2c2aae5f 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_div_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_div_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__times_div_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_div_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_div_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__times_div_fp64.c index ca8902fd84..a7120ec9f7 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_div_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_div_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__times_div_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_div_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_div_int16.c b/GraphBLAS/Source/Generated/GB_AxB__times_div_int16.c index caa7bfaf5c..2f4ae041aa 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_div_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_div_int16.c @@ -2,7 +2,7 @@ // GB_AxB__times_div_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_div_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_div_int32.c b/GraphBLAS/Source/Generated/GB_AxB__times_div_int32.c index bf5dc9b42d..eff31a9868 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_div_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_div_int32.c @@ -2,7 +2,7 @@ // GB_AxB__times_div_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_div_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_div_int64.c b/GraphBLAS/Source/Generated/GB_AxB__times_div_int64.c index b479546049..0d8f120c71 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_div_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_div_int64.c @@ -2,7 +2,7 @@ // GB_AxB__times_div_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_div_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_div_int8.c b/GraphBLAS/Source/Generated/GB_AxB__times_div_int8.c index 097a818d18..b5d72c3d26 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_div_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_div_int8.c @@ -2,7 +2,7 @@ // GB_AxB__times_div_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_div_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_div_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__times_div_uint16.c index 104c8422b3..dd7f524254 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_div_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_div_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__times_div_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_div_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_div_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__times_div_uint32.c index 9220bc742f..9ba95e80d0 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_div_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_div_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__times_div_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_div_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_div_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__times_div_uint64.c index a604c65c88..b7fa3b9a27 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_div_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_div_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__times_div_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_div_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_div_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__times_div_uint8.c index 19a54d68eb..c63ee5c1c1 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_div_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_div_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__times_div_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_div_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_first_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__times_first_fp32.c index 7cc9df42ed..187fb4431b 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_first_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_first_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__times_first_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_first_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_first_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__times_first_fp64.c index 83fec69242..2114a6b065 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_first_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_first_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__times_first_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_first_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_first_int16.c b/GraphBLAS/Source/Generated/GB_AxB__times_first_int16.c index b1e36f736c..d3a603858b 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_first_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_first_int16.c @@ -2,7 +2,7 @@ // GB_AxB__times_first_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_first_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_first_int32.c b/GraphBLAS/Source/Generated/GB_AxB__times_first_int32.c index 5b0b45fd6e..0ed5294dcc 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_first_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_first_int32.c @@ -2,7 +2,7 @@ // GB_AxB__times_first_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_first_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_first_int64.c b/GraphBLAS/Source/Generated/GB_AxB__times_first_int64.c index 0954d2f983..ff1928122e 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_first_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_first_int64.c @@ -2,7 +2,7 @@ // GB_AxB__times_first_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_first_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_first_int8.c b/GraphBLAS/Source/Generated/GB_AxB__times_first_int8.c index 3fbfdb1c58..2f2f8ee63e 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_first_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_first_int8.c @@ -2,7 +2,7 @@ // GB_AxB__times_first_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_first_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_first_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__times_first_uint16.c index 7829c4747e..1c16989b8d 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_first_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_first_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__times_first_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_first_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_first_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__times_first_uint32.c index bff04ca863..abe4b57fa3 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_first_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_first_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__times_first_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_first_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_first_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__times_first_uint64.c index 8f7aeabfc4..be4d768042 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_first_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_first_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__times_first_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_first_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_first_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__times_first_uint8.c index 5b28ab8285..0e130bc010 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_first_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_first_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__times_first_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_first_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_iseq_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__times_iseq_fp32.c index 7ddba86a3e..ff9ec24777 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_iseq_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_iseq_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__times_iseq_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_iseq_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_iseq_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__times_iseq_fp64.c index 2e5bc6ac7c..773bbc27d3 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_iseq_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_iseq_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__times_iseq_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_iseq_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_iseq_int16.c b/GraphBLAS/Source/Generated/GB_AxB__times_iseq_int16.c index b959d7aa2c..9751e45df4 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_iseq_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_iseq_int16.c @@ -2,7 +2,7 @@ // GB_AxB__times_iseq_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_iseq_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_iseq_int32.c b/GraphBLAS/Source/Generated/GB_AxB__times_iseq_int32.c index 935714c041..c6c8a7fc73 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_iseq_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_iseq_int32.c @@ -2,7 +2,7 @@ // GB_AxB__times_iseq_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_iseq_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_iseq_int64.c b/GraphBLAS/Source/Generated/GB_AxB__times_iseq_int64.c index 6f83b10f97..b73ed275bb 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_iseq_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_iseq_int64.c @@ -2,7 +2,7 @@ // GB_AxB__times_iseq_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_iseq_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_iseq_int8.c b/GraphBLAS/Source/Generated/GB_AxB__times_iseq_int8.c index a65a738f2e..b451fc0a62 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_iseq_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_iseq_int8.c @@ -2,7 +2,7 @@ // GB_AxB__times_iseq_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_iseq_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_iseq_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__times_iseq_uint16.c index 2c22207d6e..8e610a1acd 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_iseq_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_iseq_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__times_iseq_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_iseq_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_iseq_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__times_iseq_uint32.c index 2e1ba06dd2..a24ce108dc 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_iseq_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_iseq_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__times_iseq_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_iseq_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_iseq_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__times_iseq_uint64.c index 16be7ffa74..378def1e7f 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_iseq_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_iseq_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__times_iseq_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_iseq_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_iseq_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__times_iseq_uint8.c index d295679aaa..593f161bba 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_iseq_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_iseq_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__times_iseq_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_iseq_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_isge_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__times_isge_fp32.c index 5a6ad5684a..1fcf889b1d 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_isge_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_isge_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__times_isge_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_isge_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_isge_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__times_isge_fp64.c index 6c61aef6fc..3b842656e7 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_isge_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_isge_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__times_isge_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_isge_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_isge_int16.c b/GraphBLAS/Source/Generated/GB_AxB__times_isge_int16.c index 3d4e5902e7..864611c21e 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_isge_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_isge_int16.c @@ -2,7 +2,7 @@ // GB_AxB__times_isge_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_isge_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_isge_int32.c b/GraphBLAS/Source/Generated/GB_AxB__times_isge_int32.c index 7078d1df19..eb0ad09d66 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_isge_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_isge_int32.c @@ -2,7 +2,7 @@ // GB_AxB__times_isge_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_isge_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_isge_int64.c b/GraphBLAS/Source/Generated/GB_AxB__times_isge_int64.c index 5a409f3725..40e2210ea3 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_isge_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_isge_int64.c @@ -2,7 +2,7 @@ // GB_AxB__times_isge_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_isge_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_isge_int8.c b/GraphBLAS/Source/Generated/GB_AxB__times_isge_int8.c index 482dad49e1..d02f70ea63 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_isge_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_isge_int8.c @@ -2,7 +2,7 @@ // GB_AxB__times_isge_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_isge_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_isge_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__times_isge_uint16.c index cb2eae1ecc..7248ff7ac0 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_isge_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_isge_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__times_isge_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_isge_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_isge_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__times_isge_uint32.c index 7d200fdc60..3a02dd2b35 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_isge_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_isge_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__times_isge_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_isge_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_isge_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__times_isge_uint64.c index abe3b6298a..89b02abd5d 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_isge_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_isge_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__times_isge_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_isge_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_isge_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__times_isge_uint8.c index 1181edb950..57d5d54662 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_isge_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_isge_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__times_isge_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_isge_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_isgt_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__times_isgt_fp32.c index 66dff6c518..17af0123d0 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_isgt_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_isgt_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__times_isgt_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_isgt_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_isgt_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__times_isgt_fp64.c index 89da2ca158..21fb6678fd 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_isgt_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_isgt_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__times_isgt_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_isgt_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_isgt_int16.c b/GraphBLAS/Source/Generated/GB_AxB__times_isgt_int16.c index 1256f3800c..4b795f56d6 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_isgt_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_isgt_int16.c @@ -2,7 +2,7 @@ // GB_AxB__times_isgt_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_isgt_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_isgt_int32.c b/GraphBLAS/Source/Generated/GB_AxB__times_isgt_int32.c index 481ddad090..e258901de8 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_isgt_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_isgt_int32.c @@ -2,7 +2,7 @@ // GB_AxB__times_isgt_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_isgt_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_isgt_int64.c b/GraphBLAS/Source/Generated/GB_AxB__times_isgt_int64.c index e2cd680b40..0b0a48419d 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_isgt_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_isgt_int64.c @@ -2,7 +2,7 @@ // GB_AxB__times_isgt_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_isgt_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_isgt_int8.c b/GraphBLAS/Source/Generated/GB_AxB__times_isgt_int8.c index 40f18210e1..fcb7e14092 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_isgt_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_isgt_int8.c @@ -2,7 +2,7 @@ // GB_AxB__times_isgt_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_isgt_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_isgt_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__times_isgt_uint16.c index dd748e2eb7..9641659216 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_isgt_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_isgt_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__times_isgt_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_isgt_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_isgt_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__times_isgt_uint32.c index 1361c5ce37..37c983b5e5 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_isgt_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_isgt_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__times_isgt_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_isgt_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_isgt_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__times_isgt_uint64.c index 9037b7bd1f..ab247afdaa 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_isgt_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_isgt_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__times_isgt_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_isgt_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_isgt_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__times_isgt_uint8.c index 6f35637f9c..e27e624689 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_isgt_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_isgt_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__times_isgt_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_isgt_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_isle_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__times_isle_fp32.c index 8aafc7fcee..df99435adc 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_isle_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_isle_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__times_isle_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_isle_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_isle_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__times_isle_fp64.c index 9d1b458115..cd31813dc2 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_isle_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_isle_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__times_isle_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_isle_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_isle_int16.c b/GraphBLAS/Source/Generated/GB_AxB__times_isle_int16.c index 2b6d8e8293..0499bcf2b7 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_isle_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_isle_int16.c @@ -2,7 +2,7 @@ // GB_AxB__times_isle_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_isle_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_isle_int32.c b/GraphBLAS/Source/Generated/GB_AxB__times_isle_int32.c index c21719e119..ab98bd7b9d 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_isle_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_isle_int32.c @@ -2,7 +2,7 @@ // GB_AxB__times_isle_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_isle_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_isle_int64.c b/GraphBLAS/Source/Generated/GB_AxB__times_isle_int64.c index 19036ddcb1..d0db16d622 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_isle_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_isle_int64.c @@ -2,7 +2,7 @@ // GB_AxB__times_isle_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_isle_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_isle_int8.c b/GraphBLAS/Source/Generated/GB_AxB__times_isle_int8.c index 8fddc3ab94..aee4ada40e 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_isle_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_isle_int8.c @@ -2,7 +2,7 @@ // GB_AxB__times_isle_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_isle_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_isle_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__times_isle_uint16.c index bc3a1f979b..000b54d220 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_isle_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_isle_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__times_isle_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_isle_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_isle_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__times_isle_uint32.c index 7700756ce7..333edfa3a5 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_isle_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_isle_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__times_isle_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_isle_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_isle_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__times_isle_uint64.c index 3bc8809e0f..a8ad7254a0 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_isle_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_isle_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__times_isle_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_isle_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_isle_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__times_isle_uint8.c index 946692a679..f32501e2e9 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_isle_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_isle_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__times_isle_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_isle_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_islt_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__times_islt_fp32.c index c98b8e23f1..7c86c162b2 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_islt_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_islt_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__times_islt_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_islt_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_islt_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__times_islt_fp64.c index 10de84a482..bfa92be4ce 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_islt_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_islt_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__times_islt_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_islt_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_islt_int16.c b/GraphBLAS/Source/Generated/GB_AxB__times_islt_int16.c index 9ea96911f6..2252cee30a 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_islt_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_islt_int16.c @@ -2,7 +2,7 @@ // GB_AxB__times_islt_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_islt_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_islt_int32.c b/GraphBLAS/Source/Generated/GB_AxB__times_islt_int32.c index 93c621d9c6..138cdb079b 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_islt_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_islt_int32.c @@ -2,7 +2,7 @@ // GB_AxB__times_islt_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_islt_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_islt_int64.c b/GraphBLAS/Source/Generated/GB_AxB__times_islt_int64.c index 1f49964f06..7db5dc3d98 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_islt_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_islt_int64.c @@ -2,7 +2,7 @@ // GB_AxB__times_islt_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_islt_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_islt_int8.c b/GraphBLAS/Source/Generated/GB_AxB__times_islt_int8.c index c07fd2a8a2..cb0ef72437 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_islt_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_islt_int8.c @@ -2,7 +2,7 @@ // GB_AxB__times_islt_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_islt_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_islt_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__times_islt_uint16.c index da02de046b..19c37dac12 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_islt_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_islt_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__times_islt_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_islt_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_islt_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__times_islt_uint32.c index 466bf50999..40db813132 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_islt_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_islt_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__times_islt_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_islt_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_islt_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__times_islt_uint64.c index 938f5b9058..4c48b4ea72 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_islt_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_islt_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__times_islt_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_islt_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_islt_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__times_islt_uint8.c index 4b490c88c2..b390c233bb 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_islt_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_islt_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__times_islt_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_islt_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_isne_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__times_isne_fp32.c index a1b29027bb..707ec3efa7 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_isne_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_isne_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__times_isne_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_isne_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_isne_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__times_isne_fp64.c index ca1c1878ef..ebb42cb9ea 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_isne_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_isne_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__times_isne_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_isne_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_isne_int16.c b/GraphBLAS/Source/Generated/GB_AxB__times_isne_int16.c index dcb10603f4..1b25af74d2 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_isne_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_isne_int16.c @@ -2,7 +2,7 @@ // GB_AxB__times_isne_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_isne_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_isne_int32.c b/GraphBLAS/Source/Generated/GB_AxB__times_isne_int32.c index 0371bb46d9..6293a65466 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_isne_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_isne_int32.c @@ -2,7 +2,7 @@ // GB_AxB__times_isne_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_isne_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_isne_int64.c b/GraphBLAS/Source/Generated/GB_AxB__times_isne_int64.c index f5ac126b20..40869f9d24 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_isne_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_isne_int64.c @@ -2,7 +2,7 @@ // GB_AxB__times_isne_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_isne_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_isne_int8.c b/GraphBLAS/Source/Generated/GB_AxB__times_isne_int8.c index 9825ca9b9e..05128525e1 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_isne_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_isne_int8.c @@ -2,7 +2,7 @@ // GB_AxB__times_isne_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_isne_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_isne_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__times_isne_uint16.c index af6147c9db..6990bfc099 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_isne_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_isne_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__times_isne_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_isne_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_isne_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__times_isne_uint32.c index 571978d930..d33d691e5c 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_isne_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_isne_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__times_isne_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_isne_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_isne_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__times_isne_uint64.c index e08d09a4c2..de3a749549 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_isne_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_isne_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__times_isne_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_isne_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_isne_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__times_isne_uint8.c index a097750e8a..4686bc2aa5 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_isne_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_isne_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__times_isne_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_isne_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_land_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__times_land_fp32.c index 2d93de272c..2678d841f0 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_land_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_land_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__times_land_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_land_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_land_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__times_land_fp64.c index 5186d745cb..aff816c35e 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_land_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_land_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__times_land_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_land_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_land_int16.c b/GraphBLAS/Source/Generated/GB_AxB__times_land_int16.c index bb1aca7dc1..9c8c6991e5 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_land_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_land_int16.c @@ -2,7 +2,7 @@ // GB_AxB__times_land_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_land_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_land_int32.c b/GraphBLAS/Source/Generated/GB_AxB__times_land_int32.c index fd9aba3f2a..3c21731e5b 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_land_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_land_int32.c @@ -2,7 +2,7 @@ // GB_AxB__times_land_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_land_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_land_int64.c b/GraphBLAS/Source/Generated/GB_AxB__times_land_int64.c index 6a9be918ff..3463467f8c 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_land_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_land_int64.c @@ -2,7 +2,7 @@ // GB_AxB__times_land_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_land_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_land_int8.c b/GraphBLAS/Source/Generated/GB_AxB__times_land_int8.c index 794c2f6b9e..e5d63162f3 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_land_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_land_int8.c @@ -2,7 +2,7 @@ // GB_AxB__times_land_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_land_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_land_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__times_land_uint16.c index d1cd94d1ef..0ad5ab9ecc 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_land_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_land_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__times_land_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_land_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_land_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__times_land_uint32.c index 4e9f566ba8..0f7e539ab5 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_land_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_land_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__times_land_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_land_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_land_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__times_land_uint64.c index 74885ba9ed..c8e7c6757c 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_land_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_land_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__times_land_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_land_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_land_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__times_land_uint8.c index 835cca56ca..75c9ea10af 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_land_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_land_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__times_land_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_land_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_lor_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__times_lor_fp32.c index 290e0d4b90..c24041deef 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_lor_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_lor_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__times_lor_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_lor_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_lor_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__times_lor_fp64.c index 711e9532f1..0b5914ec52 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_lor_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_lor_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__times_lor_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_lor_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_lor_int16.c b/GraphBLAS/Source/Generated/GB_AxB__times_lor_int16.c index aa0638e36d..deab885eaf 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_lor_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_lor_int16.c @@ -2,7 +2,7 @@ // GB_AxB__times_lor_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_lor_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_lor_int32.c b/GraphBLAS/Source/Generated/GB_AxB__times_lor_int32.c index d18e0eac38..a1ec9b9c10 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_lor_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_lor_int32.c @@ -2,7 +2,7 @@ // GB_AxB__times_lor_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_lor_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_lor_int64.c b/GraphBLAS/Source/Generated/GB_AxB__times_lor_int64.c index 720f64d5b3..6080e3fc1c 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_lor_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_lor_int64.c @@ -2,7 +2,7 @@ // GB_AxB__times_lor_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_lor_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_lor_int8.c b/GraphBLAS/Source/Generated/GB_AxB__times_lor_int8.c index ce08f6bba6..910b7373f1 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_lor_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_lor_int8.c @@ -2,7 +2,7 @@ // GB_AxB__times_lor_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_lor_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_lor_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__times_lor_uint16.c index ed8f974249..d46e097510 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_lor_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_lor_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__times_lor_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_lor_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_lor_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__times_lor_uint32.c index 37c511d06f..0d45e30d94 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_lor_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_lor_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__times_lor_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_lor_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_lor_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__times_lor_uint64.c index 163d3f2b6f..c75d6930a2 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_lor_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_lor_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__times_lor_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_lor_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_lor_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__times_lor_uint8.c index fdf2713ff4..f20ac8e81d 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_lor_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_lor_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__times_lor_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_lor_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_lxor_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__times_lxor_fp32.c index 82179245d2..d821c8d7fb 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_lxor_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_lxor_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__times_lxor_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_lxor_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_lxor_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__times_lxor_fp64.c index c45e3d7905..f78542d7d4 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_lxor_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_lxor_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__times_lxor_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_lxor_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_lxor_int16.c b/GraphBLAS/Source/Generated/GB_AxB__times_lxor_int16.c index 3cbdb9e726..e1059e3e03 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_lxor_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_lxor_int16.c @@ -2,7 +2,7 @@ // GB_AxB__times_lxor_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_lxor_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_lxor_int32.c b/GraphBLAS/Source/Generated/GB_AxB__times_lxor_int32.c index d0483bbd79..b270b02c0e 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_lxor_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_lxor_int32.c @@ -2,7 +2,7 @@ // GB_AxB__times_lxor_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_lxor_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_lxor_int64.c b/GraphBLAS/Source/Generated/GB_AxB__times_lxor_int64.c index 7170aae2d1..8d58cec735 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_lxor_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_lxor_int64.c @@ -2,7 +2,7 @@ // GB_AxB__times_lxor_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_lxor_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_lxor_int8.c b/GraphBLAS/Source/Generated/GB_AxB__times_lxor_int8.c index 125839e330..0f011a20ca 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_lxor_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_lxor_int8.c @@ -2,7 +2,7 @@ // GB_AxB__times_lxor_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_lxor_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_lxor_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__times_lxor_uint16.c index a8aadd5923..b20343e850 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_lxor_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_lxor_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__times_lxor_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_lxor_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_lxor_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__times_lxor_uint32.c index 8e1f50d0c6..f19d8c66d8 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_lxor_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_lxor_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__times_lxor_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_lxor_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_lxor_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__times_lxor_uint64.c index 50b544da0b..9c2dc17d01 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_lxor_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_lxor_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__times_lxor_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_lxor_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_lxor_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__times_lxor_uint8.c index 65bf7042c7..f890347d03 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_lxor_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_lxor_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__times_lxor_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_lxor_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_max_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__times_max_fp32.c index 58d794c9ff..8b0e0f4839 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_max_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_max_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__times_max_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_max_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_max_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__times_max_fp64.c index ba72360b4a..4a03312dc8 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_max_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_max_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__times_max_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_max_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_max_int16.c b/GraphBLAS/Source/Generated/GB_AxB__times_max_int16.c index 09aa44965c..393f19aed4 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_max_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_max_int16.c @@ -2,7 +2,7 @@ // GB_AxB__times_max_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_max_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_max_int32.c b/GraphBLAS/Source/Generated/GB_AxB__times_max_int32.c index 294d11a8ea..5403c9ac9e 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_max_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_max_int32.c @@ -2,7 +2,7 @@ // GB_AxB__times_max_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_max_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_max_int64.c b/GraphBLAS/Source/Generated/GB_AxB__times_max_int64.c index eeab6fbc27..246f871b41 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_max_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_max_int64.c @@ -2,7 +2,7 @@ // GB_AxB__times_max_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_max_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_max_int8.c b/GraphBLAS/Source/Generated/GB_AxB__times_max_int8.c index f25c6bdfd1..708f830b35 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_max_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_max_int8.c @@ -2,7 +2,7 @@ // GB_AxB__times_max_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_max_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_max_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__times_max_uint16.c index 1eea9fda1c..2946bc3407 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_max_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_max_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__times_max_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_max_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_max_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__times_max_uint32.c index 5a5fa7b5be..a7aa257687 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_max_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_max_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__times_max_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_max_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_max_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__times_max_uint64.c index bc3bc17283..bead65ef42 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_max_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_max_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__times_max_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_max_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_max_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__times_max_uint8.c index 0c45b38013..03063afc79 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_max_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_max_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__times_max_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_max_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_min_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__times_min_fp32.c index 42e82a3833..86e0e447a0 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_min_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_min_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__times_min_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_min_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_min_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__times_min_fp64.c index 6de290af9b..a9272f3246 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_min_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_min_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__times_min_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_min_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_min_int16.c b/GraphBLAS/Source/Generated/GB_AxB__times_min_int16.c index 9cbaaf188f..de64d18f01 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_min_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_min_int16.c @@ -2,7 +2,7 @@ // GB_AxB__times_min_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_min_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_min_int32.c b/GraphBLAS/Source/Generated/GB_AxB__times_min_int32.c index b65f41e4b7..9d738b018b 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_min_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_min_int32.c @@ -2,7 +2,7 @@ // GB_AxB__times_min_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_min_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_min_int64.c b/GraphBLAS/Source/Generated/GB_AxB__times_min_int64.c index 4d5edac005..42dfd05812 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_min_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_min_int64.c @@ -2,7 +2,7 @@ // GB_AxB__times_min_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_min_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_min_int8.c b/GraphBLAS/Source/Generated/GB_AxB__times_min_int8.c index c6e05ccb0f..0355bcc464 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_min_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_min_int8.c @@ -2,7 +2,7 @@ // GB_AxB__times_min_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_min_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_min_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__times_min_uint16.c index fa7add0f1f..453104786b 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_min_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_min_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__times_min_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_min_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_min_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__times_min_uint32.c index e0c1aa25d8..0898d9a5c4 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_min_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_min_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__times_min_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_min_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_min_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__times_min_uint64.c index 6217e7e33a..119a46331b 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_min_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_min_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__times_min_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_min_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_min_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__times_min_uint8.c index 4d1c9649c1..e579448cd0 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_min_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_min_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__times_min_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_min_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_minus_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__times_minus_fp32.c index 1509bb5879..1b32bbad5a 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_minus_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_minus_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__times_minus_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_minus_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_minus_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__times_minus_fp64.c index 2c20af360e..9b66ed6dac 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_minus_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_minus_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__times_minus_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_minus_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_minus_int16.c b/GraphBLAS/Source/Generated/GB_AxB__times_minus_int16.c index 599695e417..6ecc73aefa 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_minus_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_minus_int16.c @@ -2,7 +2,7 @@ // GB_AxB__times_minus_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_minus_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_minus_int32.c b/GraphBLAS/Source/Generated/GB_AxB__times_minus_int32.c index e5ec21daee..070691fd37 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_minus_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_minus_int32.c @@ -2,7 +2,7 @@ // GB_AxB__times_minus_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_minus_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_minus_int64.c b/GraphBLAS/Source/Generated/GB_AxB__times_minus_int64.c index 4f26d97da7..a1a24ee9c9 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_minus_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_minus_int64.c @@ -2,7 +2,7 @@ // GB_AxB__times_minus_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_minus_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_minus_int8.c b/GraphBLAS/Source/Generated/GB_AxB__times_minus_int8.c index 674a8925d2..d6cfddaa50 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_minus_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_minus_int8.c @@ -2,7 +2,7 @@ // GB_AxB__times_minus_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_minus_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_minus_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__times_minus_uint16.c index d7fa857a66..5ef8e11382 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_minus_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_minus_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__times_minus_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_minus_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_minus_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__times_minus_uint32.c index ba6bec1e5f..2e991369a4 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_minus_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_minus_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__times_minus_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_minus_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_minus_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__times_minus_uint64.c index c528b36e7c..e8d5876a5f 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_minus_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_minus_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__times_minus_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_minus_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_minus_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__times_minus_uint8.c index dbe27f9e5c..b2b3f58a49 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_minus_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_minus_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__times_minus_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_minus_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_plus_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__times_plus_fp32.c index bdff69cd11..f1ce32bcfa 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_plus_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_plus_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__times_plus_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_plus_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_plus_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__times_plus_fp64.c index f217a2866a..b542a3e7a4 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_plus_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_plus_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__times_plus_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_plus_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_plus_int16.c b/GraphBLAS/Source/Generated/GB_AxB__times_plus_int16.c index a268487677..30bbf87201 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_plus_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_plus_int16.c @@ -2,7 +2,7 @@ // GB_AxB__times_plus_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_plus_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_plus_int32.c b/GraphBLAS/Source/Generated/GB_AxB__times_plus_int32.c index 02d574d3bb..2f505e162e 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_plus_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_plus_int32.c @@ -2,7 +2,7 @@ // GB_AxB__times_plus_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_plus_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_plus_int64.c b/GraphBLAS/Source/Generated/GB_AxB__times_plus_int64.c index cedbf6a703..66436a7440 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_plus_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_plus_int64.c @@ -2,7 +2,7 @@ // GB_AxB__times_plus_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_plus_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_plus_int8.c b/GraphBLAS/Source/Generated/GB_AxB__times_plus_int8.c index 527c70d6bd..671f18130a 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_plus_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_plus_int8.c @@ -2,7 +2,7 @@ // GB_AxB__times_plus_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_plus_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_plus_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__times_plus_uint16.c index fce692bb76..93b41758a1 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_plus_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_plus_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__times_plus_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_plus_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_plus_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__times_plus_uint32.c index 1abac21ed8..d2202c9352 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_plus_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_plus_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__times_plus_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_plus_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_plus_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__times_plus_uint64.c index ae13c6c2ff..cc4273481d 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_plus_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_plus_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__times_plus_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_plus_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_plus_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__times_plus_uint8.c index 6554ae0ee9..729cea2f1e 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_plus_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_plus_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__times_plus_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_plus_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_second_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__times_second_fp32.c index d7fb4bdc2b..2bdc1148fc 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_second_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_second_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__times_second_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_second_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_second_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__times_second_fp64.c index d66bc8a46b..dfdfbb6e38 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_second_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_second_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__times_second_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_second_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_second_int16.c b/GraphBLAS/Source/Generated/GB_AxB__times_second_int16.c index ab18028a6c..88323e6282 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_second_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_second_int16.c @@ -2,7 +2,7 @@ // GB_AxB__times_second_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_second_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_second_int32.c b/GraphBLAS/Source/Generated/GB_AxB__times_second_int32.c index 85c584f5c8..b755fae0ac 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_second_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_second_int32.c @@ -2,7 +2,7 @@ // GB_AxB__times_second_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_second_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_second_int64.c b/GraphBLAS/Source/Generated/GB_AxB__times_second_int64.c index 3da4018ba3..d62998a75b 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_second_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_second_int64.c @@ -2,7 +2,7 @@ // GB_AxB__times_second_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_second_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_second_int8.c b/GraphBLAS/Source/Generated/GB_AxB__times_second_int8.c index 1dd8f4f96e..ac375c236d 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_second_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_second_int8.c @@ -2,7 +2,7 @@ // GB_AxB__times_second_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_second_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_second_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__times_second_uint16.c index b3d8275e38..3fb67fe906 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_second_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_second_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__times_second_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_second_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_second_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__times_second_uint32.c index 7c972cc838..3897797f38 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_second_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_second_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__times_second_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_second_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_second_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__times_second_uint64.c index 853609e2d7..6e79805392 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_second_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_second_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__times_second_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_second_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_second_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__times_second_uint8.c index bf6794ee9e..9ca0203683 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_second_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_second_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__times_second_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_second_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_times_fp32.c b/GraphBLAS/Source/Generated/GB_AxB__times_times_fp32.c index 56d3ca123f..f1953373c7 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_times_fp32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_times_fp32.c @@ -2,7 +2,7 @@ // GB_AxB__times_times_fp32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_times_fp32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_times_fp64.c b/GraphBLAS/Source/Generated/GB_AxB__times_times_fp64.c index 1baa528b19..c60a81c7c5 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_times_fp64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_times_fp64.c @@ -2,7 +2,7 @@ // GB_AxB__times_times_fp64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_times_fp64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_times_int16.c b/GraphBLAS/Source/Generated/GB_AxB__times_times_int16.c index e7007e9afb..50a8931e44 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_times_int16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_times_int16.c @@ -2,7 +2,7 @@ // GB_AxB__times_times_int16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_times_int16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_times_int32.c b/GraphBLAS/Source/Generated/GB_AxB__times_times_int32.c index b37d0c7f17..6764ff68bd 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_times_int32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_times_int32.c @@ -2,7 +2,7 @@ // GB_AxB__times_times_int32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_times_int32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_times_int64.c b/GraphBLAS/Source/Generated/GB_AxB__times_times_int64.c index 15ec9b7fc5..b0e1113a09 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_times_int64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_times_int64.c @@ -2,7 +2,7 @@ // GB_AxB__times_times_int64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_times_int64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_times_int8.c b/GraphBLAS/Source/Generated/GB_AxB__times_times_int8.c index 53ebd9827c..7713758a60 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_times_int8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_times_int8.c @@ -2,7 +2,7 @@ // GB_AxB__times_times_int8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_times_int8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_times_uint16.c b/GraphBLAS/Source/Generated/GB_AxB__times_times_uint16.c index d548455268..d34c1baac3 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_times_uint16.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_times_uint16.c @@ -2,7 +2,7 @@ // GB_AxB__times_times_uint16: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_times_uint16 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_times_uint32.c b/GraphBLAS/Source/Generated/GB_AxB__times_times_uint32.c index f2198d9e37..611e1db643 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_times_uint32.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_times_uint32.c @@ -2,7 +2,7 @@ // GB_AxB__times_times_uint32: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_times_uint32 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_times_uint64.c b/GraphBLAS/Source/Generated/GB_AxB__times_times_uint64.c index 26b4d15c88..1c03eaa76c 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_times_uint64.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_times_uint64.c @@ -2,7 +2,7 @@ // GB_AxB__times_times_uint64: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_times_uint64 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Generated/GB_AxB__times_times_uint8.c b/GraphBLAS/Source/Generated/GB_AxB__times_times_uint8.c index 248769be76..75018038ff 100644 --- a/GraphBLAS/Source/Generated/GB_AxB__times_times_uint8.c +++ b/GraphBLAS/Source/Generated/GB_AxB__times_times_uint8.c @@ -2,7 +2,7 @@ // GB_AxB__times_times_uint8: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB__times_times_uint8 GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/GrB_BinaryOp_free.c b/GraphBLAS/Source/GrB_BinaryOp_free.c index 2a3bf72778..4f7d3a6ab7 100644 --- a/GraphBLAS/Source/GrB_BinaryOp_free.c +++ b/GraphBLAS/Source/GrB_BinaryOp_free.c @@ -2,7 +2,7 @@ // GrB_BinaryOp_free: free a binary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ @@ -24,7 +24,8 @@ GrB_Info GrB_BinaryOp_free // free a user-created binary operator if (op->magic == MAGIC) { op->magic = FREED ; // to help detect dangling pointers - GB_FREE_MEMORY (*binaryop, 1, sizeof (GB_BinaryOp_opaque)) ; + GB_FREE_MEMORY (*binaryop, 1, + sizeof (struct GB_BinaryOp_opaque)) ; } (*binaryop) = NULL ; } diff --git a/GraphBLAS/Source/GrB_BinaryOp_new.c b/GraphBLAS/Source/GrB_BinaryOp_new.c new file mode 100644 index 0000000000..bb8b49afe2 --- /dev/null +++ b/GraphBLAS/Source/GrB_BinaryOp_new.c @@ -0,0 +1,30 @@ +//------------------------------------------------------------------------------ +// GrB_BinaryOp_new: create a new user-defined binary operator +//------------------------------------------------------------------------------ + +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. +// http://suitesparse.com See GraphBLAS/Doc/License.txt for license. + +//------------------------------------------------------------------------------ + +// GrB_BinaryOp_new is implemented both as a macro and a function. Both are +// user-callable. The macro is used by default since it can capture the name +// of the binary function. + +#include "GB.h" + +// the macro version of this function must first be #undefined +#undef GrB_BinaryOp_new + +GrB_Info GrB_BinaryOp_new +( + GrB_BinaryOp *binaryop, // handle for the new binary operator + void *function, // pointer to the binary function + const GrB_Type ztype, // type of output z + const GrB_Type xtype, // type of input x + const GrB_Type ytype // type of input y +) +{ + return (GB_BinaryOp_new (binaryop, function, ztype, xtype, ytype, "f")) ; +} + diff --git a/GraphBLAS/Source/GrB_Col_assign.c b/GraphBLAS/Source/GrB_Col_assign.c index 5fe0641a8b..82c5ab9ae9 100644 --- a/GraphBLAS/Source/GrB_Col_assign.c +++ b/GraphBLAS/Source/GrB_Col_assign.c @@ -2,7 +2,7 @@ // GrB_Col_assign: C(I,j) = accum (C(I,j),u) //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GrB_Col_extract.c b/GraphBLAS/Source/GrB_Col_extract.c index 22d75db7eb..d3623075a1 100644 --- a/GraphBLAS/Source/GrB_Col_extract.c +++ b/GraphBLAS/Source/GrB_Col_extract.c @@ -2,7 +2,7 @@ // GrB_Col_extract: w = accum (w, A(I,j)) or A(j,I)' //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GrB_Descriptor_free.c b/GraphBLAS/Source/GrB_Descriptor_free.c index 3412534fb7..4e442c8faa 100644 --- a/GraphBLAS/Source/GrB_Descriptor_free.c +++ b/GraphBLAS/Source/GrB_Descriptor_free.c @@ -2,7 +2,7 @@ // GrB_Descriptor_free: free a descriptor //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ @@ -21,7 +21,8 @@ GrB_Info GrB_Descriptor_free // free a descriptor if (desc != NULL && desc->magic == MAGIC) { desc->magic = FREED ; // to help detect dangling pointers - GB_FREE_MEMORY (*descriptor, 1, sizeof (GB_Descriptor_opaque)) ; + GB_FREE_MEMORY (*descriptor, 1, + sizeof (struct GB_Descriptor_opaque)) ; } (*descriptor) = NULL ; } diff --git a/GraphBLAS/Source/GrB_Descriptor_set.c b/GraphBLAS/Source/GrB_Descriptor_set.c index c96af4a55d..6f37a48a87 100644 --- a/GraphBLAS/Source/GrB_Descriptor_set.c +++ b/GraphBLAS/Source/GrB_Descriptor_set.c @@ -2,7 +2,7 @@ // GrB_Descriptor_set: set a field in a descriptor //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GrB_Matrix_apply.c b/GraphBLAS/Source/GrB_Matrix_apply.c index b346d1dc94..30b0f55e66 100644 --- a/GraphBLAS/Source/GrB_Matrix_apply.c +++ b/GraphBLAS/Source/GrB_Matrix_apply.c @@ -2,7 +2,7 @@ // GrB_Matrix_apply: apply a unary operator to a matrix //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GrB_Matrix_assign.c b/GraphBLAS/Source/GrB_Matrix_assign.c index d84da960eb..fb3165b25e 100644 --- a/GraphBLAS/Source/GrB_Matrix_assign.c +++ b/GraphBLAS/Source/GrB_Matrix_assign.c @@ -2,7 +2,7 @@ // GrB_Matrix_assign: matrix assignment: C(I,J) = accum (C(I,J),A) //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GrB_Matrix_assign_scalar.c b/GraphBLAS/Source/GrB_Matrix_assign_scalar.c index 4f41ccd527..78a648f2b8 100644 --- a/GraphBLAS/Source/GrB_Matrix_assign_scalar.c +++ b/GraphBLAS/Source/GrB_Matrix_assign_scalar.c @@ -2,7 +2,7 @@ // GrB_Matrix_assign_[SCALAR]: assign a scalar to matrix, via scalar expansion //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GrB_Matrix_build.c b/GraphBLAS/Source/GrB_Matrix_build.c index 89ea4cb3f3..1774810709 100644 --- a/GraphBLAS/Source/GrB_Matrix_build.c +++ b/GraphBLAS/Source/GrB_Matrix_build.c @@ -2,7 +2,7 @@ // GrB_Matrix_build: build a sparse GraphBLAS matrix //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GrB_Matrix_clear.c b/GraphBLAS/Source/GrB_Matrix_clear.c index b2dfbbe6d4..2e7c8d3f48 100644 --- a/GraphBLAS/Source/GrB_Matrix_clear.c +++ b/GraphBLAS/Source/GrB_Matrix_clear.c @@ -2,7 +2,7 @@ // GrB_Matrix_clear: clears the content of a matrix //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GrB_Matrix_dup.c b/GraphBLAS/Source/GrB_Matrix_dup.c index be24f52cb1..e585c80a10 100644 --- a/GraphBLAS/Source/GrB_Matrix_dup.c +++ b/GraphBLAS/Source/GrB_Matrix_dup.c @@ -2,7 +2,7 @@ // GrB_Matrix_dup: make a deep copy of a sparse matrix //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GrB_Matrix_extract.c b/GraphBLAS/Source/GrB_Matrix_extract.c index a7d9ab6961..f214c24ed7 100644 --- a/GraphBLAS/Source/GrB_Matrix_extract.c +++ b/GraphBLAS/Source/GrB_Matrix_extract.c @@ -2,7 +2,7 @@ // GrB_Matrix_extract: C = accum (C, A(I,J)) or A(J,I)' //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GrB_Matrix_extractElement.c b/GraphBLAS/Source/GrB_Matrix_extractElement.c index e0b0776974..3646703d55 100644 --- a/GraphBLAS/Source/GrB_Matrix_extractElement.c +++ b/GraphBLAS/Source/GrB_Matrix_extractElement.c @@ -2,7 +2,7 @@ // GrB_Matrix_extractElement: extract a single entry from a matrix, x = A(i,j) //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GrB_Matrix_extractTuples.c b/GraphBLAS/Source/GrB_Matrix_extractTuples.c index 7187e5c0d2..d5477281b4 100644 --- a/GraphBLAS/Source/GrB_Matrix_extractTuples.c +++ b/GraphBLAS/Source/GrB_Matrix_extractTuples.c @@ -2,7 +2,7 @@ // GrB_Matrix_extractTuples: extract all tuples from a matrix //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GrB_Matrix_free.c b/GraphBLAS/Source/GrB_Matrix_free.c index 05f27df187..6f3a791b3c 100644 --- a/GraphBLAS/Source/GrB_Matrix_free.c +++ b/GraphBLAS/Source/GrB_Matrix_free.c @@ -2,7 +2,7 @@ // GrB_Matrix_free: free a matrix //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GrB_Matrix_ncols.c b/GraphBLAS/Source/GrB_Matrix_ncols.c index 4c5fdf6672..b01c2c7057 100644 --- a/GraphBLAS/Source/GrB_Matrix_ncols.c +++ b/GraphBLAS/Source/GrB_Matrix_ncols.c @@ -2,7 +2,7 @@ // GrB_Matrix_ncols: number of columns of a sparse matrix //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GrB_Matrix_new.c b/GraphBLAS/Source/GrB_Matrix_new.c index e7712d0e00..8d6cf7cf64 100644 --- a/GraphBLAS/Source/GrB_Matrix_new.c +++ b/GraphBLAS/Source/GrB_Matrix_new.c @@ -2,7 +2,7 @@ // GrB_Matrix_new: create a new matrix //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GrB_Matrix_nrows.c b/GraphBLAS/Source/GrB_Matrix_nrows.c index 4d14654d33..ebd320abcb 100644 --- a/GraphBLAS/Source/GrB_Matrix_nrows.c +++ b/GraphBLAS/Source/GrB_Matrix_nrows.c @@ -2,7 +2,7 @@ // GrB_Matrix_nrows: number of rows of a sparse matrix //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GrB_Matrix_nvals.c b/GraphBLAS/Source/GrB_Matrix_nvals.c index 2bc0d21c73..1058af5050 100644 --- a/GraphBLAS/Source/GrB_Matrix_nvals.c +++ b/GraphBLAS/Source/GrB_Matrix_nvals.c @@ -2,7 +2,7 @@ // GrB_Matrix_nvals: number of entries in a sparse matrix //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GrB_Matrix_reduce_scalar.c b/GraphBLAS/Source/GrB_Matrix_reduce_scalar.c index c234e164f7..ad50db5d40 100644 --- a/GraphBLAS/Source/GrB_Matrix_reduce_scalar.c +++ b/GraphBLAS/Source/GrB_Matrix_reduce_scalar.c @@ -2,7 +2,7 @@ // GrB_Matrix_reduce_scalar: reduce a matrix to a scalar //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GrB_Matrix_setElement.c b/GraphBLAS/Source/GrB_Matrix_setElement.c index c364d072f1..d198178e2b 100644 --- a/GraphBLAS/Source/GrB_Matrix_setElement.c +++ b/GraphBLAS/Source/GrB_Matrix_setElement.c @@ -2,7 +2,7 @@ // GrB_Matrix_setElement: set an entry in a matrix, C(i,j) = x //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GrB_Monoid_free.c b/GraphBLAS/Source/GrB_Monoid_free.c index 1498659552..99b2b2e531 100644 --- a/GraphBLAS/Source/GrB_Monoid_free.c +++ b/GraphBLAS/Source/GrB_Monoid_free.c @@ -2,7 +2,7 @@ // GrB_Monoid_free: free a monoid //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ @@ -26,7 +26,7 @@ GrB_Info GrB_Monoid_free // free a user-created monoid // are statically allocated and cannot be freed. mon->magic = FREED ; // to help detect dangling pointers GB_FREE_MEMORY (mon->identity, 1, mon->op->ztype->size) ; - GB_FREE_MEMORY (*monoid, 1, sizeof (GB_Monoid_opaque)) ; + GB_FREE_MEMORY (*monoid, 1, sizeof (struct GB_Monoid_opaque)) ; } (*monoid) = NULL ; } diff --git a/GraphBLAS/Source/GrB_Monoid_new.c b/GraphBLAS/Source/GrB_Monoid_new.c index 85bbd1d2d6..4735f1825d 100644 --- a/GraphBLAS/Source/GrB_Monoid_new.c +++ b/GraphBLAS/Source/GrB_Monoid_new.c @@ -2,7 +2,7 @@ // GrB_Monoid_new: create a new monoid //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ @@ -15,14 +15,14 @@ #undef MONOID #define MONOID(type,T) \ -GrB_Info GrB_Monoid_ ## T ##_new /* create a new boolean monoid */ \ +GrB_Info GrB_Monoid_new_ ## T /* create a new boolean monoid */ \ ( \ GrB_Monoid *monoid, /* handle of monoid to create */ \ const GrB_BinaryOp op, /* binary operator of the monoid */ \ const type identity /* identity value of the monoid */ \ ) \ { \ - WHERE ("GrB_Monoid_" GB_STR(T) "_new (&monoid, op, identity)") ; \ + WHERE ("GrB_Monoid_new_" GB_STR(T) " (&monoid, op, identity)") ; \ type id = identity ; \ return (GB_Monoid_new (monoid, op, &id, GB_ ## T ## _code)) ; \ } @@ -39,14 +39,14 @@ MONOID (uint64_t , UINT64 ) ; MONOID (float , FP32 ) ; MONOID (double , FP64 ) ; -GrB_Info GrB_Monoid_UDT_new // create a monoid with a user-defined type +GrB_Info GrB_Monoid_new_UDT // create a monoid with a user-defined type ( GrB_Monoid *monoid, // handle of monoid to create const GrB_BinaryOp op, // binary operator of the monoid const void *identity // identity value of the monoid ) { - WHERE ("GrB_Monoid_UDT_new (&monoid, op, identity)") ; + WHERE ("GrB_Monoid_new_UDT (&monoid, op, identity)") ; return (GB_Monoid_new (monoid, op, identity, GB_UDT_code)) ; } diff --git a/GraphBLAS/Source/GrB_Row_assign.c b/GraphBLAS/Source/GrB_Row_assign.c index 6762044786..33f4f106ad 100644 --- a/GraphBLAS/Source/GrB_Row_assign.c +++ b/GraphBLAS/Source/GrB_Row_assign.c @@ -2,7 +2,7 @@ // GrB_Row_assign: C(i,J) = accum (C(i,J),u') //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GrB_Semiring_free.c b/GraphBLAS/Source/GrB_Semiring_free.c index 4963a70ae4..ea189c572e 100644 --- a/GraphBLAS/Source/GrB_Semiring_free.c +++ b/GraphBLAS/Source/GrB_Semiring_free.c @@ -2,7 +2,7 @@ // GrB_Semiring_free: free a semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ @@ -25,7 +25,8 @@ GrB_Info GrB_Semiring_free // free a user-created semiring // only user-defined semirings are freed. predefined semirings // are statically allocated and cannot be freed. s->magic = FREED ; // to help detect dangling pointers - GB_FREE_MEMORY (*semiring, 1, sizeof (GB_Semiring_opaque)) ; + GB_FREE_MEMORY (*semiring, 1, + sizeof (struct GB_Semiring_opaque)) ; } (*semiring) = NULL ; } diff --git a/GraphBLAS/Source/GrB_Semiring_new.c b/GraphBLAS/Source/GrB_Semiring_new.c index 35d74386c5..dd4b657c96 100644 --- a/GraphBLAS/Source/GrB_Semiring_new.c +++ b/GraphBLAS/Source/GrB_Semiring_new.c @@ -2,7 +2,7 @@ // GrB_Semiring_new: create a new semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ @@ -63,7 +63,7 @@ GrB_Info GrB_Semiring_new // create a semiring //-------------------------------------------------------------------------- // allocate the semiring - GB_CALLOC_MEMORY (*semiring, 1, sizeof (GB_Semiring_opaque)) ; + GB_CALLOC_MEMORY (*semiring, 1, sizeof (struct GB_Semiring_opaque)) ; if (*semiring == NULL) { return (ERROR (GrB_OUT_OF_MEMORY, (LOG, "out of memory"))) ; diff --git a/GraphBLAS/Source/GrB_Type_free.c b/GraphBLAS/Source/GrB_Type_free.c index d477de520a..7242be91ea 100644 --- a/GraphBLAS/Source/GrB_Type_free.c +++ b/GraphBLAS/Source/GrB_Type_free.c @@ -2,7 +2,7 @@ // GrB_Type_free: free a user-defined type //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ @@ -24,7 +24,7 @@ GrB_Info GrB_Type_free // free a user-defined type if (t->magic == MAGIC) { t->magic = FREED ; // to help detect dangling pointers - GB_FREE_MEMORY (*type, 1, sizeof (GB_Type_opaque)) ; + GB_FREE_MEMORY (*type, 1, sizeof (struct GB_Type_opaque)) ; } (*type) = NULL ; } diff --git a/GraphBLAS/Source/GrB_Type_new.c b/GraphBLAS/Source/GrB_Type_new.c new file mode 100644 index 0000000000..94b57aa4c5 --- /dev/null +++ b/GraphBLAS/Source/GrB_Type_new.c @@ -0,0 +1,34 @@ +//------------------------------------------------------------------------------ +// GrB_Type_new: create a new user-defined type +//------------------------------------------------------------------------------ + +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. +// http://suitesparse.com See GraphBLAS/Doc/License.txt for license. + +//------------------------------------------------------------------------------ + +// GrB_Type_new is implemented both as a macro and a function. Both are +// user-callable. The default is to use the macro, since this allows the name +// of the type to be saved as a string, for subsequent error reporting by +// GrB_error. It is also provided as a function so that applications that +// require a function instead of macro can access it. User code can simply do +// #undef GrB_Type_new before using the function. This approach also places +// the function GrB_Type_new in the linkable SuiteSparse:GraphBLAS library so +// that it is visible for linking with applications in languages other than +// ANSI C99. The function version does not allow the name of the ctype to be +// saved in the new GraphBLAS type, however. It is given the generic name. + +#include "GB.h" + +// the macro version of this function must first be #undefined +#undef GrB_Type_new + +GrB_Info GrB_Type_new // create a new GraphBLAS type +( + GrB_Type *type, // handle of user type to create + size_t sizeof_ctype // size = sizeof (ctype) of the C type +) +{ + return (GB_Type_new (type, sizeof_ctype, NULL)) ; +} + diff --git a/GraphBLAS/Source/GrB_UnaryOp_free.c b/GraphBLAS/Source/GrB_UnaryOp_free.c index a79e1004b9..2a5f10ec94 100644 --- a/GraphBLAS/Source/GrB_UnaryOp_free.c +++ b/GraphBLAS/Source/GrB_UnaryOp_free.c @@ -2,7 +2,7 @@ // GrB_UnaryOp_free: free a unary operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ @@ -24,7 +24,7 @@ GrB_Info GrB_UnaryOp_free // free a user-created unary operator if (op->magic == MAGIC) { op->magic = FREED ; // to help detect dangling pointers - GB_FREE_MEMORY (*unaryop, 1, sizeof (GB_UnaryOp_opaque)) ; + GB_FREE_MEMORY (*unaryop, 1, sizeof (struct GB_UnaryOp_opaque)); } (*unaryop) = NULL ; } diff --git a/GraphBLAS/Source/GrB_UnaryOp_new.c b/GraphBLAS/Source/GrB_UnaryOp_new.c new file mode 100644 index 0000000000..d6927dcdcc --- /dev/null +++ b/GraphBLAS/Source/GrB_UnaryOp_new.c @@ -0,0 +1,29 @@ +//------------------------------------------------------------------------------ +// GrB_UnaryOp_new: create a new user-defined unary operator +//------------------------------------------------------------------------------ + +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. +// http://suitesparse.com See GraphBLAS/Doc/License.txt for license. + +//------------------------------------------------------------------------------ + +// GrB_UnaryOp_new is implemented both as a macro and a function. Both are +// user-callable. The macro is used by default since it can capture the name +// of the unary function. + +#include "GB.h" + +// the macro version of this function must first be #undefined +#undef GrB_UnaryOp_new + +GrB_Info GrB_UnaryOp_new // create a new user-defined unary operator +( + GrB_UnaryOp *unaryop, // handle for the new unary operator + void *function, // pointer to the unary function + const GrB_Type ztype, // type of output z + const GrB_Type xtype // type of input x +) +{ + return (GB_UnaryOp_new (unaryop, function, ztype, xtype, "f")) ; +} + diff --git a/GraphBLAS/Source/GrB_Vector_apply.c b/GraphBLAS/Source/GrB_Vector_apply.c index cab7be9409..3811f0cc5d 100644 --- a/GraphBLAS/Source/GrB_Vector_apply.c +++ b/GraphBLAS/Source/GrB_Vector_apply.c @@ -2,7 +2,7 @@ // GrB_Vector_apply: apply a unary operator to a vector //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GrB_Vector_assign.c b/GraphBLAS/Source/GrB_Vector_assign.c index ef408c1cd3..5b99bde938 100644 --- a/GraphBLAS/Source/GrB_Vector_assign.c +++ b/GraphBLAS/Source/GrB_Vector_assign.c @@ -2,7 +2,7 @@ // GrB_Vector_assign: w(I) = accum (w(I),u) //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GrB_Vector_assign_scalar.c b/GraphBLAS/Source/GrB_Vector_assign_scalar.c index 62f633996f..4bcc085825 100644 --- a/GraphBLAS/Source/GrB_Vector_assign_scalar.c +++ b/GraphBLAS/Source/GrB_Vector_assign_scalar.c @@ -2,7 +2,7 @@ // GrB_Vector_assign_[SCALAR]: assign scalar to vector, via scalar expansion //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GrB_Vector_build.c b/GraphBLAS/Source/GrB_Vector_build.c index 411a32d475..45af521a7b 100644 --- a/GraphBLAS/Source/GrB_Vector_build.c +++ b/GraphBLAS/Source/GrB_Vector_build.c @@ -2,7 +2,7 @@ // GrB_Vector_build: build a sparse GraphBLAS vector //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GrB_Vector_clear.c b/GraphBLAS/Source/GrB_Vector_clear.c index 100506c59b..2fe5543540 100644 --- a/GraphBLAS/Source/GrB_Vector_clear.c +++ b/GraphBLAS/Source/GrB_Vector_clear.c @@ -2,7 +2,7 @@ // GrB_Vector_clear: clears the content of a vector //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GrB_Vector_dup.c b/GraphBLAS/Source/GrB_Vector_dup.c index 11ed35636d..3771b39905 100644 --- a/GraphBLAS/Source/GrB_Vector_dup.c +++ b/GraphBLAS/Source/GrB_Vector_dup.c @@ -2,7 +2,7 @@ // GrB_Vector_dup: make a deep copy of a sparse vector //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GrB_Vector_extract.c b/GraphBLAS/Source/GrB_Vector_extract.c index 290b6f0b0b..82dab8d90d 100644 --- a/GraphBLAS/Source/GrB_Vector_extract.c +++ b/GraphBLAS/Source/GrB_Vector_extract.c @@ -2,7 +2,7 @@ // GrB_Vector_extract: w = accum (w, u(I)) //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GrB_Vector_extractElement.c b/GraphBLAS/Source/GrB_Vector_extractElement.c index 9007c58ce9..c3851d5798 100644 --- a/GraphBLAS/Source/GrB_Vector_extractElement.c +++ b/GraphBLAS/Source/GrB_Vector_extractElement.c @@ -2,7 +2,7 @@ // GrB_Vector_extractElement: extract a single entry from a vector, x = v(i,j) //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GrB_Vector_extractTuples.c b/GraphBLAS/Source/GrB_Vector_extractTuples.c index 8fd017b62d..0c368f9c9f 100644 --- a/GraphBLAS/Source/GrB_Vector_extractTuples.c +++ b/GraphBLAS/Source/GrB_Vector_extractTuples.c @@ -2,7 +2,7 @@ // GrB_Vector_extractTuples: extract all tuples from a vector //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GrB_Vector_free.c b/GraphBLAS/Source/GrB_Vector_free.c index ecf19df91c..71c92ad45b 100644 --- a/GraphBLAS/Source/GrB_Vector_free.c +++ b/GraphBLAS/Source/GrB_Vector_free.c @@ -2,7 +2,7 @@ // GrB_Vector_free: free a sparse vector //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GrB_Vector_new.c b/GraphBLAS/Source/GrB_Vector_new.c index 7d14183619..39bf77ad9d 100644 --- a/GraphBLAS/Source/GrB_Vector_new.c +++ b/GraphBLAS/Source/GrB_Vector_new.c @@ -2,7 +2,7 @@ // GrB_Vector_new: create a new vector //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GrB_Vector_nvals.c b/GraphBLAS/Source/GrB_Vector_nvals.c index b2f060cde0..472e899bbf 100644 --- a/GraphBLAS/Source/GrB_Vector_nvals.c +++ b/GraphBLAS/Source/GrB_Vector_nvals.c @@ -2,7 +2,7 @@ // GrB_Vector_nvals: number of nonzeros in a sparse vector //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GrB_Vector_reduce_scalar.c b/GraphBLAS/Source/GrB_Vector_reduce_scalar.c index 4496aea301..e658be090f 100644 --- a/GraphBLAS/Source/GrB_Vector_reduce_scalar.c +++ b/GraphBLAS/Source/GrB_Vector_reduce_scalar.c @@ -2,7 +2,7 @@ // GrB_Vector_reduce_scalar: reduce a vector to a scalar //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GrB_Vector_setElement.c b/GraphBLAS/Source/GrB_Vector_setElement.c index f7a35dccb5..6611e29e09 100644 --- a/GraphBLAS/Source/GrB_Vector_setElement.c +++ b/GraphBLAS/Source/GrB_Vector_setElement.c @@ -2,7 +2,7 @@ // GrB_Vector_setElement: set an entry in a vector, w (i) = x //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GrB_Vector_size.c b/GraphBLAS/Source/GrB_Vector_size.c index 696b36dfa6..8bccb0ca7d 100644 --- a/GraphBLAS/Source/GrB_Vector_size.c +++ b/GraphBLAS/Source/GrB_Vector_size.c @@ -2,7 +2,7 @@ // GrB_Vector_size: dimension of a sparse vector //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GrB_eWiseAdd_Matrix.c b/GraphBLAS/Source/GrB_eWiseAdd_Matrix.c index 167eb07f65..30e6bcaa0a 100644 --- a/GraphBLAS/Source/GrB_eWiseAdd_Matrix.c +++ b/GraphBLAS/Source/GrB_eWiseAdd_Matrix.c @@ -2,7 +2,7 @@ // GrB_eWiseAdd_Matrix: matrix element-wise operations, set union //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GrB_eWiseAdd_Vector.c b/GraphBLAS/Source/GrB_eWiseAdd_Vector.c index 4aa3eec4d7..3882d1b5fc 100644 --- a/GraphBLAS/Source/GrB_eWiseAdd_Vector.c +++ b/GraphBLAS/Source/GrB_eWiseAdd_Vector.c @@ -2,7 +2,7 @@ // GrB_eWiseAdd_Vector: vector element-wise operations, set union //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GrB_eWiseMult_Matrix.c b/GraphBLAS/Source/GrB_eWiseMult_Matrix.c index c78d62a98f..04907aa940 100644 --- a/GraphBLAS/Source/GrB_eWiseMult_Matrix.c +++ b/GraphBLAS/Source/GrB_eWiseMult_Matrix.c @@ -2,7 +2,7 @@ // GrB_eWiseMult_Matrix: matrix element-wise operations, using set intersection //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GrB_eWiseMult_Vector.c b/GraphBLAS/Source/GrB_eWiseMult_Vector.c index 4c2b58d712..6cff7c5aeb 100644 --- a/GraphBLAS/Source/GrB_eWiseMult_Vector.c +++ b/GraphBLAS/Source/GrB_eWiseMult_Vector.c @@ -2,7 +2,7 @@ // GrB_eWiseMult_Vector: vector element-wise multiplication //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GrB_error.c b/GraphBLAS/Source/GrB_error.c index 7b39d1ac47..bb2d08e165 100644 --- a/GraphBLAS/Source/GrB_error.c +++ b/GraphBLAS/Source/GrB_error.c @@ -2,7 +2,7 @@ // GrB_error: return an error string describing the last error //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GrB_finalize.c b/GraphBLAS/Source/GrB_finalize.c index 851f499e81..f6a54fb7bb 100644 --- a/GraphBLAS/Source/GrB_finalize.c +++ b/GraphBLAS/Source/GrB_finalize.c @@ -2,7 +2,7 @@ // GrB_finalize: finalize GraphBLAS //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GrB_init.c b/GraphBLAS/Source/GrB_init.c index 3d960698d4..60b9eccb6f 100644 --- a/GraphBLAS/Source/GrB_init.c +++ b/GraphBLAS/Source/GrB_init.c @@ -2,7 +2,7 @@ // GrB_init: initialize GraphBLAS //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GrB_mxm.c b/GraphBLAS/Source/GrB_mxm.c index 74177ad261..c1ed246c0b 100644 --- a/GraphBLAS/Source/GrB_mxm.c +++ b/GraphBLAS/Source/GrB_mxm.c @@ -2,7 +2,7 @@ // GrB_mxm: matrix-matrix multiply //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GrB_mxv.c b/GraphBLAS/Source/GrB_mxv.c index 1babc81500..e7a632abd1 100644 --- a/GraphBLAS/Source/GrB_mxv.c +++ b/GraphBLAS/Source/GrB_mxv.c @@ -2,7 +2,7 @@ // GrB_mxv: matrix-vector multiply //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GrB_reduce_to_column.c b/GraphBLAS/Source/GrB_reduce_to_column.c index 56702457c8..74f9478109 100644 --- a/GraphBLAS/Source/GrB_reduce_to_column.c +++ b/GraphBLAS/Source/GrB_reduce_to_column.c @@ -2,7 +2,7 @@ // GrB_reduce_to_column: reduce a matrix to a column //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GrB_transpose.c b/GraphBLAS/Source/GrB_transpose.c index 564b426222..2bffde94e2 100644 --- a/GraphBLAS/Source/GrB_transpose.c +++ b/GraphBLAS/Source/GrB_transpose.c @@ -2,7 +2,7 @@ // GrB_transpose: transpose a sparse matrix //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GrB_vxm.c b/GraphBLAS/Source/GrB_vxm.c index c160f38b79..6e509f9321 100644 --- a/GraphBLAS/Source/GrB_vxm.c +++ b/GraphBLAS/Source/GrB_vxm.c @@ -2,7 +2,7 @@ // GrB_vxm: vector-matrix multiply //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GrB_wait.c b/GraphBLAS/Source/GrB_wait.c index 1948850788..cf9a7cfbe9 100644 --- a/GraphBLAS/Source/GrB_wait.c +++ b/GraphBLAS/Source/GrB_wait.c @@ -2,7 +2,7 @@ // GrB_wait: finish all pending computations //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GxB_BinaryOp_xtype.c b/GraphBLAS/Source/GxB_BinaryOp_xtype.c index acd9d77fd5..48c90f20be 100644 --- a/GraphBLAS/Source/GxB_BinaryOp_xtype.c +++ b/GraphBLAS/Source/GxB_BinaryOp_xtype.c @@ -2,7 +2,7 @@ // GxB_BinaryOp_xtype: return the type of x for z=f(x,y) //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GxB_BinaryOp_ytype.c b/GraphBLAS/Source/GxB_BinaryOp_ytype.c index 641782cc91..243e77e7c1 100644 --- a/GraphBLAS/Source/GxB_BinaryOp_ytype.c +++ b/GraphBLAS/Source/GxB_BinaryOp_ytype.c @@ -2,7 +2,7 @@ // GxB_BinaryOp_ytype: return the type of y for z=f(x,y) //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GxB_BinaryOp_ztype.c b/GraphBLAS/Source/GxB_BinaryOp_ztype.c index 12cd8b5a10..fba7e1be12 100644 --- a/GraphBLAS/Source/GxB_BinaryOp_ztype.c +++ b/GraphBLAS/Source/GxB_BinaryOp_ztype.c @@ -2,7 +2,7 @@ // GxB_BinaryOp_ztype: return the type of z for z=f(x,y) //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GxB_Col_subassign.c b/GraphBLAS/Source/GxB_Col_subassign.c index 19d1cd4bce..266ed87378 100644 --- a/GraphBLAS/Source/GxB_Col_subassign.c +++ b/GraphBLAS/Source/GxB_Col_subassign.c @@ -2,7 +2,7 @@ // GxB_Col_subassign: C(I,j) = accum (C(I,j),u) //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GxB_Descriptor_get.c b/GraphBLAS/Source/GxB_Descriptor_get.c index 0db8707509..c1f305ea15 100644 --- a/GraphBLAS/Source/GxB_Descriptor_get.c +++ b/GraphBLAS/Source/GxB_Descriptor_get.c @@ -2,7 +2,7 @@ // GxB_Descriptor_get: get a field in a descriptor //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GxB_Descriptor_new.c b/GraphBLAS/Source/GxB_Descriptor_new.c index b026c8ecff..24a1b3e96c 100644 --- a/GraphBLAS/Source/GxB_Descriptor_new.c +++ b/GraphBLAS/Source/GxB_Descriptor_new.c @@ -2,7 +2,7 @@ // GrB_Descriptor_new: create a new descriptor //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ @@ -30,7 +30,7 @@ GrB_Info GrB_Descriptor_new // create a new descriptor //-------------------------------------------------------------------------- // allocate the descriptor - GB_CALLOC_MEMORY (*descriptor, 1, sizeof (GB_Descriptor_opaque)) ; + GB_CALLOC_MEMORY (*descriptor, 1, sizeof (struct GB_Descriptor_opaque)) ; if (*descriptor == NULL) { return (ERROR (GrB_OUT_OF_MEMORY, (LOG, "out of memory"))) ; diff --git a/GraphBLAS/Source/GxB_Matrix_resize.c b/GraphBLAS/Source/GxB_Matrix_resize.c new file mode 100644 index 0000000000..ca6db30d8d --- /dev/null +++ b/GraphBLAS/Source/GxB_Matrix_resize.c @@ -0,0 +1,33 @@ +//------------------------------------------------------------------------------ +// GxB_Matrix_resize: change the size of a matrix +//------------------------------------------------------------------------------ + +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. +// http://suitesparse.com See GraphBLAS/Doc/License.txt for license. + +//------------------------------------------------------------------------------ + +#include "GB.h" + +GrB_Info GxB_Matrix_resize // change the size of a matrix +( + GrB_Matrix A, // matrix to modify + const GrB_Index nrows_new, // new number of rows in matrix + const GrB_Index ncols_new // new number of columns in matrix +) +{ + + //-------------------------------------------------------------------------- + // check inputs + //-------------------------------------------------------------------------- + + WHERE ("GxB_Matrix_resize (A, nrows_new, ncols_new)") ; + RETURN_IF_NULL_OR_UNINITIALIZED (A) ; + + //-------------------------------------------------------------------------- + // resize the matrix + //-------------------------------------------------------------------------- + + return (GB_resize (A, nrows_new, ncols_new)) ; +} + diff --git a/GraphBLAS/Source/GxB_Matrix_select.c b/GraphBLAS/Source/GxB_Matrix_select.c index 21ec97c370..0d2979841c 100644 --- a/GraphBLAS/Source/GxB_Matrix_select.c +++ b/GraphBLAS/Source/GxB_Matrix_select.c @@ -1,8 +1,8 @@ //------------------------------------------------------------------------------ -// GrB_Matrix_select: select entries from a matrix +// GxB_Matrix_select: select entries from a matrix //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GxB_Matrix_subassign.c b/GraphBLAS/Source/GxB_Matrix_subassign.c index 559d1989ac..2f5b4af6f0 100644 --- a/GraphBLAS/Source/GxB_Matrix_subassign.c +++ b/GraphBLAS/Source/GxB_Matrix_subassign.c @@ -2,7 +2,7 @@ // GxB_Matrix_subassign: submatrix assignment: C(I,J) = accum (C(I,J),A) //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GxB_Matrix_subassign_scalar.c b/GraphBLAS/Source/GxB_Matrix_subassign_scalar.c index 5ecd5b40b4..dc82b48069 100644 --- a/GraphBLAS/Source/GxB_Matrix_subassign_scalar.c +++ b/GraphBLAS/Source/GxB_Matrix_subassign_scalar.c @@ -2,7 +2,7 @@ // GxB_Matrix_subassign_[SCALAR]: assign a scalar to matrix, via scalar expansion //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GxB_Matrix_type.c b/GraphBLAS/Source/GxB_Matrix_type.c index 626b6208e7..138b50029d 100644 --- a/GraphBLAS/Source/GxB_Matrix_type.c +++ b/GraphBLAS/Source/GxB_Matrix_type.c @@ -2,7 +2,7 @@ // GxB_Matrix_type: return the type of a matrix //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GxB_Monoid_identity.c b/GraphBLAS/Source/GxB_Monoid_identity.c index e85cc2caad..543eb18860 100644 --- a/GraphBLAS/Source/GxB_Monoid_identity.c +++ b/GraphBLAS/Source/GxB_Monoid_identity.c @@ -2,7 +2,7 @@ // GxB_Monoid_identity: return the identity of a monoid //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GxB_Monoid_operator.c b/GraphBLAS/Source/GxB_Monoid_operator.c index 4da9cdc5a5..e066aa9434 100644 --- a/GraphBLAS/Source/GxB_Monoid_operator.c +++ b/GraphBLAS/Source/GxB_Monoid_operator.c @@ -2,7 +2,7 @@ // GxB_Monoid_operator: return the op of a monoid //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GxB_Row_subassign.c b/GraphBLAS/Source/GxB_Row_subassign.c index a1dc96ed7f..3ca49ea1e4 100644 --- a/GraphBLAS/Source/GxB_Row_subassign.c +++ b/GraphBLAS/Source/GxB_Row_subassign.c @@ -2,7 +2,7 @@ // GxB_Row_subassign: C(i,J) = accum (C(i,J),u') //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GxB_SelectOp_free.c b/GraphBLAS/Source/GxB_SelectOp_free.c index cb1dcdcd77..fd63f52bcc 100644 --- a/GraphBLAS/Source/GxB_SelectOp_free.c +++ b/GraphBLAS/Source/GxB_SelectOp_free.c @@ -2,7 +2,7 @@ // GxB_SelectOp_free: free a select operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ @@ -24,7 +24,8 @@ GrB_Info GxB_SelectOp_free // free a user-created select operator if (op->magic == MAGIC) { op->magic = FREED ; // to help detect dangling pointers - GB_FREE_MEMORY (*selectop, 1, sizeof (GB_SelectOp_opaque)) ; + GB_FREE_MEMORY (*selectop, 1, + sizeof (struct GB_SelectOp_opaque)) ; } (*selectop) = NULL ; } diff --git a/GraphBLAS/Source/GxB_SelectOp_new.c b/GraphBLAS/Source/GxB_SelectOp_new.c new file mode 100644 index 0000000000..1c1457c7ac --- /dev/null +++ b/GraphBLAS/Source/GxB_SelectOp_new.c @@ -0,0 +1,28 @@ +//------------------------------------------------------------------------------ +// GxB_SelectOp_new: create a new user-defined select operator +//------------------------------------------------------------------------------ + +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. +// http://suitesparse.com See GraphBLAS/Doc/License.txt for license. + +//------------------------------------------------------------------------------ + +// GxB_SelectOp_new is implemented both as a macro and a function. Both are +// user-callable. The macro is used by default since it can capture the name +// of the select function. + +#include "GB.h" + +// the macro version of this function must first be #undefined +#undef GxB_SelectOp_new + +GrB_Info GxB_SelectOp_new // create a new user-defined select operator +( + GxB_SelectOp *selectop, // handle for the new select operator + void *function, // pointer to the select function + const GrB_Type xtype // type of input x, or NULL if type-generic +) +{ + return (GB_SelectOp_new (selectop, function, xtype, "f")) ; +} + diff --git a/GraphBLAS/Source/GxB_SelectOp_xtype.c b/GraphBLAS/Source/GxB_SelectOp_xtype.c index d8c3cd32c4..81379e4bae 100644 --- a/GraphBLAS/Source/GxB_SelectOp_xtype.c +++ b/GraphBLAS/Source/GxB_SelectOp_xtype.c @@ -2,7 +2,7 @@ // GxB_SelectOp_xtype: return the type of x for z=f(x) //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GxB_Semiring_add.c b/GraphBLAS/Source/GxB_Semiring_add.c index 47a04762c3..6c05720fe8 100644 --- a/GraphBLAS/Source/GxB_Semiring_add.c +++ b/GraphBLAS/Source/GxB_Semiring_add.c @@ -2,7 +2,7 @@ // GxB_Semiring_add: return the additive monoid of a semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GxB_Semiring_multiply.c b/GraphBLAS/Source/GxB_Semiring_multiply.c index e541657107..11cd98cd08 100644 --- a/GraphBLAS/Source/GxB_Semiring_multiply.c +++ b/GraphBLAS/Source/GxB_Semiring_multiply.c @@ -2,7 +2,7 @@ // GxB_Semiring_multiply: return the multiply operator of a semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GxB_Type_size.c b/GraphBLAS/Source/GxB_Type_size.c index 818470944b..837ef9bbd3 100644 --- a/GraphBLAS/Source/GxB_Type_size.c +++ b/GraphBLAS/Source/GxB_Type_size.c @@ -2,7 +2,7 @@ // GxB_Type_size: return the size of a type //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GxB_UnaryOp_xtype.c b/GraphBLAS/Source/GxB_UnaryOp_xtype.c index ef26a6a477..b8ad40e8ea 100644 --- a/GraphBLAS/Source/GxB_UnaryOp_xtype.c +++ b/GraphBLAS/Source/GxB_UnaryOp_xtype.c @@ -2,7 +2,7 @@ // GxB_UnaryOp_xtype: return the type of x for z=f(x) //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GxB_UnaryOp_ztype.c b/GraphBLAS/Source/GxB_UnaryOp_ztype.c index d8b38e644b..8d656af211 100644 --- a/GraphBLAS/Source/GxB_UnaryOp_ztype.c +++ b/GraphBLAS/Source/GxB_UnaryOp_ztype.c @@ -2,7 +2,7 @@ // GxB_UnaryOp_ztype: return the type of z for z=f(x) //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GxB_Vector_resize.c b/GraphBLAS/Source/GxB_Vector_resize.c new file mode 100644 index 0000000000..8cb24fa34d --- /dev/null +++ b/GraphBLAS/Source/GxB_Vector_resize.c @@ -0,0 +1,32 @@ +//------------------------------------------------------------------------------ +// GxB_Vector_resize: change the size of a vector +//------------------------------------------------------------------------------ + +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. +// http://suitesparse.com See GraphBLAS/Doc/License.txt for license. + +//------------------------------------------------------------------------------ + +#include "GB.h" + +GrB_Info GxB_Vector_resize // change the size of a vector +( + GrB_Vector u, // vector to modify + const GrB_Index nrows_new // new number of rows in vector +) +{ + + //-------------------------------------------------------------------------- + // check inputs + //-------------------------------------------------------------------------- + + WHERE ("GxB_Vector_resize (u, nrows_new)") ; + RETURN_IF_NULL_OR_UNINITIALIZED (u) ; + + //-------------------------------------------------------------------------- + // resize the vector + //-------------------------------------------------------------------------- + + return (GB_resize ((GrB_Matrix) u, nrows_new, 1)) ; +} + diff --git a/GraphBLAS/Source/GxB_Vector_select.c b/GraphBLAS/Source/GxB_Vector_select.c index f7cf7ee25b..9d0ce051f6 100644 --- a/GraphBLAS/Source/GxB_Vector_select.c +++ b/GraphBLAS/Source/GxB_Vector_select.c @@ -1,8 +1,8 @@ //------------------------------------------------------------------------------ -// GrB_Vector_select: select entries from a vector +// GxB_Vector_select: select entries from a vector //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GxB_Vector_subassign.c b/GraphBLAS/Source/GxB_Vector_subassign.c index 49bae9f546..79e60e0eb2 100644 --- a/GraphBLAS/Source/GxB_Vector_subassign.c +++ b/GraphBLAS/Source/GxB_Vector_subassign.c @@ -2,7 +2,7 @@ // GxB_Vector_subassign: w(I) = accum (w(I),u) //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GxB_Vector_subassign_scalar.c b/GraphBLAS/Source/GxB_Vector_subassign_scalar.c index 1cbffd5727..ea8b8e924d 100644 --- a/GraphBLAS/Source/GxB_Vector_subassign_scalar.c +++ b/GraphBLAS/Source/GxB_Vector_subassign_scalar.c @@ -2,7 +2,7 @@ // GxB_Vector_subassign_[SCALAR]: assign scalar to vector, via scalar expansion //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GxB_Vector_type.c b/GraphBLAS/Source/GxB_Vector_type.c index 5ad71d4353..26fba01826 100644 --- a/GraphBLAS/Source/GxB_Vector_type.c +++ b/GraphBLAS/Source/GxB_Vector_type.c @@ -2,7 +2,7 @@ // GxB_Vector_type: return the type of a vector //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/GxB_kron.c b/GraphBLAS/Source/GxB_kron.c new file mode 100644 index 0000000000..800ad64c4b --- /dev/null +++ b/GraphBLAS/Source/GxB_kron.c @@ -0,0 +1,44 @@ +//------------------------------------------------------------------------------ +// GxB_kron: Kronecker product +//------------------------------------------------------------------------------ + +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. +// http://suitesparse.com See GraphBLAS/Doc/License.txt for license. + +//------------------------------------------------------------------------------ + +#include "GB.h" + +GrB_Info GxB_kron // C = accum (C, kron(A,B)) +( + GrB_Matrix C, // input/output matrix for results + const GrB_Matrix Mask, // optional mask for C, unused if NULL + const GrB_BinaryOp accum, // optional accum for Z=accum(C,T) + const GrB_BinaryOp op, // defines '*' for T=kron(A,B) + const GrB_Matrix A, // first input: matrix A + const GrB_Matrix B, // second input: matrix B + const GrB_Descriptor desc // descriptor for C, Mask, A, and B +) +{ + + //-------------------------------------------------------------------------- + // check inputs + //-------------------------------------------------------------------------- + + WHERE ("GxB_kron (C, Mask, accum, op, A, B, desc)") ; + + // get the descriptor + GET_DESCRIPTOR (info, desc, C_replace, Mask_comp, A_tran, B_tran) ; + + // printf ("go go go\n") ; + + // C = accum (C,T) where T = kron(A,B), or with A' and/or B' + return (GB_kron ( + C, C_replace, // C matrix and its descriptor + Mask, Mask_comp, // Mask matrix and its descriptor + accum, // for accum (C,T) + op, // operator that defines T=kron(A,B) + A, A_tran, // A matrix and its descriptor + B, B_tran)) ; // B matrix and its descriptor +} + diff --git a/GraphBLAS/Source/GxB_stats.c b/GraphBLAS/Source/GxB_stats.c index 0e9c499ffc..a4902b1166 100644 --- a/GraphBLAS/Source/GxB_stats.c +++ b/GraphBLAS/Source/GxB_stats.c @@ -2,7 +2,7 @@ // GxB_stats: return memory usage and other statistics //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/README.txt b/GraphBLAS/Source/README.txt index 2f08367860..7be47c668f 100644 --- a/GraphBLAS/Source/README.txt +++ b/GraphBLAS/Source/README.txt @@ -1,4 +1,4 @@ -SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved +SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved http://suitesparse.com See GraphBLAS/Doc/License.txt for license. This folder, GraphBLAS/Source, contains all the primary source files diff --git a/GraphBLAS/Source/Template/GB_2type_template.c b/GraphBLAS/Source/Template/GB_2type_template.c index 653ffc65f6..011ad38230 100644 --- a/GraphBLAS/Source/Template/GB_2type_template.c +++ b/GraphBLAS/Source/Template/GB_2type_template.c @@ -2,7 +2,7 @@ // GB_2type_template.c: 2-type switch factory //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/Template/GB_AxB.c b/GraphBLAS/Source/Template/GB_AxB.c index 7fca430646..5a98a459e1 100644 --- a/GraphBLAS/Source/Template/GB_AxB.c +++ b/GraphBLAS/Source/Template/GB_AxB.c @@ -2,7 +2,7 @@ // GB_AxB: hard-coded C=A*B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // If this filename has a double underscore in its name ("__") then it has @@ -200,6 +200,7 @@ void GB_AxB GB_queue_insert (C) ; #else Cp [n] = cnz ; + C->magic = MAGIC ; #endif } diff --git a/GraphBLAS/Source/Template/GB_AxB_compare_template.c b/GraphBLAS/Source/Template/GB_AxB_compare_template.c index c66859a8d6..4ad8088baa 100644 --- a/GraphBLAS/Source/Template/GB_AxB_compare_template.c +++ b/GraphBLAS/Source/Template/GB_AxB_compare_template.c @@ -2,7 +2,7 @@ // GB_AxB_compare_template.c //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/Template/GB_AxB_factory.c b/GraphBLAS/Source/Template/GB_AxB_factory.c index bd13d003ab..7b8936c857 100644 --- a/GraphBLAS/Source/Template/GB_AxB_factory.c +++ b/GraphBLAS/Source/Template/GB_AxB_factory.c @@ -2,6 +2,11 @@ // GB_AxB_factory //------------------------------------------------------------------------------ +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. +// http://suitesparse.com See GraphBLAS/Doc/License.txt for license. + +//------------------------------------------------------------------------------ + // This is used by GB_AxB_builtin.c and GB_Matrix_AdotB.c to create built-in // versions of sparse matrix-matrix multiplication. The #include'ing file // #define's the AxB macro, and mult_opcode, add_opcode, xycode, and zcode diff --git a/GraphBLAS/Source/Template/GB_AxB_template.c b/GraphBLAS/Source/Template/GB_AxB_template.c index b93a21105f..175765ec73 100644 --- a/GraphBLAS/Source/Template/GB_AxB_template.c +++ b/GraphBLAS/Source/Template/GB_AxB_template.c @@ -2,7 +2,7 @@ // GB_AxB_template.c //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/Template/GB_assoc_template.c b/GraphBLAS/Source/Template/GB_assoc_template.c index da78d52702..18f523c8f9 100644 --- a/GraphBLAS/Source/Template/GB_assoc_template.c +++ b/GraphBLAS/Source/Template/GB_assoc_template.c @@ -2,7 +2,7 @@ // GB_assoc_template.c: //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/Template/GB_ops_template.c b/GraphBLAS/Source/Template/GB_ops_template.c index 5be3ed159a..52e1de54d8 100644 --- a/GraphBLAS/Source/Template/GB_ops_template.c +++ b/GraphBLAS/Source/Template/GB_ops_template.c @@ -2,7 +2,7 @@ // GB_ops_template.c: built-in unary and binary functions and operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/Template/GB_ops_template.h b/GraphBLAS/Source/Template/GB_ops_template.h index ef56f633b4..9b46ecc649 100644 --- a/GraphBLAS/Source/Template/GB_ops_template.h +++ b/GraphBLAS/Source/Template/GB_ops_template.h @@ -2,7 +2,7 @@ // GB_ops_template.h: define the unary and binary functions and operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/Template/GB_qsort_template.c b/GraphBLAS/Source/Template/GB_qsort_template.c index 9f596c8b18..007c77eaba 100644 --- a/GraphBLAS/Source/Template/GB_qsort_template.c +++ b/GraphBLAS/Source/Template/GB_qsort_template.c @@ -2,7 +2,7 @@ // GB_qsort_template: sort an n-by-K list of integers //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/Template/GB_semiring_template.c b/GraphBLAS/Source/Template/GB_semiring_template.c index 21da0f21c4..cb19f60978 100644 --- a/GraphBLAS/Source/Template/GB_semiring_template.c +++ b/GraphBLAS/Source/Template/GB_semiring_template.c @@ -2,7 +2,7 @@ // GB_semiring_template.c: built-in unary and binary functions and operators //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/Template/GB_subref_template.c b/GraphBLAS/Source/Template/GB_subref_template.c index edb25e6e98..402e859b54 100644 --- a/GraphBLAS/Source/Template/GB_subref_template.c +++ b/GraphBLAS/Source/Template/GB_subref_template.c @@ -2,7 +2,7 @@ // GB_subref_template: C = A(I,J), C = (A(J,I))', or C = pattern (A(I,J)) //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Source/axb.m b/GraphBLAS/Source/axb.m index d2ae829952..5a01fda87b 100644 --- a/GraphBLAS/Source/axb.m +++ b/GraphBLAS/Source/axb.m @@ -9,7 +9,7 @@ fprintf (f, '// GB_AxB__semirings.h: definitions for GB_AxB__*.c\n') ; fprintf (f, '//------------------------------------------------------------------------------\n') ; fprintf (f, '\n') ; -fprintf (f, '// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved.\n') ; +fprintf (f, '// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved.\n') ; fprintf (f, '// http://suitesparse.com See GraphBLAS/Doc/License.txt for license.\n') ; fprintf (f, '\n') ; fprintf (f, '// This file has been automatically generated from Template/GB_AxB.h') ; diff --git a/GraphBLAS/Tcov/Makefile b/GraphBLAS/Tcov/Makefile index 970a027cc1..fa23e58b6d 100644 --- a/GraphBLAS/Tcov/Makefile +++ b/GraphBLAS/Tcov/Makefile @@ -2,7 +2,7 @@ # GraphBLAS/Tcov/Makefile #------------------------------------------------------------------------------- -# SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +# SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. # http://suitesparse.com See GraphBLAS/Doc/License.txt for license. #------------------------------------------------------------------------------- diff --git a/GraphBLAS/Tcov/README.txt b/GraphBLAS/Tcov/README.txt index 382280ae3b..7c53a0c480 100644 --- a/GraphBLAS/Tcov/README.txt +++ b/GraphBLAS/Tcov/README.txt @@ -1,4 +1,4 @@ -SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. http://suitesparse.com See GraphBLAS/Doc/License.txt for license. GraphBLAS/Tcov: statement coverage tests diff --git a/GraphBLAS/Tcov/gbcover.h b/GraphBLAS/Tcov/gbcover.h index 5c8452b4f4..5a2b6500ff 100644 --- a/GraphBLAS/Tcov/gbcover.h +++ b/GraphBLAS/Tcov/gbcover.h @@ -2,7 +2,7 @@ // gbcover.h: include file for statement coverage testing //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Tcov/gbcover.m b/GraphBLAS/Tcov/gbcover.m index 0cf2888171..62ccbda1ea 100644 --- a/GraphBLAS/Tcov/gbcover.m +++ b/GraphBLAS/Tcov/gbcover.m @@ -6,7 +6,7 @@ % % See also: gbcover_edit -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. % create the cover_*template.c files diff --git a/GraphBLAS/Tcov/gbcover_edit.m b/GraphBLAS/Tcov/gbcover_edit.m index a474c2583a..9e2161d091 100644 --- a/GraphBLAS/Tcov/gbcover_edit.m +++ b/GraphBLAS/Tcov/gbcover_edit.m @@ -95,7 +95,7 @@ function gbcover_edit (outfile, infiles) % % See also: gbcover -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. f_output = fopen (outfile, 'w') ; diff --git a/GraphBLAS/Tcov/gbcover_finish.c b/GraphBLAS/Tcov/gbcover_finish.c index 6d2e9dd46d..d499fb98df 100644 --- a/GraphBLAS/Tcov/gbcover_finish.c +++ b/GraphBLAS/Tcov/gbcover_finish.c @@ -2,7 +2,7 @@ // gbcover_finish.c //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Tcov/gbcover_start.c b/GraphBLAS/Tcov/gbcover_start.c index f06bb7438c..bffbde0808 100644 --- a/GraphBLAS/Tcov/gbcover_start.c +++ b/GraphBLAS/Tcov/gbcover_start.c @@ -2,7 +2,7 @@ // gbcover_start.c //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Tcov/gbcover_util.c b/GraphBLAS/Tcov/gbcover_util.c index 84bd358d0a..950a04d5f1 100644 --- a/GraphBLAS/Tcov/gbcover_util.c +++ b/GraphBLAS/Tcov/gbcover_util.c @@ -2,7 +2,7 @@ // gbcover_util.c: utilities for test coverage //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Tcov/gbshow.m b/GraphBLAS/Tcov/gbshow.m index 0329666cd4..f7410329ec 100644 --- a/GraphBLAS/Tcov/gbshow.m +++ b/GraphBLAS/Tcov/gbshow.m @@ -1,6 +1,9 @@ function gbshow %GBSHOW create a test coverage report in cover_gb_report.c +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. +% http://suitesparse.com See GraphBLAS/Doc/License.txt for license. + f_input = fopen ('cover_gb_exp.c', 'r') ; f_output = fopen ('cover_gb_report.c', 'w') ; diff --git a/GraphBLAS/Tcov/log_Dec28.txt b/GraphBLAS/Tcov/log_Dec28.txt deleted file mode 100644 index c3ee638bbe..0000000000 --- a/GraphBLAS/Tcov/log_Dec28.txt +++ /dev/null @@ -1,41 +0,0 @@ - ----------------------------------------------- [malloc] [cover] -28-Dec-2017 13:21:38 test98 0.3 sec coverage: 179 of 62233 ( 0.3%) -28-Dec-2017 13:21:38 test97 0.1 sec coverage: 325 of 62233 ( 0.5%) -28-Dec-2017 13:21:38 test01 0.0 sec coverage: 1225 of 62233 ( 2.0%) -28-Dec-2017 13:21:39 test02 0.2 sec coverage: 1559 of 62233 ( 2.5%) -28-Dec-2017 13:21:39 test03 0.1 sec coverage: 1584 of 62233 ( 2.5%) -28-Dec-2017 13:21:39 test04 0.1 sec coverage: 1609 of 62233 ( 2.6%) -28-Dec-2017 13:21:39 test05 0.0 sec coverage: 1610 of 62233 ( 2.6%) -28-Dec-2017 13:21:39 test07 0.0 sec coverage: 1626 of 62233 ( 2.6%) -28-Dec-2017 13:21:39 test07b 0.0 sec coverage: 1630 of 62233 ( 2.6%) -28-Dec-2017 13:21:39 test08 0.6 sec coverage: 1633 of 62233 ( 2.6%) -28-Dec-2017 13:21:39 test09 0.0 sec coverage: 1633 of 62233 ( 2.6%) -28-Dec-2017 13:21:39 test13 0.0 sec coverage: 1638 of 62233 ( 2.6%) -28-Dec-2017 13:21:39 test15 0.1 sec coverage: 1673 of 62233 ( 2.7%) -28-Dec-2017 13:21:40 test17 0.6 sec coverage: 1676 of 62233 ( 2.7%) -28-Dec-2017 13:21:40 test72 0.6 sec coverage: 1724 of 62233 ( 2.8%) -28-Dec-2017 13:21:41 test26 0.4 sec coverage: 1746 of 62233 ( 2.8%) -28-Dec-2017 13:21:41 test29 0.6 sec coverage: 2077 of 62233 ( 3.3%) -28-Dec-2017 13:21:42 test69 1.1 sec coverage: 2101 of 62233 ( 3.4%) -28-Dec-2017 13:21:43 test28 0.2 sec coverage: 2108 of 62233 ( 3.4%) -28-Dec-2017 13:21:45 test11 2.5 sec coverage: 2110 of 62233 ( 3.4%) -28-Dec-2017 13:21:48 test14 2.7 sec coverage: 2618 of 62233 ( 4.2%) -28-Dec-2017 13:21:51 test20 3.2 sec coverage: 2753 of 62233 ( 4.4%) -28-Dec-2017 13:21:54 test00 3.9 sec coverage: 2775 of 62233 ( 4.5%) -28-Dec-2017 13:22:03 test19 9.5 sec coverage: 2818 of 62233 ( 4.5%) -28-Dec-2017 13:22:13 test12 9.6 sec coverage: 2850 of 62233 ( 4.6%) -28-Dec-2017 13:22:28 test10 16.3 sec coverage: 8131 of 62233 ( 13.1%) -28-Dec-2017 13:22:46 test27 18.0 sec coverage: 8141 of 62233 ( 13.1%) -28-Dec-2017 13:23:03 test25 17.3 sec coverage: 8191 of 62233 ( 13.2%) -28-Dec-2017 13:23:19 test74 18.6 sec coverage: 22733 of 62233 ( 36.5%) -28-Dec-2017 13:23:37 test99 18.0 sec coverage: 22771 of 62233 ( 36.6%) -28-Dec-2017 13:23:55 test23 18.1 sec coverage: 23100 of 62233 ( 37.1%) -28-Dec-2017 13:24:18 test18 25.4 sec coverage: 23122 of 62233 ( 37.2%) -28-Dec-2017 13:24:57 test16 39.7 sec coverage: 23252 of 62233 ( 37.4%) -28-Dec-2017 13:25:45 test24 49.4 sec coverage: 23257 of 62233 ( 37.4%) -28-Dec-2017 13:26:43 test21 60.7 sec coverage: 23261 of 62233 ( 37.4%) -28-Dec-2017 13:28:53 test06 128.4 sec coverage: 40668 of 62233 ( 65.3%) -28-Dec-2017 13:34:39 test75 343.1 sec coverage: 61786 of 62233 ( 99.3%) -28-Dec-2017 13:38:50 test19b 248.8 sec coverage: 61857 of 62233 ( 99.4%) -28-Dec-2017 13:44:36 test22 344.9 sec coverage: 62233 of 62233 (100.0%) diff --git a/GraphBLAS/Tcov/log_Mar3_2018.txt b/GraphBLAS/Tcov/log_Mar3_2018.txt new file mode 100644 index 0000000000..c7493efb9f --- /dev/null +++ b/GraphBLAS/Tcov/log_Mar3_2018.txt @@ -0,0 +1,86 @@ + +---------------------------------------------- [malloc] [cover] +03-Mar-2018 21:16:33 test98 0.4 sec coverage: 182 of 62270 ( 0.3%) +03-Mar-2018 21:16:33 test97 0.1 sec coverage: 328 of 62270 ( 0.5%) +03-Mar-2018 21:16:33 test01 0.0 sec coverage: 1236 of 62270 ( 2.0%) +03-Mar-2018 21:16:34 test02 0.3 sec coverage: 1570 of 62270 ( 2.5%) +03-Mar-2018 21:16:34 test03 0.1 sec coverage: 1595 of 62270 ( 2.6%) +03-Mar-2018 21:16:34 test04 0.1 sec coverage: 1621 of 62270 ( 2.6%) +03-Mar-2018 21:16:34 test05 0.0 sec coverage: 1622 of 62270 ( 2.6%) +03-Mar-2018 21:16:34 test07 0.0 sec coverage: 1638 of 62270 ( 2.6%) +03-Mar-2018 21:16:34 test07b 0.0 sec coverage: 1642 of 62270 ( 2.6%) +03-Mar-2018 21:16:35 test08 0.8 sec coverage: 1645 of 62270 ( 2.6%) +03-Mar-2018 21:16:35 test09 0.0 sec coverage: 1645 of 62270 ( 2.6%) +03-Mar-2018 21:16:35 test13 0.1 sec coverage: 1650 of 62270 ( 2.6%) +03-Mar-2018 21:16:35 test15 0.1 sec coverage: 1685 of 62270 ( 2.7%) +03-Mar-2018 21:16:36 test17 0.7 sec coverage: 1688 of 62270 ( 2.7%) +03-Mar-2018 21:16:36 test72 0.7 sec coverage: 1736 of 62270 ( 2.8%) +03-Mar-2018 21:16:37 test26 0.5 sec coverage: 1758 of 62270 ( 2.8%) +03-Mar-2018 21:16:38 test29 0.7 sec coverage: 2089 of 62270 ( 3.4%) +03-Mar-2018 21:16:40 test69 1.5 sec coverage: 2113 of 62270 ( 3.4%) +03-Mar-2018 21:16:41 test28 0.2 sec coverage: 2120 of 62270 ( 3.4%) +03-Mar-2018 21:16:45 test11 3.3 sec coverage: 2122 of 62270 ( 3.4%) +03-Mar-2018 21:16:49 test14 3.9 sec coverage: 2630 of 62270 ( 4.2%) +03-Mar-2018 21:16:54 test20 4.6 sec coverage: 2766 of 62270 ( 4.4%) +03-Mar-2018 21:17:01 test00 6.2 sec coverage: 2789 of 62270 ( 4.5%) +03-Mar-2018 21:17:17 test19 14.0 sec coverage: 2832 of 62270 ( 4.5%) +03-Mar-2018 21:17:18 test12 0.4 sec coverage: 2864 of 62270 ( 4.6%) +03-Mar-2018 21:17:51 test10 28.7 sec coverage: 8146 of 62270 ( 13.1%) +03-Mar-2018 21:17:56 test76 4.8 sec coverage: 8156 of 62270 ( 13.1%) +03-Mar-2018 21:18:22 test27 22.6 sec coverage: 8166 of 62270 ( 13.1%) +03-Mar-2018 21:18:55 test25 25.7 sec coverage: 8216 of 62270 ( 13.2%) +03-Mar-2018 21:19:23 test74 26.0 sec coverage: 22758 of 62270 ( 36.5%) +03-Mar-2018 21:19:54 test99 25.5 sec coverage: 22796 of 62270 ( 36.6%) +03-Mar-2018 21:20:22 test23 24.6 sec coverage: 23125 of 62270 ( 37.1%) +03-Mar-2018 21:21:08 test18 35.6 sec coverage: 23147 of 62270 ( 37.2%) +03-Mar-2018 21:24:40 test77 153.4 sec coverage: 23171 of 62270 ( 37.2%) +03-Mar-2018 21:25:54 test16 55.8 sec coverage: 23289 of 62270 ( 37.4%) +03-Mar-2018 21:27:28 test24 68.0 sec coverage: 23294 of 62270 ( 37.4%) +03-Mar-2018 21:29:02 test21 80.2 sec coverage: 23298 of 62270 ( 37.4%) +03-Mar-2018 21:31:21 test06 134.9 sec coverage: 40693 of 62270 ( 65.3%) +03-Mar-2018 21:40:09 test75 465.3 sec coverage: 61823 of 62270 ( 99.3%) +03-Mar-2018 21:46:58 test19b 329.5 sec coverage: 61894 of 62270 ( 99.4%) +03-Mar-2018 21:53:54 test22 389.1 sec coverage: 62270 of 62270 (100.0%) + +---------------------------------------------- [malloc] [cover] +03-Mar-2018 22:26:28 test98 0.0 sec coverage: 182 of 62270 ( 0.3%) +03-Mar-2018 22:26:28 test97 0.0 sec coverage: 328 of 62270 ( 0.5%) +03-Mar-2018 22:26:28 test01 0.0 sec coverage: 1236 of 62270 ( 2.0%) +03-Mar-2018 22:26:28 test02 0.1 sec coverage: 1570 of 62270 ( 2.5%) +03-Mar-2018 22:26:28 test03 0.0 sec coverage: 1595 of 62270 ( 2.6%) +03-Mar-2018 22:26:28 test04 0.0 sec coverage: 1621 of 62270 ( 2.6%) +03-Mar-2018 22:26:28 test05 0.0 sec coverage: 1622 of 62270 ( 2.6%) +03-Mar-2018 22:26:28 test07 0.0 sec coverage: 1638 of 62270 ( 2.6%) +03-Mar-2018 22:26:28 test07b 0.0 sec coverage: 1642 of 62270 ( 2.6%) +03-Mar-2018 22:26:29 test08 0.6 sec coverage: 1645 of 62270 ( 2.6%) +03-Mar-2018 22:26:29 test09 0.0 sec coverage: 1645 of 62270 ( 2.6%) +03-Mar-2018 22:26:29 test13 0.0 sec coverage: 1650 of 62270 ( 2.6%) +03-Mar-2018 22:26:29 test15 0.0 sec coverage: 1685 of 62270 ( 2.7%) +03-Mar-2018 22:26:29 test17 0.2 sec coverage: 1688 of 62270 ( 2.7%) +03-Mar-2018 22:26:29 test72 0.3 sec coverage: 1736 of 62270 ( 2.8%) +03-Mar-2018 22:26:30 test26 0.2 sec coverage: 1758 of 62270 ( 2.8%) +03-Mar-2018 22:26:31 test29 0.6 sec coverage: 2089 of 62270 ( 3.4%) +03-Mar-2018 22:26:32 test69 1.2 sec coverage: 2113 of 62270 ( 3.4%) +03-Mar-2018 22:26:33 test28 0.2 sec coverage: 2120 of 62270 ( 3.4%) +03-Mar-2018 22:26:36 test11 2.6 sec coverage: 2122 of 62270 ( 3.4%) +03-Mar-2018 22:26:39 test14 3.0 sec coverage: 2630 of 62270 ( 4.2%) +03-Mar-2018 22:26:43 test20 3.4 sec coverage: 2766 of 62270 ( 4.4%) +03-Mar-2018 22:26:47 test00 4.0 sec coverage: 2789 of 62270 ( 4.5%) +03-Mar-2018 22:26:59 test19 10.3 sec coverage: 2832 of 62270 ( 4.5%) +03-Mar-2018 22:26:59 test12 0.3 sec coverage: 2864 of 62270 ( 4.6%) +03-Mar-2018 22:27:22 test10 24.0 sec coverage: 8146 of 62270 ( 13.1%) +03-Mar-2018 22:27:26 test76 3.7 sec coverage: 8156 of 62270 ( 13.1%) +03-Mar-2018 22:27:48 test27 20.0 sec coverage: 8166 of 62270 ( 13.1%) +03-Mar-2018 22:28:07 test25 19.3 sec coverage: 8216 of 62270 ( 13.2%) +03-Mar-2018 22:28:32 test74 20.2 sec coverage: 22758 of 62270 ( 36.5%) +03-Mar-2018 22:28:54 test99 20.9 sec coverage: 22796 of 62270 ( 36.6%) +03-Mar-2018 22:29:14 test23 19.2 sec coverage: 23125 of 62270 ( 37.1%) +03-Mar-2018 22:29:40 test18 26.6 sec coverage: 23147 of 62270 ( 37.2%) +03-Mar-2018 22:31:33 test77 112.4 sec coverage: 23171 of 62270 ( 37.2%) +03-Mar-2018 22:32:17 test16 42.7 sec coverage: 23289 of 62270 ( 37.4%) +03-Mar-2018 22:33:13 test24 53.7 sec coverage: 23294 of 62270 ( 37.4%) +03-Mar-2018 22:34:19 test21 66.3 sec coverage: 23298 of 62270 ( 37.4%) +03-Mar-2018 22:36:40 test06 135.5 sec coverage: 40693 of 62270 ( 65.3%) +03-Mar-2018 22:43:04 test75 367.9 sec coverage: 61823 of 62270 ( 99.3%) +03-Mar-2018 22:47:19 test19b 251.3 sec coverage: 61894 of 62270 ( 99.4%) +03-Mar-2018 22:53:08 test22 346.7 sec coverage: 62270 of 62270 (100.0%) diff --git a/GraphBLAS/Tcov/testcov.m b/GraphBLAS/Tcov/testcov.m index 4a9d3ee8c3..a961350f7b 100644 --- a/GraphBLAS/Tcov/testcov.m +++ b/GraphBLAS/Tcov/testcov.m @@ -1,6 +1,6 @@ %TESTCOV run all GraphBLAS tests, with statement coverage -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. try diff --git a/GraphBLAS/Test/GB_define.m b/GraphBLAS/Test/GB_define.m index 333b0b6ef3..32d04bbd0a 100644 --- a/GraphBLAS/Test/GB_define.m +++ b/GraphBLAS/Test/GB_define.m @@ -1,7 +1,7 @@ function GB_define %GB_DEFINE create C source code for GraphBLAS.h -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. ints = {'int8','uint8', 'int16','uint16', 'int32','uint32', 'int64','uint64' } ; diff --git a/GraphBLAS/Test/GB_mex.h b/GraphBLAS/Test/GB_mex.h index 6b598b1ffa..934e782241 100644 --- a/GraphBLAS/Test/GB_mex.h +++ b/GraphBLAS/Test/GB_mex.h @@ -2,7 +2,7 @@ // GB_mex.h: definitions for the MATLAB interface to GraphBLAS //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mex_AdotB.c b/GraphBLAS/Test/GB_mex_AdotB.c index e77e772b1e..2a7bebcbd5 100644 --- a/GraphBLAS/Test/GB_mex_AdotB.c +++ b/GraphBLAS/Test/GB_mex_AdotB.c @@ -2,7 +2,7 @@ // GB_mex_AdotB: compute C=spones(Mask).*(A'*B) //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mex_AplusB.c b/GraphBLAS/Test/GB_mex_AplusB.c index efb0174894..815a4c3966 100644 --- a/GraphBLAS/Test/GB_mex_AplusB.c +++ b/GraphBLAS/Test/GB_mex_AplusB.c @@ -2,7 +2,7 @@ // GB_mex_AplusB: compute C=A+B //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mex_AxB.c b/GraphBLAS/Test/GB_mex_AxB.c index f0bfacf1e1..4b465260db 100644 --- a/GraphBLAS/Test/GB_mex_AxB.c +++ b/GraphBLAS/Test/GB_mex_AxB.c @@ -2,7 +2,7 @@ // GB_mex_AxB: compute C=A*B, A'*B, A*B', or A'*B' //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mex_AxB_symbolic.c b/GraphBLAS/Test/GB_mex_AxB_symbolic.c index be2eafb250..232764f082 100644 --- a/GraphBLAS/Test/GB_mex_AxB_symbolic.c +++ b/GraphBLAS/Test/GB_mex_AxB_symbolic.c @@ -2,7 +2,7 @@ // GB_mex_AxB_symoolic: compute the pattern of A*B or (A*B)' //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mex_Col_assign.c b/GraphBLAS/Test/GB_mex_Col_assign.c index 3605bba940..3f1724e9f0 100644 --- a/GraphBLAS/Test/GB_mex_Col_assign.c +++ b/GraphBLAS/Test/GB_mex_Col_assign.c @@ -2,7 +2,7 @@ // GB_mex_assign: C(I,J) = accum (C (I,J), A) //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // This function is a wrapper for GrB_Matrix_assign, GrB_Matrix_assign_T diff --git a/GraphBLAS/Test/GB_mex_Col_extract.c b/GraphBLAS/Test/GB_mex_Col_extract.c index bec90d4332..3dab94a7a5 100644 --- a/GraphBLAS/Test/GB_mex_Col_extract.c +++ b/GraphBLAS/Test/GB_mex_Col_extract.c @@ -2,7 +2,7 @@ // GB_mex_Col_extract: MATLAB interface for w = accum (w,A(I,j)) //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mex_Matrix_build.c b/GraphBLAS/Test/GB_mex_Matrix_build.c index 2511791597..6a722504a1 100644 --- a/GraphBLAS/Test/GB_mex_Matrix_build.c +++ b/GraphBLAS/Test/GB_mex_Matrix_build.c @@ -2,7 +2,7 @@ // GB_mex_Matrix_build.c: MATLAB interface to GrB_Matrix_build //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mex_Matrix_extract.c b/GraphBLAS/Test/GB_mex_Matrix_extract.c index 45fe4eb4f8..fc0e70137b 100644 --- a/GraphBLAS/Test/GB_mex_Matrix_extract.c +++ b/GraphBLAS/Test/GB_mex_Matrix_extract.c @@ -2,7 +2,7 @@ // GB_mex_Matrix_extract: MATLAB interface for C = accum (C,A(I,J)) //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mex_Matrix_extractElement.c b/GraphBLAS/Test/GB_mex_Matrix_extractElement.c index ed1fcb979f..b9df1f87a6 100644 --- a/GraphBLAS/Test/GB_mex_Matrix_extractElement.c +++ b/GraphBLAS/Test/GB_mex_Matrix_extractElement.c @@ -2,7 +2,7 @@ // GB_mex_Matrix_extractElement: MATLAB interface for x = A(i,j) //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mex_Matrix_subref.c b/GraphBLAS/Test/GB_mex_Matrix_subref.c index 65e4a18237..dafc045e5e 100644 --- a/GraphBLAS/Test/GB_mex_Matrix_subref.c +++ b/GraphBLAS/Test/GB_mex_Matrix_subref.c @@ -2,7 +2,7 @@ // GB_mex_Matrix_subref: C=A(I,J) or C=A(J,I)' //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mex_Vector_build.c b/GraphBLAS/Test/GB_mex_Vector_build.c index a749e2bde3..3bc46e390e 100644 --- a/GraphBLAS/Test/GB_mex_Vector_build.c +++ b/GraphBLAS/Test/GB_mex_Vector_build.c @@ -2,7 +2,7 @@ // GB_mex_Vector_build.c: MATLAB interface to GrB_Vector_build //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mex_Vector_extract.c b/GraphBLAS/Test/GB_mex_Vector_extract.c index 264e5e0653..bf2e424039 100644 --- a/GraphBLAS/Test/GB_mex_Vector_extract.c +++ b/GraphBLAS/Test/GB_mex_Vector_extract.c @@ -2,7 +2,7 @@ // GB_mex_Vector_extract: MATLAB interface for w = accum (w,u(I)) //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mex_Vector_extractElement.c b/GraphBLAS/Test/GB_mex_Vector_extractElement.c index 338ece6c59..0b073c0f71 100644 --- a/GraphBLAS/Test/GB_mex_Vector_extractElement.c +++ b/GraphBLAS/Test/GB_mex_Vector_extractElement.c @@ -2,7 +2,7 @@ // GB_mex_Vector_extractElement: MATLAB interface for x = v(i) //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mex_about.c b/GraphBLAS/Test/GB_mex_about.c index cbf1b43fb2..0494e8af60 100644 --- a/GraphBLAS/Test/GB_mex_about.c +++ b/GraphBLAS/Test/GB_mex_about.c @@ -2,7 +2,7 @@ // GB_mex_about: print the 'about' information //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ @@ -10,7 +10,6 @@ // Test lots of random stuff. The function otherwise serves no purpose. #include "GB_mex.h" -#include "../Source/GB.h" GrB_Info ack (int64_t *stuff, GrB_Matrix GunkIt) { @@ -50,15 +49,24 @@ void mexFunction printf ("in %s:\n%s", __FILE__, GrB_error ( )) ; - printf ("sizeof (GB_UnaryOp_opaque) %d\n", sizeof (GB_UnaryOp_opaque)) ; - printf ("sizeof (GB_BinaryOp_opaque) %d\n", sizeof (GB_BinaryOp_opaque)) ; - printf ("sizeof (GB_Type_opaque) %d\n", sizeof (GB_Type_opaque)) ; - printf ("sizeof (GB_Monoid_opaque) %d\n", sizeof (GB_Monoid_opaque)) ; - printf ("sizeof (GB_Semiring_opaque) %d\n", sizeof (GB_Semiring_opaque)) ; - printf ("sizeof (GB_Vector_opaque) %d\n", sizeof (GB_Vector_opaque)) ; - printf ("sizeof (GB_Matrix_opaque) %d\n", sizeof (GB_Matrix_opaque)) ; - printf ("sizeof (GB_Descriptor_opaque) %d\n", - sizeof (GB_Descriptor_opaque)) ; + printf ("sizeof (struct GB_Type_opaque) %d\n", + sizeof (struct GB_Type_opaque)) ; + printf ("sizeof (struct GB_UnaryOp_opaque) %d\n", + sizeof (struct GB_UnaryOp_opaque)) ; + printf ("sizeof (struct GB_BinaryOp_opaque) %d\n", + sizeof (struct GB_BinaryOp_opaque)) ; + printf ("sizeof (struct GB_SelectOp_opaque) %d\n", + sizeof (struct GB_SelectOp_opaque)) ; + printf ("sizeof (struct GB_Monoid_opaque) %d\n", + sizeof (struct GB_Monoid_opaque)) ; + printf ("sizeof (struct GB_Semiring_opaque) %d\n", + sizeof (struct GB_Semiring_opaque)) ; + printf ("sizeof (struct GB_Vector_opaque) %d\n", + sizeof (struct GB_Vector_opaque)) ; + printf ("sizeof (struct GB_Matrix_opaque) %d\n", + sizeof (struct GB_Matrix_opaque)) ; + printf ("sizeof (struct GB_Descriptor_opaque) %d\n", + sizeof (struct GB_Descriptor_opaque)) ; WHERE ("GB_mex_about") ; GrB_Info info = ERROR (GrB_PANIC, (LOG, @@ -126,7 +134,7 @@ void mexFunction GrB_free (&m) ; int16_t id0 = MINUS_INF (id0) ; - + GrB_Monoid_new (&m, GrB_MAX_INT16, id0) ; GB_check (m, "max int16 monoid", 3) ; int16_t id1 ; @@ -219,7 +227,7 @@ void mexFunction info = ack (NULL, Gunk) ; printf ("%s", GrB_error ( )) ; - + Gunk->magic = 999 ; info = ack (&ok, Gunk) ; printf ("%s", GrB_error ( )) ; diff --git a/GraphBLAS/Test/GB_mex_apply.c b/GraphBLAS/Test/GB_mex_apply.c index 4943dad515..e2f760a225 100644 --- a/GraphBLAS/Test/GB_mex_apply.c +++ b/GraphBLAS/Test/GB_mex_apply.c @@ -2,7 +2,7 @@ // GB_mex_apply: C = accum(C,op(A)) or op(A') //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mex_apply2.c b/GraphBLAS/Test/GB_mex_apply2.c new file mode 100644 index 0000000000..3d34922c87 --- /dev/null +++ b/GraphBLAS/Test/GB_mex_apply2.c @@ -0,0 +1,104 @@ +//------------------------------------------------------------------------------ +// GB_mex_apply2: C = accum(C,op(A)) or op(A') +//------------------------------------------------------------------------------ + +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. +// http://suitesparse.com See GraphBLAS/Doc/License.txt for license. + +//------------------------------------------------------------------------------ + +// Apply a unary operator to a matrix, with C aliased to the Mask + +#include "GB_mex.h" + +#define FREE_ALL \ +{ \ + GB_MATRIX_FREE (&C) ; \ + GB_MATRIX_FREE (&A) ; \ + GrB_free (&desc) ; \ + GB_mx_put_global (malloc_debug) ; \ +} + +void mexFunction +( + int nargout, + mxArray *pargout [ ], + int nargin, + const mxArray *pargin [ ] +) +{ + + bool malloc_debug = GB_mx_get_global ( ) ; + GrB_Matrix C = NULL ; + GrB_Matrix A = NULL ; + GrB_Descriptor desc = NULL ; + + // check inputs + if (nargout > 1 || nargin < 4 || nargin > 5) + { + mexErrMsgTxt ("Usage: C = GB_mex_apply2 (C, accum, op, A, desc)"); + } + + // get C (make a deep copy) + #define GET_DEEP_COPY \ + C = GB_mx_mxArray_to_Matrix (pargin [0], "C input", true) ; + #define FREE_DEEP_COPY GB_MATRIX_FREE (&C) ; + GET_DEEP_COPY ; + if (C == NULL) + { + FREE_ALL ; + mexErrMsgTxt ("C failed") ; + } + mxClassID cclass = GB_mx_Type_to_classID (C->type) ; + + // get A (shallow copy) + A = GB_mx_mxArray_to_Matrix (pargin [3], "A input", false) ; + if (A == NULL) + { + FREE_ALL ; + mexErrMsgTxt ("A failed") ; + } + + // get accum; default: NOP, default class is class(C) + GrB_BinaryOp accum ; + if (!GB_mx_mxArray_to_BinaryOp (&accum, pargin [1], "accum", + GB_NOP_opcode, cclass, C->type == Complex, A->type == Complex)) + { + FREE_ALL ; + mexErrMsgTxt ("accum failed") ; + } + + // get op; default: NOP, default class is class(C) + GrB_UnaryOp op ; + if (!GB_mx_mxArray_to_UnaryOp (&op, pargin [2], "op", + GB_NOP_opcode, cclass, A->type == Complex)) + { + FREE_ALL ; + mexErrMsgTxt ("UnaryOp failed") ; + } + + // get desc + if (!GB_mx_mxArray_to_Descriptor (&desc, PARGIN (4), "desc")) + { + FREE_ALL ; + mexErrMsgTxt ("desc failed") ; + } + + // C = accum(C,op(A)) + if (C->ncols == 1 && (desc == NULL || desc->in0 == GxB_DEFAULT)) + { + // this is just to test the Vector version + METHOD (GrB_apply ((GrB_Vector) C, (GrB_Vector) C, accum, op, + (GrB_Vector) A, desc)) ; + } + else + { + METHOD (GrB_apply (C, C, accum, op, A, desc)) ; + } + + // return C to MATLAB as a struct and free the GraphBLAS C + pargout [0] = GB_mx_Matrix_to_mxArray (&C, "C output", true) ; + + FREE_ALL ; +} + diff --git a/GraphBLAS/Test/GB_mex_assign.c b/GraphBLAS/Test/GB_mex_assign.c index 30e7ce19e8..4ddba7fa7c 100644 --- a/GraphBLAS/Test/GB_mex_assign.c +++ b/GraphBLAS/Test/GB_mex_assign.c @@ -2,7 +2,7 @@ // GB_mex_assign: C(I,J) = accum (C (I,J), A) //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // This function is a wrapper for GrB_Matrix_assign, GrB_Matrix_assign_T diff --git a/GraphBLAS/Test/GB_mex_assign_alias.c b/GraphBLAS/Test/GB_mex_assign_alias.c index 1ab5b76b33..5a332e3d7c 100644 --- a/GraphBLAS/Test/GB_mex_assign_alias.c +++ b/GraphBLAS/Test/GB_mex_assign_alias.c @@ -2,7 +2,7 @@ // GB_mex_assign_alias: C(I,J) = accum(C(I,J),C) //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mex_band.c b/GraphBLAS/Test/GB_mex_band.c index 598c17e531..b95e0675bc 100644 --- a/GraphBLAS/Test/GB_mex_band.c +++ b/GraphBLAS/Test/GB_mex_band.c @@ -2,7 +2,7 @@ // GB_mex_band: C = tril (triu (A,lo), hi), or with A' //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mex_binaryop.c b/GraphBLAS/Test/GB_mex_binaryop.c index d62f270d93..7087e2d584 100644 --- a/GraphBLAS/Test/GB_mex_binaryop.c +++ b/GraphBLAS/Test/GB_mex_binaryop.c @@ -2,7 +2,7 @@ // GB_mex_binaryop: parse a binaryop, for testing //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mex_cast.c b/GraphBLAS/Test/GB_mex_cast.c index 9af7b240ab..72d749cf70 100644 --- a/GraphBLAS/Test/GB_mex_cast.c +++ b/GraphBLAS/Test/GB_mex_cast.c @@ -2,7 +2,7 @@ // GB_mex_cast: cast a MATLAB array using C-style casting rules //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mex_complex.c b/GraphBLAS/Test/GB_mex_complex.c index baf24b486c..cd13e262a8 100644 --- a/GraphBLAS/Test/GB_mex_complex.c +++ b/GraphBLAS/Test/GB_mex_complex.c @@ -2,7 +2,7 @@ // GB_mex_complex: convert a real matrix into a complex one //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mex_debug.c b/GraphBLAS/Test/GB_mex_debug.c index 673adc0b28..a0cd27aabe 100644 --- a/GraphBLAS/Test/GB_mex_debug.c +++ b/GraphBLAS/Test/GB_mex_debug.c @@ -2,7 +2,7 @@ // GB_mex_debug: determine NDEBUG status //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mex_diag.c b/GraphBLAS/Test/GB_mex_diag.c index 95cfa677d5..63fdce5205 100644 --- a/GraphBLAS/Test/GB_mex_diag.c +++ b/GraphBLAS/Test/GB_mex_diag.c @@ -2,7 +2,7 @@ // GB_mex_diag: compute C=diag(A,1) //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mex_dump.c b/GraphBLAS/Test/GB_mex_dump.c index c6100a1c76..296a5b46e0 100644 --- a/GraphBLAS/Test/GB_mex_dump.c +++ b/GraphBLAS/Test/GB_mex_dump.c @@ -2,7 +2,7 @@ // GB_mex_dump: copy and print a matrix //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mex_dup.c b/GraphBLAS/Test/GB_mex_dup.c index 482368c635..bbadcaee16 100644 --- a/GraphBLAS/Test/GB_mex_dup.c +++ b/GraphBLAS/Test/GB_mex_dup.c @@ -2,7 +2,7 @@ // GB_mex_dup: copy a matrix //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mex_eWiseAdd_Matrix.c b/GraphBLAS/Test/GB_mex_eWiseAdd_Matrix.c index d011fca551..1e07ba0472 100644 --- a/GraphBLAS/Test/GB_mex_eWiseAdd_Matrix.c +++ b/GraphBLAS/Test/GB_mex_eWiseAdd_Matrix.c @@ -2,7 +2,7 @@ // GB_mex_eWiseAdd_Matrix: C = accum(C,A+B) //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mex_eWiseAdd_Vector.c b/GraphBLAS/Test/GB_mex_eWiseAdd_Vector.c index e02887833c..4aadf0148a 100644 --- a/GraphBLAS/Test/GB_mex_eWiseAdd_Vector.c +++ b/GraphBLAS/Test/GB_mex_eWiseAdd_Vector.c @@ -2,7 +2,7 @@ // GB_mex_eWiseAdd_Vector: w = accum(w,u+v) //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mex_eWiseMult_Matrix.c b/GraphBLAS/Test/GB_mex_eWiseMult_Matrix.c index 0c67bd015e..d3d0aceeb6 100644 --- a/GraphBLAS/Test/GB_mex_eWiseMult_Matrix.c +++ b/GraphBLAS/Test/GB_mex_eWiseMult_Matrix.c @@ -2,20 +2,20 @@ // GB_mex_eWiseMult_Matrix: C = accum(C,A.*B) //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ #include "GB_mex.h" -#define FREE_ALL \ -{ \ - GB_MATRIX_FREE (&A) ; \ - GB_MATRIX_FREE (&B) ; \ - GB_MATRIX_FREE (&C) ; \ - GrB_free (&desc) ; \ - GB_MATRIX_FREE (&Mask) ; \ +#define FREE_ALL \ +{ \ + GB_MATRIX_FREE (&A) ; \ + GB_MATRIX_FREE (&B) ; \ + GB_MATRIX_FREE (&C) ; \ + GrB_free (&desc) ; \ + GB_MATRIX_FREE (&Mask) ; \ GB_mx_put_global (malloc_debug) ; \ } diff --git a/GraphBLAS/Test/GB_mex_eWiseMult_Vector.c b/GraphBLAS/Test/GB_mex_eWiseMult_Vector.c index 127a4909f9..fff917a49e 100644 --- a/GraphBLAS/Test/GB_mex_eWiseMult_Vector.c +++ b/GraphBLAS/Test/GB_mex_eWiseMult_Vector.c @@ -2,7 +2,7 @@ // GB_mex_eWiseMult_Vector: w = accum(w,u.*v) //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mex_errors.c b/GraphBLAS/Test/GB_mex_errors.c index 2cbf37b994..28ef143915 100644 --- a/GraphBLAS/Test/GB_mex_errors.c +++ b/GraphBLAS/Test/GB_mex_errors.c @@ -2,7 +2,7 @@ // GB_mex_errors: test error handling //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ @@ -231,11 +231,11 @@ void mexFunction expected = GrB_NULL_POINTER ; - ERR (GrB_Type_new (NULL, int)) ; + ERR (GrB_Type_new (NULL, sizeof (int))) ; ERR (GxB_Type_size (NULL, NULL)) ; ERR (GxB_Type_size (&s, NULL)) ; - OK (GrB_Type_new (&T, int)) ; + OK (GrB_Type_new (&T, sizeof (int))) ; CHECK (T != NULL) ; expected = GrB_UNINITIALIZED_OBJECT ; @@ -250,7 +250,7 @@ void mexFunction CHECK (GrB_INT32 == T) ; T = NULL ; - OK (GrB_Type_new (&T, int)) ; + OK (GrB_Type_new (&T, sizeof (int))) ; CHECK (T != NULL) ; OK (GxB_Type_size (&s, T)) ; @@ -465,55 +465,55 @@ void mexFunction expected = GrB_NULL_POINTER ; - ERR (GrB_Monoid_BOOL_new (NULL, NULL, 0)) ; - ERR (GrB_Monoid_INT8_new (NULL, NULL, 0)) ; - ERR (GrB_Monoid_UINT8_new (NULL, NULL, 0)) ; - ERR (GrB_Monoid_INT16_new (NULL, NULL, 0)) ; - ERR (GrB_Monoid_UINT16_new (NULL, NULL, 0)) ; - ERR (GrB_Monoid_INT32_new (NULL, NULL, 0)) ; - ERR (GrB_Monoid_UINT32_new (NULL, NULL, 0)) ; - ERR (GrB_Monoid_INT64_new (NULL, NULL, 0)) ; - ERR (GrB_Monoid_UINT64_new (NULL, NULL, 0)) ; - ERR (GrB_Monoid_FP32_new (NULL, NULL, 0)) ; - ERR (GrB_Monoid_FP64_new (NULL, NULL, 0)) ; - ERR (GrB_Monoid_UDT_new (NULL, NULL, NULL)) ; + ERR (GrB_Monoid_new_BOOL (NULL, NULL, 0)) ; + ERR (GrB_Monoid_new_INT8 (NULL, NULL, 0)) ; + ERR (GrB_Monoid_new_UINT8 (NULL, NULL, 0)) ; + ERR (GrB_Monoid_new_INT16 (NULL, NULL, 0)) ; + ERR (GrB_Monoid_new_UINT16 (NULL, NULL, 0)) ; + ERR (GrB_Monoid_new_INT32 (NULL, NULL, 0)) ; + ERR (GrB_Monoid_new_UINT32 (NULL, NULL, 0)) ; + ERR (GrB_Monoid_new_INT64 (NULL, NULL, 0)) ; + ERR (GrB_Monoid_new_UINT64 (NULL, NULL, 0)) ; + ERR (GrB_Monoid_new_FP32 (NULL, NULL, 0)) ; + ERR (GrB_Monoid_new_FP64 (NULL, NULL, 0)) ; + ERR (GrB_Monoid_new_UDT (NULL, NULL, NULL)) ; ERR (GrB_Monoid_new (NULL, NULL, NULL)) ; - ERR (GrB_Monoid_BOOL_new (&monoid, NULL, 0)) ; CHECK (monoid == NULL) ; - ERR (GrB_Monoid_INT8_new (&monoid, NULL, 0)) ; CHECK (monoid == NULL) ; - ERR (GrB_Monoid_UINT8_new (&monoid, NULL, 0)) ; CHECK (monoid == NULL) ; - ERR (GrB_Monoid_INT16_new (&monoid, NULL, 0)) ; CHECK (monoid == NULL) ; - ERR (GrB_Monoid_UINT16_new (&monoid, NULL, 0)) ; CHECK (monoid == NULL) ; - ERR (GrB_Monoid_INT32_new (&monoid, NULL, 0)) ; CHECK (monoid == NULL) ; - ERR (GrB_Monoid_UINT32_new (&monoid, NULL, 0)) ; CHECK (monoid == NULL) ; - ERR (GrB_Monoid_INT64_new (&monoid, NULL, 0)) ; CHECK (monoid == NULL) ; - ERR (GrB_Monoid_UINT64_new (&monoid, NULL, 0)) ; CHECK (monoid == NULL) ; - ERR (GrB_Monoid_FP32_new (&monoid, NULL, 0)) ; CHECK (monoid == NULL) ; - ERR (GrB_Monoid_FP64_new (&monoid, NULL, 0)) ; CHECK (monoid == NULL) ; - ERR (GrB_Monoid_UDT_new (&monoid, NULL, NULL)) ; CHECK (monoid == NULL); + ERR (GrB_Monoid_new_BOOL (&monoid, NULL, 0)) ; CHECK (monoid == NULL) ; + ERR (GrB_Monoid_new_INT8 (&monoid, NULL, 0)) ; CHECK (monoid == NULL) ; + ERR (GrB_Monoid_new_UINT8 (&monoid, NULL, 0)) ; CHECK (monoid == NULL) ; + ERR (GrB_Monoid_new_INT16 (&monoid, NULL, 0)) ; CHECK (monoid == NULL) ; + ERR (GrB_Monoid_new_UINT16 (&monoid, NULL, 0)) ; CHECK (monoid == NULL) ; + ERR (GrB_Monoid_new_INT32 (&monoid, NULL, 0)) ; CHECK (monoid == NULL) ; + ERR (GrB_Monoid_new_UINT32 (&monoid, NULL, 0)) ; CHECK (monoid == NULL) ; + ERR (GrB_Monoid_new_INT64 (&monoid, NULL, 0)) ; CHECK (monoid == NULL) ; + ERR (GrB_Monoid_new_UINT64 (&monoid, NULL, 0)) ; CHECK (monoid == NULL) ; + ERR (GrB_Monoid_new_FP32 (&monoid, NULL, 0)) ; CHECK (monoid == NULL) ; + ERR (GrB_Monoid_new_FP64 (&monoid, NULL, 0)) ; CHECK (monoid == NULL) ; + ERR (GrB_Monoid_new_UDT (&monoid, NULL, NULL)) ; CHECK (monoid == NULL); ERR (GrB_Monoid_new (&monoid, NULL, NULL)) ; CHECK (monoid == NULL); expected = GrB_UNINITIALIZED_OBJECT ; - ERR (GrB_Monoid_BOOL_new (&monoid, op2gunk, 0)) ; CHECK (monoid == NULL); - ERR (GrB_Monoid_INT8_new (&monoid, op2gunk, 0)) ; CHECK (monoid == NULL); - ERR (GrB_Monoid_UINT8_new (&monoid, op2gunk, 0)) ; CHECK (monoid == NULL); - ERR (GrB_Monoid_INT16_new (&monoid, op2gunk, 0)) ; CHECK (monoid == NULL); - ERR (GrB_Monoid_UINT16_new (&monoid, op2gunk, 0)) ; CHECK (monoid == NULL); - ERR (GrB_Monoid_INT32_new (&monoid, op2gunk, 0)) ; CHECK (monoid == NULL); - ERR (GrB_Monoid_UINT32_new (&monoid, op2gunk, 0)) ; CHECK (monoid == NULL); - ERR (GrB_Monoid_INT64_new (&monoid, op2gunk, 0)) ; CHECK (monoid == NULL); - ERR (GrB_Monoid_UINT64_new (&monoid, op2gunk, 0)) ; CHECK (monoid == NULL); - ERR (GrB_Monoid_FP32_new (&monoid, op2gunk, 0)) ; CHECK (monoid == NULL); - ERR (GrB_Monoid_FP64_new (&monoid, op2gunk, 0)) ; CHECK (monoid == NULL); - - ERR (GrB_Monoid_UDT_new (&monoid, op2gunk, NULL)) ; CHECK (monoid == NULL) ; + ERR (GrB_Monoid_new_BOOL (&monoid, op2gunk, 0)) ; CHECK (monoid == NULL); + ERR (GrB_Monoid_new_INT8 (&monoid, op2gunk, 0)) ; CHECK (monoid == NULL); + ERR (GrB_Monoid_new_UINT8 (&monoid, op2gunk, 0)) ; CHECK (monoid == NULL); + ERR (GrB_Monoid_new_INT16 (&monoid, op2gunk, 0)) ; CHECK (monoid == NULL); + ERR (GrB_Monoid_new_UINT16 (&monoid, op2gunk, 0)) ; CHECK (monoid == NULL); + ERR (GrB_Monoid_new_INT32 (&monoid, op2gunk, 0)) ; CHECK (monoid == NULL); + ERR (GrB_Monoid_new_UINT32 (&monoid, op2gunk, 0)) ; CHECK (monoid == NULL); + ERR (GrB_Monoid_new_INT64 (&monoid, op2gunk, 0)) ; CHECK (monoid == NULL); + ERR (GrB_Monoid_new_UINT64 (&monoid, op2gunk, 0)) ; CHECK (monoid == NULL); + ERR (GrB_Monoid_new_FP32 (&monoid, op2gunk, 0)) ; CHECK (monoid == NULL); + ERR (GrB_Monoid_new_FP64 (&monoid, op2gunk, 0)) ; CHECK (monoid == NULL); + + ERR (GrB_Monoid_new_UDT (&monoid, op2gunk, NULL)) ; CHECK (monoid == NULL) ; ERR (GrB_Monoid_new (&monoid, op2gunk, NULL)) ; CHECK (monoid == NULL) ; ERR (GrB_Monoid_new (&monoid, op2gunk, 0)) ; CHECK (monoid == NULL) ; expected = GrB_NULL_POINTER ; - ERR (GrB_Monoid_UDT_new (&monoid, GrB_PLUS_FP64, NULL)) ; + ERR (GrB_Monoid_new_UDT (&monoid, GrB_PLUS_FP64, NULL)) ; CHECK (monoid == NULL) ; expected = GrB_DOMAIN_MISMATCH ; @@ -1857,6 +1857,58 @@ void mexFunction // Agunk, Tgunk, op1gunk, op2gunk, monoid_gunk, semigunk, Aempty, vempty, // desc, dgunk, A, B, C, E, F, Z, v, u, dnt, dtn, dtt + //-------------------------------------------------------------------------- + // GxB_kron + //-------------------------------------------------------------------------- + + m2 = GxB_MIN_FP64_MONOID ; + s2 = GxB_PLUS_ISEQ_FP32 ; + + m0 = NULL ; + s0 = NULL ; + v0 = NULL ; + A0 = NULL ; + op0 = NULL ; + + expected = GrB_NULL_POINTER ; + + info = (GxB_kron (A0, NULL, NULL, op0, A0, A0, d0)) ; // matrix op + printf ("dod %d %s\n", info, GrB_error ( )) ; + ERR (GxB_kron (A0, NULL, NULL, o2 , A0, A0, d0)) ; + ERR (GxB_kron (A , NULL, NULL, o2 , A0, A0, d0)) ; + ERR (GxB_kron (A , NULL, NULL, o2 , A , A0, d0)) ; + + expected = GrB_UNINITIALIZED_OBJECT ; + + m0 = monoid_gunk ; + s0 = semigunk ; + v0 = vgunk ; + A0 = Agunk ; + op0 = op2gunk ; + + ERR (GxB_kron (A0, NULL, NULL, op0, A0, A0, d0)) ; // matrix op + ERR (GxB_kron (A0, NULL, NULL, o2 , A0, A0, d0)) ; + ERR (GxB_kron (A , NULL, NULL, o2 , A0, A0, d0)) ; + ERR (GxB_kron (A , NULL, NULL, o2 , A , A0, d0)) ; + ERR (GxB_kron (A , A0 , NULL, o2 , A , A , d0)) ; + ERR (GxB_kron (A , NULL, op0 , o2 , A , A , NULL)) ; + + expected = GrB_DOMAIN_MISMATCH ; + + ERR (GxB_kron (A , NULL, NULL, o2 , Z , A , d0)) ; + ERR (GxB_kron (A , NULL, NULL, o2 , A , Z , d0)) ; + ERR (GxB_kron (A , NULL, NULL, Complex_plus, Z , A , d0)) ; + ERR (GxB_kron (A , NULL, NULL, Complex_plus, A , Z , d0)) ; + ERR (GxB_kron (A , NULL, NULL, Complex_plus, Z , Z , d0)) ; + ERR (GxB_kron (Z , Z , NULL, Complex_plus, Z , Z , d0)) ; + + expected = GrB_DIMENSION_MISMATCH ; + + ERR (GxB_kron (C , NULL, NULL, o2 , A , B , d0)) ; + ERR (GxB_kron (C , NULL, NULL, o2 , A , B , dtn)) ; + ERR (GxB_kron (C , NULL, NULL, o2 , A , B , dnt)) ; + ERR (GxB_kron (C , NULL, NULL, o2 , A , B , dtt)) ; + //-------------------------------------------------------------------------- // extract //-------------------------------------------------------------------------- @@ -2688,6 +2740,7 @@ void mexFunction CHECK (selectop == NULL) ; OK (GxB_SelectOp_new (&selectop, fselect, GrB_FP64)) ; CHECK (selectop != NULL) ; + OK (GB_SelectOp_check (selectop, "select op OK", 3)) ; expected = GrB_NULL_POINTER ; @@ -3129,10 +3182,12 @@ void mexFunction ERR (GB_Type_check (Tgunk, "Tgunk", 1)) ; CHECK (T == NULL) ; - OK (GrB_Type_new (&T, int)) ; + // test the function instead of the macro: + #undef GrB_Type_new + OK (GrB_Type_new (&T, sizeof (int))) ; WHERE ("GB_Type_check") ; - OK (GB_Type_check (T, "T ok", 3)) ; + OK (GB_Type_check (T, "T ok (via function)", 3)) ; T->magic = FREED ; ERR (GB_Type_check (T, "T freed", 1)) ; @@ -3167,11 +3222,13 @@ void mexFunction CHECK (info == GrB_NULL_POINTER) ; CHECK (op1b == NULL) ; + // test the function instead of the macro: + #undef GrB_UnaryOp_new OK (GrB_UnaryOp_new (&op1b, f1, GrB_FP64, GrB_UINT32)) ; CHECK (op1b != NULL) ; WHERE ("GB_UnaryOp_check") ; - OK (GB_UnaryOp_check (op1b, "op1b ok", 1)) ; + OK (GB_UnaryOp_check (op1b, "op1b ok (via function)", 3)) ; expected = GrB_UNINITIALIZED_OBJECT ; @@ -3211,11 +3268,13 @@ void mexFunction CHECK (info == GrB_NULL_POINTER) ; CHECK (op2b == NULL) ; + // test the function instead of the macro: + #undef GrB_BinaryOp_new OK (GrB_BinaryOp_new (&op2b, f2, GrB_INT32, GrB_UINT8, GrB_INT16)) ; CHECK (op2b != NULL) ; WHERE ("GB_BinaryOp_check") ; - OK (GB_BinaryOp_check (op2b, "op2b ok", 1)) ; + OK (GB_BinaryOp_check (op2b, "op2b ok (via function)", 3)) ; expected = GrB_UNINITIALIZED_OBJECT ; @@ -3259,11 +3318,13 @@ void mexFunction CHECK (info == GrB_NULL_POINTER) ; CHECK (selectop == NULL) ; + // test the function instead of the macro: + #undef GxB_SelectOp_new OK (GxB_SelectOp_new (&selectop, fselect, GrB_FP64)) ; CHECK (selectop != NULL) ; WHERE ("GB_SelectOp_check") ; - OK (GB_SelectOp_check (selectop, "user selectop ok", 3)) ; + OK (GB_SelectOp_check (selectop, "user selectop ok (via function)", 3)) ; expected = GrB_UNINITIALIZED_OBJECT ; diff --git a/GraphBLAS/Test/GB_mex_extractTuples.c b/GraphBLAS/Test/GB_mex_extractTuples.c index 6e6da5716d..a8ad9a2abc 100644 --- a/GraphBLAS/Test/GB_mex_extractTuples.c +++ b/GraphBLAS/Test/GB_mex_extractTuples.c @@ -2,7 +2,7 @@ // GB_mex_extractTuples: extract all tuples from a matrix or vector //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mex_init.c b/GraphBLAS/Test/GB_mex_init.c index acb5e95813..630e622599 100644 --- a/GraphBLAS/Test/GB_mex_init.c +++ b/GraphBLAS/Test/GB_mex_init.c @@ -2,7 +2,7 @@ // GB_mex_init: initialize GraphBLAS //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mex_kron.c b/GraphBLAS/Test/GB_mex_kron.c new file mode 100644 index 0000000000..f2af1206ed --- /dev/null +++ b/GraphBLAS/Test/GB_mex_kron.c @@ -0,0 +1,114 @@ +//------------------------------------------------------------------------------ +// GB_mex_kron: C = accum(C,kron(A,B)) +//------------------------------------------------------------------------------ + +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. +// http://suitesparse.com See GraphBLAS/Doc/License.txt for license. + +//------------------------------------------------------------------------------ + +#include "GB_mex.h" + +#define FREE_ALL \ +{ \ + GB_MATRIX_FREE (&A) ; \ + GB_MATRIX_FREE (&B) ; \ + GB_MATRIX_FREE (&C) ; \ + GrB_free (&desc) ; \ + GB_MATRIX_FREE (&Mask) ; \ + GB_mx_put_global (malloc_debug) ; \ +} + +void mexFunction +( + int nargout, + mxArray *pargout [ ], + int nargin, + const mxArray *pargin [ ] +) +{ + + bool malloc_debug = GB_mx_get_global ( ) ; + GrB_Matrix A = NULL ; + GrB_Matrix B = NULL ; + GrB_Matrix C = NULL ; + GrB_Matrix Mask = NULL ; + GrB_Descriptor desc = NULL ; + GrB_BinaryOp mult = NULL ; + + // check inputs + if (nargout > 1 || nargin < 6 || nargin > 7) + { + mexErrMsgTxt ("Usage: C = GB_mex_kron " + "(C, Mask, accum, mult, A, B, desc)"); + } + + // get C (make a deep copy) + #define GET_DEEP_COPY \ + C = GB_mx_mxArray_to_Matrix (pargin [0], "C input", true) ; + #define FREE_DEEP_COPY GB_MATRIX_FREE (&C) ; + GET_DEEP_COPY ; + if (C == NULL) + { + FREE_ALL ; + mexErrMsgTxt ("C failed") ; + } + mxClassID cclass = GB_mx_Type_to_classID (C->type) ; + + // get Mask (shallow copy) + Mask = GB_mx_mxArray_to_Matrix (pargin [1], "Mask", false) ; + if (Mask == NULL && !mxIsEmpty (pargin [1])) + { + FREE_ALL ; + mexErrMsgTxt ("Mask failed") ; + } + + // get A (shallow copy) + A = GB_mx_mxArray_to_Matrix (pargin [4], "A input", false) ; + if (A == NULL) + { + FREE_ALL ; + mexErrMsgTxt ("A failed") ; + } + + // get B (shallow copy) + B = GB_mx_mxArray_to_Matrix (pargin [5], "B input", false) ; + if (B == NULL) + { + FREE_ALL ; + mexErrMsgTxt ("B failed") ; + } + + // get mult operator + if (!GB_mx_mxArray_to_BinaryOp (&mult, pargin [3], "mult", + GB_NOP_opcode, cclass, A->type == Complex, B->type == Complex)) + { + FREE_ALL ; + mexErrMsgTxt ("mult failed") ; + } + + // get accum; default: NOP, default class is class(C) + GrB_BinaryOp accum ; + if (!GB_mx_mxArray_to_BinaryOp (&accum, pargin [2], "accum", + GB_NOP_opcode, cclass, C->type == Complex, mult->ztype == Complex)) + { + FREE_ALL ; + mexErrMsgTxt ("accum failed") ; + } + + // get desc + if (!GB_mx_mxArray_to_Descriptor (&desc, PARGIN (6), "desc")) + { + FREE_ALL ; + mexErrMsgTxt ("desc failed") ; + } + + // C = accum(C,kron(A,B)) + METHOD (GxB_kron (C, Mask, accum, mult, A, B, desc)) ; + + // return C to MATLAB as a struct and free the GraphBLAS C + pargout [0] = GB_mx_Matrix_to_mxArray (&C, "C output", true) ; + + FREE_ALL ; +} + diff --git a/GraphBLAS/Test/GB_mex_mis.c b/GraphBLAS/Test/GB_mex_mis.c index c04ce6bf9a..6a0754e056 100644 --- a/GraphBLAS/Test/GB_mex_mis.c +++ b/GraphBLAS/Test/GB_mex_mis.c @@ -2,7 +2,7 @@ // GB_mex_mis: s=mis(A), find a maximal independent set //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mex_mxm.c b/GraphBLAS/Test/GB_mex_mxm.c index 7546e37b36..3ccc683424 100644 --- a/GraphBLAS/Test/GB_mex_mxm.c +++ b/GraphBLAS/Test/GB_mex_mxm.c @@ -2,7 +2,7 @@ // GB_mex_mxm: C = accum(C,A*B) //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mex_mxm_alias.c b/GraphBLAS/Test/GB_mex_mxm_alias.c index 5414968c53..5dbaa510e6 100644 --- a/GraphBLAS/Test/GB_mex_mxm_alias.c +++ b/GraphBLAS/Test/GB_mex_mxm_alias.c @@ -2,7 +2,7 @@ // GB_mex_mxm_alias: C = accum(C,C*C) //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mex_mxv.c b/GraphBLAS/Test/GB_mex_mxv.c index 35b7279be7..9f9528c93d 100644 --- a/GraphBLAS/Test/GB_mex_mxv.c +++ b/GraphBLAS/Test/GB_mex_mxv.c @@ -2,7 +2,7 @@ // GB_mex_mxv: w = accum(w,A*u) //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mex_nonzero.c b/GraphBLAS/Test/GB_mex_nonzero.c index b74e485bb6..01cebb331a 100644 --- a/GraphBLAS/Test/GB_mex_nonzero.c +++ b/GraphBLAS/Test/GB_mex_nonzero.c @@ -2,7 +2,7 @@ // GB_mex_nonzero: compute C=nonzero(A) //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mex_offdiag.c b/GraphBLAS/Test/GB_mex_offdiag.c index 25e3657ae6..708a48bb03 100644 --- a/GraphBLAS/Test/GB_mex_offdiag.c +++ b/GraphBLAS/Test/GB_mex_offdiag.c @@ -2,7 +2,7 @@ // GB_mex_offdiag: compute C=offdiag(A,1) //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mex_op.c b/GraphBLAS/Test/GB_mex_op.c index eb643fd255..8d973f75d1 100644 --- a/GraphBLAS/Test/GB_mex_op.c +++ b/GraphBLAS/Test/GB_mex_op.c @@ -2,7 +2,7 @@ // GB_mex_op: apply a built-in GraphBLAS operator to MATLAB arrays //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mex_qsort.c b/GraphBLAS/Test/GB_mex_qsort.c index 7e249f36c5..51f18645e3 100644 --- a/GraphBLAS/Test/GB_mex_qsort.c +++ b/GraphBLAS/Test/GB_mex_qsort.c @@ -2,7 +2,7 @@ // GB_mex_qsort: sort int64's using GB_qsort_1 //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mex_qsort_1.c b/GraphBLAS/Test/GB_mex_qsort_1.c index d594207587..3d3b658080 100644 --- a/GraphBLAS/Test/GB_mex_qsort_1.c +++ b/GraphBLAS/Test/GB_mex_qsort_1.c @@ -2,7 +2,7 @@ // GB_mex_qsort_1: sort using GB_qsort_1 //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mex_qsort_2a.c b/GraphBLAS/Test/GB_mex_qsort_2a.c index df3209109b..03e7edb19b 100644 --- a/GraphBLAS/Test/GB_mex_qsort_2a.c +++ b/GraphBLAS/Test/GB_mex_qsort_2a.c @@ -2,7 +2,7 @@ // GB_mex_qsort_2a: sort using GB_qsort_2a //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mex_qsort_2b.c b/GraphBLAS/Test/GB_mex_qsort_2b.c index 4ec969ded3..53157dbba6 100644 --- a/GraphBLAS/Test/GB_mex_qsort_2b.c +++ b/GraphBLAS/Test/GB_mex_qsort_2b.c @@ -2,7 +2,7 @@ // GB_mex_qsort_2b: sort using GB_qsort_2b //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mex_qsort_3.c b/GraphBLAS/Test/GB_mex_qsort_3.c index 1760457679..f8f79028e1 100644 --- a/GraphBLAS/Test/GB_mex_qsort_3.c +++ b/GraphBLAS/Test/GB_mex_qsort_3.c @@ -2,7 +2,7 @@ // GB_mex_qsort_3: sort using GB_qsort_3 //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mex_random.c b/GraphBLAS/Test/GB_mex_random.c index dcfabe610b..2ed01e18b3 100644 --- a/GraphBLAS/Test/GB_mex_random.c +++ b/GraphBLAS/Test/GB_mex_random.c @@ -2,7 +2,7 @@ // GB_mex_random: construct a random matrix, double or Complex //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mex_reduce_to_scalar.c b/GraphBLAS/Test/GB_mex_reduce_to_scalar.c index 1eace190f5..f1d3fc0e69 100644 --- a/GraphBLAS/Test/GB_mex_reduce_to_scalar.c +++ b/GraphBLAS/Test/GB_mex_reduce_to_scalar.c @@ -2,7 +2,7 @@ // GB_mex_reduce_to_scalar: c = accum(c,reduce_to_scalar(A)) //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mex_reduce_to_vector.c b/GraphBLAS/Test/GB_mex_reduce_to_vector.c index 4ee76b8108..8d132267c3 100644 --- a/GraphBLAS/Test/GB_mex_reduce_to_vector.c +++ b/GraphBLAS/Test/GB_mex_reduce_to_vector.c @@ -2,7 +2,7 @@ // GB_mex_reduce_to_vector: c = accum(c,reduce_to_vector(A)) //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mex_resize.c b/GraphBLAS/Test/GB_mex_resize.c new file mode 100644 index 0000000000..540ca4a0d3 --- /dev/null +++ b/GraphBLAS/Test/GB_mex_resize.c @@ -0,0 +1,70 @@ +//------------------------------------------------------------------------------ +// GB_mex_resize: resize a matrix +//------------------------------------------------------------------------------ + +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. +// http://suitesparse.com See GraphBLAS/Doc/License.txt for license. + +//------------------------------------------------------------------------------ + +#define FREE_ALL \ +{ \ + GrB_free (&C) ; \ + GB_mx_put_global (malloc_debug) ; \ +} + +#include "GB_mex.h" + +void mexFunction +( + int nargout, + mxArray *pargout [ ], + int nargin, + const mxArray *pargin [ ] +) +{ + + bool malloc_debug = GB_mx_get_global ( ) ; + GrB_Matrix C = NULL ; + + // check inputs + if (nargout > 1 || nargin < 1 || nargin > 3) + { + mexErrMsgTxt ("Usage: C = GB_mex_resize (A, nrows_new, ncols_new)") ; + } + + #define GET_DEEP_COPY \ + C = GB_mx_mxArray_to_Matrix (pargin [0], "C input", true) ; + #define FREE_DEEP_COPY GB_MATRIX_FREE (&C) ; + GET_DEEP_COPY ; + if (C == NULL) + { + FREE_ALL ; + mexErrMsgTxt ("C failed") ; + } + mxClassID cclass = GB_mx_Type_to_classID (C->type) ; + + // get nrows_new + GET_SCALAR (1, int64_t, nrows_new, C->nrows) ; + + // get ncols_new + GET_SCALAR (2, int64_t, ncols_new, C->ncols) ; + + // resize the matrix + if (C->ncols == 1 && ncols_new == 1) + { + // resize C as a vector + METHOD (GxB_resize ((GrB_Vector) C, nrows_new)) ; + } + else + { + // resize C as a matrix + METHOD (GxB_resize (C, nrows_new, ncols_new)) ; + } + + // return C to MATLAB as a struct and free the GraphBLAS C + pargout [0] = GB_mx_Matrix_to_mxArray (&C, "C output", true) ; + + FREE_ALL ; +} + diff --git a/GraphBLAS/Test/GB_mex_select.c b/GraphBLAS/Test/GB_mex_select.c index eddb8024ee..920f16bba1 100644 --- a/GraphBLAS/Test/GB_mex_select.c +++ b/GraphBLAS/Test/GB_mex_select.c @@ -2,7 +2,7 @@ // GB_mex_select: C = accum(C,select(A,k)) or select(A',k) //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mex_semiring.c b/GraphBLAS/Test/GB_mex_semiring.c index f37206b9a7..f37e97e9b8 100644 --- a/GraphBLAS/Test/GB_mex_semiring.c +++ b/GraphBLAS/Test/GB_mex_semiring.c @@ -2,7 +2,7 @@ // GB_mex_semiring: parse a semiring, for testing; returns nothing //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mex_setElement.c b/GraphBLAS/Test/GB_mex_setElement.c index 3e626cfba3..a266241fdc 100644 --- a/GraphBLAS/Test/GB_mex_setElement.c +++ b/GraphBLAS/Test/GB_mex_setElement.c @@ -2,7 +2,7 @@ // GB_mex_setElement: MATLAB interface for A(i,j) = x //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mex_subassign.c b/GraphBLAS/Test/GB_mex_subassign.c index eceb17b783..7dd60792db 100644 --- a/GraphBLAS/Test/GB_mex_subassign.c +++ b/GraphBLAS/Test/GB_mex_subassign.c @@ -2,7 +2,7 @@ // GB_mex_subassign: C(I,J) = accum (C (I,J), A) //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // This function is a wrapper for all GxB_*_subassign functions. diff --git a/GraphBLAS/Test/GB_mex_subassign_alias.c b/GraphBLAS/Test/GB_mex_subassign_alias.c index 25210e4670..3c19310d1e 100644 --- a/GraphBLAS/Test/GB_mex_subassign_alias.c +++ b/GraphBLAS/Test/GB_mex_subassign_alias.c @@ -2,7 +2,7 @@ // GB_mex_subassign_alias: C(:,:) = accum(C(:,:),C) //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mex_transpose.c b/GraphBLAS/Test/GB_mex_transpose.c index 20ac519884..4215320112 100644 --- a/GraphBLAS/Test/GB_mex_transpose.c +++ b/GraphBLAS/Test/GB_mex_transpose.c @@ -2,7 +2,7 @@ // GB_mex_transpose: transpose a sparse matrix and return it to MATLAB //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mex_tricount.c b/GraphBLAS/Test/GB_mex_tricount.c index 84573e0791..6c7a6e692c 100644 --- a/GraphBLAS/Test/GB_mex_tricount.c +++ b/GraphBLAS/Test/GB_mex_tricount.c @@ -2,7 +2,7 @@ // GB_mex_tricount: count the number of triangles in a graph //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. // Usage: ntri = GB_mex_tricount (method, A, E, L, U) ; diff --git a/GraphBLAS/Test/GB_mex_tril.c b/GraphBLAS/Test/GB_mex_tril.c index 87fff21438..190adce7ca 100644 --- a/GraphBLAS/Test/GB_mex_tril.c +++ b/GraphBLAS/Test/GB_mex_tril.c @@ -2,7 +2,7 @@ // GB_mex_tril: compute C=tril(A,1) //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mex_triu.c b/GraphBLAS/Test/GB_mex_triu.c index 11e06f1f31..f051914e78 100644 --- a/GraphBLAS/Test/GB_mex_triu.c +++ b/GraphBLAS/Test/GB_mex_triu.c @@ -2,7 +2,7 @@ // GB_mex_triu: compute C=triu(A,1) //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mex_vxm.c b/GraphBLAS/Test/GB_mex_vxm.c index 52663da994..b9beb67d4d 100644 --- a/GraphBLAS/Test/GB_mex_vxm.c +++ b/GraphBLAS/Test/GB_mex_vxm.c @@ -2,7 +2,7 @@ // GB_mex_vxm: w' = accum(w',u'A) //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mex_wathen.c b/GraphBLAS/Test/GB_mex_wathen.c index 076e0fd00d..195a0dd95d 100644 --- a/GraphBLAS/Test/GB_mex_wathen.c +++ b/GraphBLAS/Test/GB_mex_wathen.c @@ -2,7 +2,7 @@ // GB_mex_wathen: construct a random finite-element matrix //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mx_Matrix_to_mxArray.c b/GraphBLAS/Test/GB_mx_Matrix_to_mxArray.c index 936f46a8ee..f7f3946c7e 100644 --- a/GraphBLAS/Test/GB_mx_Matrix_to_mxArray.c +++ b/GraphBLAS/Test/GB_mx_Matrix_to_mxArray.c @@ -2,7 +2,7 @@ // GB_mx_Matrix_to_mxArray //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mx_Monoid.c b/GraphBLAS/Test/GB_mx_Monoid.c index 7e6dbe813c..704f744170 100644 --- a/GraphBLAS/Test/GB_mx_Monoid.c +++ b/GraphBLAS/Test/GB_mx_Monoid.c @@ -2,7 +2,7 @@ // GB_mx_Monoid: construct a monoid from a built-in operator //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mx_Type_to_classID.c b/GraphBLAS/Test/GB_mx_Type_to_classID.c index 2d203256c2..e2e793f891 100644 --- a/GraphBLAS/Test/GB_mx_Type_to_classID.c +++ b/GraphBLAS/Test/GB_mx_Type_to_classID.c @@ -2,7 +2,7 @@ // GB_mx_Type_to_classID: return the GraphBLAS type of the MATLAB class ID //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mx_Vector_to_mxArray.c b/GraphBLAS/Test/GB_mx_Vector_to_mxArray.c index c0f9c00aa9..4edd488ba6 100644 --- a/GraphBLAS/Test/GB_mx_Vector_to_mxArray.c +++ b/GraphBLAS/Test/GB_mx_Vector_to_mxArray.c @@ -2,7 +2,7 @@ // GB_mx_Vector_to_mxArray //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mx_builtin_monoid.c b/GraphBLAS/Test/GB_mx_builtin_monoid.c index 164ee57ec8..616f080986 100644 --- a/GraphBLAS/Test/GB_mx_builtin_monoid.c +++ b/GraphBLAS/Test/GB_mx_builtin_monoid.c @@ -2,7 +2,7 @@ // GB_mx_builtin_monoid: return a built-in monoid //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mx_builtin_semiring.c b/GraphBLAS/Test/GB_mx_builtin_semiring.c index 65d0a4de97..dbe35943d7 100644 --- a/GraphBLAS/Test/GB_mx_builtin_semiring.c +++ b/GraphBLAS/Test/GB_mx_builtin_semiring.c @@ -2,7 +2,7 @@ // GB_mx_semiring: get a built-in semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mx_classID_to_Type.c b/GraphBLAS/Test/GB_mx_classID_to_Type.c index eace29ecac..a1f3e40217 100644 --- a/GraphBLAS/Test/GB_mx_classID_to_Type.c +++ b/GraphBLAS/Test/GB_mx_classID_to_Type.c @@ -2,7 +2,7 @@ // GB_mx_classID_to_Type: get GraphBLAS type of the corresponding MATLAB class //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mx_classID_to_string.c b/GraphBLAS/Test/GB_mx_classID_to_string.c index 6255100a89..e1665e6f0e 100644 --- a/GraphBLAS/Test/GB_mx_classID_to_string.c +++ b/GraphBLAS/Test/GB_mx_classID_to_string.c @@ -2,7 +2,7 @@ // GB_mx_classID_to_string: return a MATLAB string from the class ID //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mx_complex_merge.c b/GraphBLAS/Test/GB_mx_complex_merge.c index b2e20eff69..75eafbbfb9 100644 --- a/GraphBLAS/Test/GB_mx_complex_merge.c +++ b/GraphBLAS/Test/GB_mx_complex_merge.c @@ -2,7 +2,7 @@ // GB_mx_complex_merge: merge a MATLAB complex mxArray //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mx_complex_split.c b/GraphBLAS/Test/GB_mx_complex_split.c index 7565ace2a2..eeb29748bf 100644 --- a/GraphBLAS/Test/GB_mx_complex_split.c +++ b/GraphBLAS/Test/GB_mx_complex_split.c @@ -2,7 +2,7 @@ // GB_mx_complex_split: split a MATLAB complex mxArray //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mx_get_global.c b/GraphBLAS/Test/GB_mx_get_global.c index eafbe23f7d..faf088caed 100644 --- a/GraphBLAS/Test/GB_mx_get_global.c +++ b/GraphBLAS/Test/GB_mx_get_global.c @@ -2,7 +2,7 @@ // GB_mx_get_global: get the GraphBLAS thread-local storage from MATLAB //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mx_isequal.c b/GraphBLAS/Test/GB_mx_isequal.c index 94a9477df9..405dec2664 100644 --- a/GraphBLAS/Test/GB_mx_isequal.c +++ b/GraphBLAS/Test/GB_mx_isequal.c @@ -2,7 +2,7 @@ // GB_mx_isequal: check if two matrices are equal //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mx_mxArray_to_BinaryOp.c b/GraphBLAS/Test/GB_mx_mxArray_to_BinaryOp.c index d6400070e4..fedbfe7155 100644 --- a/GraphBLAS/Test/GB_mx_mxArray_to_BinaryOp.c +++ b/GraphBLAS/Test/GB_mx_mxArray_to_BinaryOp.c @@ -2,7 +2,7 @@ // GB_mx_mxArray_to_BinaryOp //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mx_mxArray_to_Descriptor.c b/GraphBLAS/Test/GB_mx_mxArray_to_Descriptor.c index 045e015590..451831aef0 100644 --- a/GraphBLAS/Test/GB_mx_mxArray_to_Descriptor.c +++ b/GraphBLAS/Test/GB_mx_mxArray_to_Descriptor.c @@ -2,7 +2,7 @@ // GB_mx_mxArray_to_Descriptor: get the contents of a GraphBLAS Descriptor //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mx_mxArray_to_Matrix.c b/GraphBLAS/Test/GB_mx_mxArray_to_Matrix.c index e8b326aac0..0e066100e8 100644 --- a/GraphBLAS/Test/GB_mx_mxArray_to_Matrix.c +++ b/GraphBLAS/Test/GB_mx_mxArray_to_Matrix.c @@ -2,7 +2,7 @@ // GB_mx_mxArray_to_Matrix //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mx_mxArray_to_SelectOp.c b/GraphBLAS/Test/GB_mx_mxArray_to_SelectOp.c index 16547853fa..a5a55b0bd7 100644 --- a/GraphBLAS/Test/GB_mx_mxArray_to_SelectOp.c +++ b/GraphBLAS/Test/GB_mx_mxArray_to_SelectOp.c @@ -2,7 +2,7 @@ // GB_mx_mxArray_to_SelectOp //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mx_mxArray_to_Semiring.c b/GraphBLAS/Test/GB_mx_mxArray_to_Semiring.c index 89d23ade4c..29f8e218e8 100644 --- a/GraphBLAS/Test/GB_mx_mxArray_to_Semiring.c +++ b/GraphBLAS/Test/GB_mx_mxArray_to_Semiring.c @@ -2,7 +2,7 @@ // GB_mx_mxArray_to_Semiring //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mx_mxArray_to_UnaryOp.c b/GraphBLAS/Test/GB_mx_mxArray_to_UnaryOp.c index 5859d89f41..8bc6583082 100644 --- a/GraphBLAS/Test/GB_mx_mxArray_to_UnaryOp.c +++ b/GraphBLAS/Test/GB_mx_mxArray_to_UnaryOp.c @@ -2,7 +2,7 @@ // GB_mx_mxArray_to_UnaryOp //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mx_mxArray_to_Vector.c b/GraphBLAS/Test/GB_mx_mxArray_to_Vector.c index 15bfb0e738..247fb3ec6e 100644 --- a/GraphBLAS/Test/GB_mx_mxArray_to_Vector.c +++ b/GraphBLAS/Test/GB_mx_mxArray_to_Vector.c @@ -2,7 +2,7 @@ // GB_mx_mxArray_to_Vector //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mx_mxArray_to_array.c b/GraphBLAS/Test/GB_mx_mxArray_to_array.c index 6b0d039a37..fa1772531f 100644 --- a/GraphBLAS/Test/GB_mx_mxArray_to_array.c +++ b/GraphBLAS/Test/GB_mx_mxArray_to_array.c @@ -2,7 +2,7 @@ // GB_mx_mxArray_to_array: get a dense numerical MATLAB array //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mx_mxArray_to_indices.c b/GraphBLAS/Test/GB_mx_mxArray_to_indices.c index 281108ebec..093c70b308 100644 --- a/GraphBLAS/Test/GB_mx_mxArray_to_indices.c +++ b/GraphBLAS/Test/GB_mx_mxArray_to_indices.c @@ -2,7 +2,7 @@ // GB_mx_mxArray_to_indices //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mx_mxArray_to_string.c b/GraphBLAS/Test/GB_mx_mxArray_to_string.c index ab1cbe4b21..4be4b2e7b8 100644 --- a/GraphBLAS/Test/GB_mx_mxArray_to_string.c +++ b/GraphBLAS/Test/GB_mx_mxArray_to_string.c @@ -2,7 +2,7 @@ // GB_mx_mxArray_to_string.c: get a MATLAB string //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mx_object_to_mxArray.c b/GraphBLAS/Test/GB_mx_object_to_mxArray.c index af0b87154c..bf62fbf33a 100644 --- a/GraphBLAS/Test/GB_mx_object_to_mxArray.c +++ b/GraphBLAS/Test/GB_mx_object_to_mxArray.c @@ -2,7 +2,7 @@ // GB_mx_object_to_mxArray //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mx_put_global.c b/GraphBLAS/Test/GB_mx_put_global.c index 3117139c94..38a0421fc9 100644 --- a/GraphBLAS/Test/GB_mx_put_global.c +++ b/GraphBLAS/Test/GB_mx_put_global.c @@ -2,7 +2,7 @@ // GB_mx_put_global: put the GraphBLAS status in MATLAB workspace //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mx_same.c b/GraphBLAS/Test/GB_mx_same.c index 2ae631bc69..ae903159aa 100644 --- a/GraphBLAS/Test/GB_mx_same.c +++ b/GraphBLAS/Test/GB_mx_same.c @@ -2,7 +2,7 @@ // GB_mx_same: check if two arrays are equal //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mx_string_to_BinaryOp.c b/GraphBLAS/Test/GB_mx_string_to_BinaryOp.c index 44c1758c3d..d8a11a282f 100644 --- a/GraphBLAS/Test/GB_mx_string_to_BinaryOp.c +++ b/GraphBLAS/Test/GB_mx_string_to_BinaryOp.c @@ -2,7 +2,7 @@ // GB_mx_string_to_BinaryOp.c: get a GraphBLAS operator from MATLAB strings //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mx_string_to_UnaryOp.c b/GraphBLAS/Test/GB_mx_string_to_UnaryOp.c index 1c8d1153ec..30857b328c 100644 --- a/GraphBLAS/Test/GB_mx_string_to_UnaryOp.c +++ b/GraphBLAS/Test/GB_mx_string_to_UnaryOp.c @@ -2,7 +2,7 @@ // GB_mx_string_to_UnaryOp.c: get a GraphBLAS operator from MATLAB strings //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mx_string_to_classID.c b/GraphBLAS/Test/GB_mx_string_to_classID.c index 44bf0c28d0..4110fbb64e 100644 --- a/GraphBLAS/Test/GB_mx_string_to_classID.c +++ b/GraphBLAS/Test/GB_mx_string_to_classID.c @@ -2,7 +2,7 @@ // GB_mx_string_to_classid.c: return the class ID from a class string //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_mx_xsame.c b/GraphBLAS/Test/GB_mx_xsame.c index df89bc0092..1f8b492c15 100644 --- a/GraphBLAS/Test/GB_mx_xsame.c +++ b/GraphBLAS/Test/GB_mx_xsame.c @@ -2,7 +2,7 @@ // GB_mx_xsame: check if two arrays are equal (ignoring zombies) //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/GB_spec_Col_assign.m b/GraphBLAS/Test/GB_spec_Col_assign.m index 03c338b2c6..3180ac3609 100644 --- a/GraphBLAS/Test/GB_spec_Col_assign.m +++ b/GraphBLAS/Test/GB_spec_Col_assign.m @@ -8,7 +8,7 @@ % % This function does the same thing as GrB_Col_assign -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. %------------------------------------------------------------------------------- diff --git a/GraphBLAS/Test/GB_spec_Col_extract.m b/GraphBLAS/Test/GB_spec_Col_extract.m index 54d85bda0d..6029643d99 100644 --- a/GraphBLAS/Test/GB_spec_Col_extract.m +++ b/GraphBLAS/Test/GB_spec_Col_extract.m @@ -1,7 +1,7 @@ function w = GB_spec_Col_extract (w, mask, accum, A, I, j, descriptor) %GB_SPEC_COL_EXTRACT a MATLAB mimic of GrB_Col_extract -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. if (nargout > 1 || nargin ~= 7) diff --git a/GraphBLAS/Test/GB_spec_Matrix_extract.m b/GraphBLAS/Test/GB_spec_Matrix_extract.m index 3de2f26288..ab47554a21 100644 --- a/GraphBLAS/Test/GB_spec_Matrix_extract.m +++ b/GraphBLAS/Test/GB_spec_Matrix_extract.m @@ -6,7 +6,7 @@ % % MATLAB mimic of C = accum (A (I,J)) -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. %------------------------------------------------------------------------------- diff --git a/GraphBLAS/Test/GB_spec_Matrix_extractElement.m b/GraphBLAS/Test/GB_spec_Matrix_extractElement.m index 531d0e61d2..e1b1b6bec3 100644 --- a/GraphBLAS/Test/GB_spec_Matrix_extractElement.m +++ b/GraphBLAS/Test/GB_spec_Matrix_extractElement.m @@ -2,7 +2,7 @@ % %GB_SPEC_MATRIX_EXTRACTELEMENT a MATLAB mimic of GrB_Matrix_extractElement -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. A = GB_spec_matrix (A) ; diff --git a/GraphBLAS/Test/GB_spec_Row_assign.m b/GraphBLAS/Test/GB_spec_Row_assign.m index 92487c9d90..2334f69665 100644 --- a/GraphBLAS/Test/GB_spec_Row_assign.m +++ b/GraphBLAS/Test/GB_spec_Row_assign.m @@ -9,7 +9,7 @@ % % This function does the same thing as GrB_Row_assign -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. %------------------------------------------------------------------------------- diff --git a/GraphBLAS/Test/GB_spec_Vector_extract.m b/GraphBLAS/Test/GB_spec_Vector_extract.m index e856192d35..1be3b0c86f 100644 --- a/GraphBLAS/Test/GB_spec_Vector_extract.m +++ b/GraphBLAS/Test/GB_spec_Vector_extract.m @@ -1,7 +1,7 @@ function w = GB_spec_Vector_extract (w, mask, accum, u, I, descriptor) %GB_SPEC_VECTOR_EXTRACT a MATLAB mimic of GrB_Vector_extract -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. if (nargout > 1 || nargin ~= 6) diff --git a/GraphBLAS/Test/GB_spec_Vector_extractElement.m b/GraphBLAS/Test/GB_spec_Vector_extractElement.m index 4899383be0..1bbbf6aae8 100644 --- a/GraphBLAS/Test/GB_spec_Vector_extractElement.m +++ b/GraphBLAS/Test/GB_spec_Vector_extractElement.m @@ -2,7 +2,7 @@ % %GB_SPEC_VECTOR_EXTRACTELEMENT a MATLAB mimic of GrB_Matrix_extractElement -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. if (size (A,2) ~= 1) diff --git a/GraphBLAS/Test/GB_spec_accum.m b/GraphBLAS/Test/GB_spec_accum.m index 3021fd6ad1..65fe57ec2b 100644 --- a/GraphBLAS/Test/GB_spec_accum.m +++ b/GraphBLAS/Test/GB_spec_accum.m @@ -5,7 +5,7 @@ % % Apply accum binary operator to the input C and the intermediate result T. -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. % get the operator; default is class(C) if class is not present diff --git a/GraphBLAS/Test/GB_spec_accum_mask.m b/GraphBLAS/Test/GB_spec_accum_mask.m index 8c0b82e465..960e7c3f7f 100644 --- a/GraphBLAS/Test/GB_spec_accum_mask.m +++ b/GraphBLAS/Test/GB_spec_accum_mask.m @@ -5,7 +5,7 @@ % % C = accum (C,T): apply the accum, then mask, and return the result -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. % C_orig = C ; diff --git a/GraphBLAS/Test/GB_spec_apply.m b/GraphBLAS/Test/GB_spec_apply.m index fbe60616f1..fede23ad1e 100644 --- a/GraphBLAS/Test/GB_spec_apply.m +++ b/GraphBLAS/Test/GB_spec_apply.m @@ -4,7 +4,7 @@ % Usage: % C = GB_spec_apply (C, Mask, accum, op, A, descriptor) -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. %------------------------------------------------------------------------------- diff --git a/GraphBLAS/Test/GB_spec_assign.m b/GraphBLAS/Test/GB_spec_assign.m index d97e60f991..7fecd2791f 100644 --- a/GraphBLAS/Test/GB_spec_assign.m +++ b/GraphBLAS/Test/GB_spec_assign.m @@ -16,7 +16,7 @@ % not affect any part of C outside that row or column. Those two functions % have their own GB_spec_Row_assign.m and GB_spec_Col_assign.m functions. -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. %------------------------------------------------------------------------------- diff --git a/GraphBLAS/Test/GB_spec_build.m b/GraphBLAS/Test/GB_spec_build.m index 2f2458372b..69bad5102e 100644 --- a/GraphBLAS/Test/GB_spec_build.m +++ b/GraphBLAS/Test/GB_spec_build.m @@ -46,7 +46,7 @@ % parameters, or pass fewer inputs. For exampe S = GB_spec_build (I, J, X, % nrows, ncols) uses defaults for op, and order, but not X, nrows and ncols. -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. %------------------------------------------------------------------------------- diff --git a/GraphBLAS/Test/GB_spec_compare.m b/GraphBLAS/Test/GB_spec_compare.m index 7c547cb911..06917a7fae 100644 --- a/GraphBLAS/Test/GB_spec_compare.m +++ b/GraphBLAS/Test/GB_spec_compare.m @@ -8,7 +8,7 @@ % some GraphBLAS method. C_mex = GrG_mex_* (...) is the output of the % corresponding MATLAB interface to the true GraphBLAS method, in C. -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. % get the semiring identity diff --git a/GraphBLAS/Test/GB_spec_descriptor.m b/GraphBLAS/Test/GB_spec_descriptor.m index 5ea9bd11b5..5fcb881a96 100644 --- a/GraphBLAS/Test/GB_spec_descriptor.m +++ b/GraphBLAS/Test/GB_spec_descriptor.m @@ -13,7 +13,7 @@ % inp0: 'default' or 'tran' % inp1: 'default' or 'tran' -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. if (isempty (descriptor)) diff --git a/GraphBLAS/Test/GB_spec_eWiseAdd_Matrix.m b/GraphBLAS/Test/GB_spec_eWiseAdd_Matrix.m index f1820889f8..f466c58da3 100644 --- a/GraphBLAS/Test/GB_spec_eWiseAdd_Matrix.m +++ b/GraphBLAS/Test/GB_spec_eWiseAdd_Matrix.m @@ -7,7 +7,7 @@ % Computes C = accum(C,T), in GraphBLAS notation, where T =A+B, A'+B, % A+B' or A'+B'. The pattern of T is the union of A and B. -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. %------------------------------------------------------------------------------- diff --git a/GraphBLAS/Test/GB_spec_eWiseAdd_Vector.m b/GraphBLAS/Test/GB_spec_eWiseAdd_Vector.m index 57cf8b3f94..6c79521e98 100644 --- a/GraphBLAS/Test/GB_spec_eWiseAdd_Vector.m +++ b/GraphBLAS/Test/GB_spec_eWiseAdd_Vector.m @@ -7,7 +7,7 @@ % Computes w = accum(w,t), in GraphBLAS notation, where t =u+v, % The pattern of t is the union of u and v. -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. %------------------------------------------------------------------------------- diff --git a/GraphBLAS/Test/GB_spec_eWiseMult_Matrix.m b/GraphBLAS/Test/GB_spec_eWiseMult_Matrix.m index f7470ca6bf..a3dae5266b 100644 --- a/GraphBLAS/Test/GB_spec_eWiseMult_Matrix.m +++ b/GraphBLAS/Test/GB_spec_eWiseMult_Matrix.m @@ -7,7 +7,7 @@ % Computes C = accum(C,T), in GraphBLAS notation, where T =A.*B, A'.*B, % A.*B' or A'.*B'. The pattern of T is the union of A and B. -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. %------------------------------------------------------------------------------- diff --git a/GraphBLAS/Test/GB_spec_eWiseMult_Vector.m b/GraphBLAS/Test/GB_spec_eWiseMult_Vector.m index 238cb8e83b..b6e8b637a0 100644 --- a/GraphBLAS/Test/GB_spec_eWiseMult_Vector.m +++ b/GraphBLAS/Test/GB_spec_eWiseMult_Vector.m @@ -7,7 +7,7 @@ % Computes w = accum(w,t), in GraphBLAS notation, where t =u.*v, % The pattern of t is the union of u and v. -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. %------------------------------------------------------------------------------- diff --git a/GraphBLAS/Test/GB_spec_extractTuples.m b/GraphBLAS/Test/GB_spec_extractTuples.m index 44f3481827..87ea96597b 100644 --- a/GraphBLAS/Test/GB_spec_extractTuples.m +++ b/GraphBLAS/Test/GB_spec_extractTuples.m @@ -2,7 +2,7 @@ % %GB_SPEC_EXTRACTTUPLES a MATLAB mimic of GrB_*_extractTuples -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. A = GB_spec_matrix (A) ; diff --git a/GraphBLAS/Test/GB_spec_identity.m b/GraphBLAS/Test/GB_spec_identity.m index c721a2f3b8..2e0f71f5e8 100644 --- a/GraphBLAS/Test/GB_spec_identity.m +++ b/GraphBLAS/Test/GB_spec_identity.m @@ -14,7 +14,7 @@ % The 8 addititive monoids supported are 'min', 'max', 'plus', 'times', 'or', % 'and', 'xor', and 'eq'. For the last 4 the class must be 'logical' -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. if (nargin == 1) diff --git a/GraphBLAS/Test/GB_spec_kron.m b/GraphBLAS/Test/GB_spec_kron.m new file mode 100644 index 0000000000..654322f222 --- /dev/null +++ b/GraphBLAS/Test/GB_spec_kron.m @@ -0,0 +1,82 @@ +function C = GB_spec_kron (C, Mask, accum, mult, A, B, descriptor) +%GB_SPEC_KRON a MATLAB mimic of GxB_kron +% +% Usage: +% C = GB_spec_kron (C, Mask, accum, mult, A, B, descriptor) +% +% Computes C = accum(C,T), in GraphBLAS notation, where T = kron(A,B), +% kron(A',B), kron(A,B') or kron(A',B') + +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. +% http://suitesparse.com See GraphBLAS/Doc/License.txt for license. + +%------------------------------------------------------------------------------- +% get inputs +%------------------------------------------------------------------------------- + +if (nargout > 1 || nargin ~= 7) + error ('usage: C = GB_spec_kron (C, Mask, accum, mult, A, B, descriptor)') ; +end + +C = GB_spec_matrix (C) ; +A = GB_spec_matrix (A) ; +B = GB_spec_matrix (B) ; +[mult_op xyclass zclass] = GB_spec_operator (mult, C.class) ; +Mask = GB_mex_cast (full (Mask), 'logical') ; +[C_replace Mask_comp Atrans Btrans] = GB_spec_descriptor (descriptor) ; + +%------------------------------------------------------------------------------- +% do the work via a clean MATLAB interpretation of the entire GraphBLAS spec +%------------------------------------------------------------------------------- + +% apply the descriptor to A +if (Atrans) + A.matrix = A.matrix' ; + A.pattern = A.pattern' ; +end + +% apply the descriptor to B +if (Btrans) + B.matrix = B.matrix' ; + B.pattern = B.pattern' ; +end + +% T = A.*B, with typecasting +[anrows, ancols] = size (A.matrix) ; +[bnrows, bncols] = size (B.matrix) ; +cnrows = anrows * bnrows ; +cncols = ancols * bncols ; + +% first cast the entries into the class of the operator +% note that in the spec, all three domains z=op(x,y) can be different +% here they are assumed to all be the same +A1 = GB_mex_cast (A.matrix, xyclass) ; +B1 = GB_mex_cast (B.matrix, xyclass) ; + +% do the values +T.matrix = zeros (cnrows, cncols, zclass) ; +T.pattern = false (cnrows, cncols) ; +S = zeros (bnrows, bncols, xyclass) ; +for j = 1:ancols + for i = 1:anrows + if A.pattern (i,j) + S (:,:) = A1 (i,j) ; + ci = (i-1) * bnrows + 1 ; + cj = (j-1) * bncols + 1 ; + p = B.pattern ; + K = GB_spec_op (mult, S(p), B1(p)) ; + Tblock = zeros (bnrows, bncols) ; + Tblock (p) = K ; + T.matrix (ci:ci+bnrows-1, cj:cj+bncols-1) = Tblock ; + T.pattern (ci:ci+bnrows-1, cj:cj+bncols-1) = B.pattern ; + end + end +end + +assert (isequal (zclass, class (T.matrix))) ; +T.class = zclass ; + +% C = accum (C,T): apply the accum, then Mask, and return the result +C = GB_spec_accum_mask (C, Mask, accum, T, C_replace, Mask_comp, 0) ; + + diff --git a/GraphBLAS/Test/GB_spec_mask.m b/GraphBLAS/Test/GB_spec_mask.m index b389dd558c..1cd1772cae 100644 --- a/GraphBLAS/Test/GB_spec_mask.m +++ b/GraphBLAS/Test/GB_spec_mask.m @@ -19,7 +19,7 @@ % This method operates on both plain matrices and on structs with % matrix, pattern, and class components. -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. if (nargin < 6) diff --git a/GraphBLAS/Test/GB_spec_matrix.m b/GraphBLAS/Test/GB_spec_matrix.m index 6c62af06d9..6abeab647a 100644 --- a/GraphBLAS/Test/GB_spec_matrix.m +++ b/GraphBLAS/Test/GB_spec_matrix.m @@ -65,7 +65,7 @@ % must first be passed to this function, C0=GB_spec_matrix(C0,identity) and % then C0 and C1 should be identical. -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. % get the semiring addititive identity, if present diff --git a/GraphBLAS/Test/GB_spec_mxm.m b/GraphBLAS/Test/GB_spec_mxm.m index 3ee2df432d..fb45a6d8de 100644 --- a/GraphBLAS/Test/GB_spec_mxm.m +++ b/GraphBLAS/Test/GB_spec_mxm.m @@ -43,7 +43,7 @@ % C = accum (C,T). See GrB_accum_mask for a description of this % last step. -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. %------------------------------------------------------------------------------- diff --git a/GraphBLAS/Test/GB_spec_mxv.m b/GraphBLAS/Test/GB_spec_mxv.m index d5dabe4e03..b1e866bb87 100644 --- a/GraphBLAS/Test/GB_spec_mxv.m +++ b/GraphBLAS/Test/GB_spec_mxv.m @@ -6,7 +6,7 @@ % % w, mask, and u are vectors. u is not transposed (descriptor inp1 ignored) -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. if (nargout > 1 || nargin ~= 7) diff --git a/GraphBLAS/Test/GB_spec_op.m b/GraphBLAS/Test/GB_spec_op.m index 9eda67004b..3c3f799d52 100644 --- a/GraphBLAS/Test/GB_spec_op.m +++ b/GraphBLAS/Test/GB_spec_op.m @@ -38,7 +38,7 @@ % Also, typecasting in MATLAB and GraphBLAS differs under underflow and % overflow conditions. -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. % get the operator name and class diff --git a/GraphBLAS/Test/GB_spec_operator.m b/GraphBLAS/Test/GB_spec_operator.m index 1e53cd17e7..9645779458 100644 --- a/GraphBLAS/Test/GB_spec_operator.m +++ b/GraphBLAS/Test/GB_spec_operator.m @@ -11,7 +11,7 @@ % class of the output is zclass, and it is either the same as x and y, or % logical for 'eq', 'ne', 'gt', 'lt', 'ge', 'le'. -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. if (isempty (op)) diff --git a/GraphBLAS/Test/GB_spec_opsall.m b/GraphBLAS/Test/GB_spec_opsall.m index 862a886d9f..586057d631 100644 --- a/GraphBLAS/Test/GB_spec_opsall.m +++ b/GraphBLAS/Test/GB_spec_opsall.m @@ -3,7 +3,7 @@ % % [mult_ops unary_ops add_ops classes semirings select_ops] = GB_spec_opsall -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. mult_ops = { diff --git a/GraphBLAS/Test/GB_spec_random.m b/GraphBLAS/Test/GB_spec_random.m index faebd4ce5d..15cc19e040 100644 --- a/GraphBLAS/Test/GB_spec_random.m +++ b/GraphBLAS/Test/GB_spec_random.m @@ -4,6 +4,6 @@ A.class = class ; A.pattern = logical (spones (A.matrix)) ; -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. diff --git a/GraphBLAS/Test/GB_spec_reduce_to_scalar.m b/GraphBLAS/Test/GB_spec_reduce_to_scalar.m index 2431e32458..49743e8908 100644 --- a/GraphBLAS/Test/GB_spec_reduce_to_scalar.m +++ b/GraphBLAS/Test/GB_spec_reduce_to_scalar.m @@ -8,7 +8,7 @@ % % cin is a dense scalar -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. %------------------------------------------------------------------------------- diff --git a/GraphBLAS/Test/GB_spec_reduce_to_vector.m b/GraphBLAS/Test/GB_spec_reduce_to_vector.m index e6c73898eb..608d8bd380 100644 --- a/GraphBLAS/Test/GB_spec_reduce_to_vector.m +++ b/GraphBLAS/Test/GB_spec_reduce_to_vector.m @@ -6,7 +6,7 @@ % % Reduces a matrix to a vector -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. %------------------------------------------------------------------------------- diff --git a/GraphBLAS/Test/GB_spec_resize.m b/GraphBLAS/Test/GB_spec_resize.m new file mode 100644 index 0000000000..b23477688c --- /dev/null +++ b/GraphBLAS/Test/GB_spec_resize.m @@ -0,0 +1,42 @@ +function C = GB_spec_resize (A, nrows_new, ncols_new) +%GB_SPEC_RESIZE a MATLAB mimic of GxB_resize +% +% Usage: +% C = GB_spec_resize (A, nrows_new, ncols_new) + +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. +% http://suitesparse.com See GraphBLAS/Doc/License.txt for license. + +%------------------------------------------------------------------------------- +% get inputs +%------------------------------------------------------------------------------- + +if (nargout > 1 || nargin ~= 3) + error ('usage: C = GB_spec_resize (A, nrows_new, ncols_new)') ; +end + +C = GB_spec_matrix (A) ; +clas = C.class ; + +%------------------------------------------------------------------------------- +% do the work via a clean MATLAB interpretation of the entire GraphBLAS spec +%------------------------------------------------------------------------------- + +[nrows_old ncols_old] = size (C.matrix) ; + +if (ncols_new < ncols_old) + C.matrix = C.matrix (:, 1:ncols_new) ; + C.pattern = C.pattern (:, 1:ncols_new) ; +elseif (ncols_new > ncols_old) + C.matrix = [C.matrix (zeros (nrows_old, ncols_new - ncols_old, clas))] ; + C.pattern = [C.pattern (false (nrows_old, ncols_new - ncols_old))] ; +end + +if (nrows_new < nrows_old) + C.matrix = C.matrix (1:nrows_new, :) ; + C.pattern = C.pattern (1:nrows_new, :) ; +elseif (nrows_new > nrows_old) + C.matrix = [C.matrix ; (zeros (nrows_new - nrows_old, ncols_new, clas))] ; + C.pattern = [C.pattern ; (false (nrows_new - nrows_old, ncols_new))] ; +end + diff --git a/GraphBLAS/Test/GB_spec_select.m b/GraphBLAS/Test/GB_spec_select.m index 1d2b5b0e25..d97f5790b6 100644 --- a/GraphBLAS/Test/GB_spec_select.m +++ b/GraphBLAS/Test/GB_spec_select.m @@ -4,7 +4,7 @@ % Usage: % C = GB_spec_select (C, Mask, accum, opname, A, k, descriptor) -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. %------------------------------------------------------------------------------- diff --git a/GraphBLAS/Test/GB_spec_semiring.m b/GraphBLAS/Test/GB_spec_semiring.m index 564201eca2..3bd8f675af 100644 --- a/GraphBLAS/Test/GB_spec_semiring.m +++ b/GraphBLAS/Test/GB_spec_semiring.m @@ -25,7 +25,7 @@ % % Refer to Source/GB_AxB_builtin.c for a list of valid semirings. -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. % set the default semiring diff --git a/GraphBLAS/Test/GB_spec_subassign.m b/GraphBLAS/Test/GB_spec_subassign.m index 7ad7c0af2d..9c68d67301 100644 --- a/GraphBLAS/Test/GB_spec_subassign.m +++ b/GraphBLAS/Test/GB_spec_subassign.m @@ -12,7 +12,7 @@ % is the same size as A (after optionally being transpose) and the submatrix % C(I,J). Entries outside the C(I,J) submatrix are never modified. -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. %------------------------------------------------------------------------------- diff --git a/GraphBLAS/Test/GB_spec_transpose.m b/GraphBLAS/Test/GB_spec_transpose.m index 468b97495d..0dd8132ee1 100644 --- a/GraphBLAS/Test/GB_spec_transpose.m +++ b/GraphBLAS/Test/GB_spec_transpose.m @@ -53,7 +53,7 @@ % Use an empty value ([ ] or '') to obtain the default value for optional % parameters. -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. %------------------------------------------------------------------------------- diff --git a/GraphBLAS/Test/GB_spec_vxm.m b/GraphBLAS/Test/GB_spec_vxm.m index faeabc1490..0de97716d8 100644 --- a/GraphBLAS/Test/GB_spec_vxm.m +++ b/GraphBLAS/Test/GB_spec_vxm.m @@ -6,7 +6,7 @@ % % w, mask, and u are column vectors. Computes w'=u'*A or w'=u'*A' -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. if (nargout > 1 || nargin ~= 7) diff --git a/GraphBLAS/Test/GB_user_compare.m b/GraphBLAS/Test/GB_user_compare.m index 755f6f9f99..e5d34bb397 100644 --- a/GraphBLAS/Test/GB_user_compare.m +++ b/GraphBLAS/Test/GB_user_compare.m @@ -4,7 +4,7 @@ function GB_user_compare (C1, C2, tol) % % compare two complex results, from GB_mex_op and GB_user_op -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. if (tol) diff --git a/GraphBLAS/Test/GB_user_op.m b/GraphBLAS/Test/GB_user_op.m index e53cf1ab3c..3db901d7c4 100644 --- a/GraphBLAS/Test/GB_user_op.m +++ b/GraphBLAS/Test/GB_user_op.m @@ -12,7 +12,7 @@ % No typecasting is done for user-defined operators. x,y,z are either % double complex or double -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. tol = false ; diff --git a/GraphBLAS/Test/GB_user_opsall.m b/GraphBLAS/Test/GB_user_opsall.m index f813d0efbb..b88bc07edd 100644 --- a/GraphBLAS/Test/GB_user_opsall.m +++ b/GraphBLAS/Test/GB_user_opsall.m @@ -1,7 +1,7 @@ function [complex_binaryops complex_unaryops ] = GB_user_opsall %GB_USER_OPSALL return list of complex operators -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. [mult_ops unary_ops add_ops classes semirings] = GB_spec_opsall ; diff --git a/GraphBLAS/Test/Makefile b/GraphBLAS/Test/Makefile index ca393fec81..e9778d0017 100644 --- a/GraphBLAS/Test/Makefile +++ b/GraphBLAS/Test/Makefile @@ -2,7 +2,7 @@ # GraphBLAS/Test/Makefile #------------------------------------------------------------------------------- -# SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +# SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. # http://suitesparse.com See GraphBLAS/Doc/License.txt for license. #------------------------------------------------------------------------------- diff --git a/GraphBLAS/Test/README.txt b/GraphBLAS/Test/README.txt index 05db89f290..9de2555bea 100644 --- a/GraphBLAS/Test/README.txt +++ b/GraphBLAS/Test/README.txt @@ -1,4 +1,4 @@ -SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. http://suitesparse.com See GraphBLAS/Doc/License.txt for license. GraphBLAS/Test: diff --git a/GraphBLAS/Test/Template/GB_mx_build_template.c b/GraphBLAS/Test/Template/GB_mx_build_template.c index 7d2443fb6b..db815cb8e2 100644 --- a/GraphBLAS/Test/Template/GB_mx_build_template.c +++ b/GraphBLAS/Test/Template/GB_mx_build_template.c @@ -2,7 +2,7 @@ // GB_mx_build_template: build a sparse vector or matrix //------------------------------------------------------------------------------ -// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. // http://suitesparse.com See GraphBLAS/Doc/License.txt for license. //------------------------------------------------------------------------------ diff --git a/GraphBLAS/Test/accum_mask.m b/GraphBLAS/Test/accum_mask.m index 327c1d4d3f..7af684d1b4 100644 --- a/GraphBLAS/Test/accum_mask.m +++ b/GraphBLAS/Test/accum_mask.m @@ -1,5 +1,9 @@ function C = accum_mask (C, Mask, accum, T, C_replace, Mask_complement) %ACCUM_MASK apply the mask + +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. +% http://suitesparse.com See GraphBLAS/Doc/License.txt for license. + [m n] = size (C.matrix) ; Z.matrix = zeros (m, n) ; Z.pattern = false (m, n) ; diff --git a/GraphBLAS/Test/accum_mask2.m b/GraphBLAS/Test/accum_mask2.m index af8235036d..46e22eda18 100644 --- a/GraphBLAS/Test/accum_mask2.m +++ b/GraphBLAS/Test/accum_mask2.m @@ -4,7 +4,7 @@ % The purpose is for illustration to describe what the accum/mask operation % does, not for actual testing. This file appears in the User Guide. -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. [nrows ncols] = size (C.matrix) ; diff --git a/GraphBLAS/Test/debug_off.m b/GraphBLAS/Test/debug_off.m index c6aa9b9cff..c71f2edef2 100644 --- a/GraphBLAS/Test/debug_off.m +++ b/GraphBLAS/Test/debug_off.m @@ -1,7 +1,7 @@ function debug_off %DEBUG_OFF turn off malloc debugging -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. global GraphBLAS_debug diff --git a/GraphBLAS/Test/debug_on.m b/GraphBLAS/Test/debug_on.m index db5260036f..f86a4c54f5 100644 --- a/GraphBLAS/Test/debug_on.m +++ b/GraphBLAS/Test/debug_on.m @@ -1,7 +1,7 @@ function debug_on %DEBUG_ON turn on malloc debugging -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. global GraphBLAS_debug diff --git a/GraphBLAS/Test/gbmake.m b/GraphBLAS/Test/gbmake.m index 06ab8f655c..32fe09a189 100644 --- a/GraphBLAS/Test/gbmake.m +++ b/GraphBLAS/Test/gbmake.m @@ -25,7 +25,7 @@ function gbmake (what, flags, mexfunctions, cfiles, hfiles, inc) % GraphBLAS requires an ANSI C11 compliant compiler. On the Mac, clang 8.0 % suffices. GCC should be version 4.9.3 or later -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. if (~isempty (strfind (pwd, 'Tcov')) && nargin ~= 6) @@ -37,6 +37,7 @@ function gbmake (what, flags, mexfunctions, cfiles, hfiles, inc) if (nargin < 2) flags = '-O' ; + % flags = '-g' ; end flags = [flags ' -largeArrayDims'] ; diff --git a/GraphBLAS/Test/irand.m b/GraphBLAS/Test/irand.m index 08aa9653dd..d27dffced8 100644 --- a/GraphBLAS/Test/irand.m +++ b/GraphBLAS/Test/irand.m @@ -7,7 +7,7 @@ % % I = irand (imin, imax, m, n) -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. if (nargin < 4) diff --git a/GraphBLAS/Test/logstat.m b/GraphBLAS/Test/logstat.m index 39d7340920..d0ed91ec1d 100644 --- a/GraphBLAS/Test/logstat.m +++ b/GraphBLAS/Test/logstat.m @@ -1,7 +1,7 @@ function logstat (testscript) %LOGSTAT run a GraphBLAS test and log the results to log.txt -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. [debug, compact, malloc, covered] = GB_mex_debug ; diff --git a/GraphBLAS/Test/runtest.m b/GraphBLAS/Test/runtest.m index 9619d64e47..6627197e93 100644 --- a/GraphBLAS/Test/runtest.m +++ b/GraphBLAS/Test/runtest.m @@ -1,7 +1,7 @@ function runtest (testscript) %RUNTEST run a single GraphBLAS test -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. eval (testscript) ; diff --git a/GraphBLAS/Test/stat.m b/GraphBLAS/Test/stat.m index 6be3dcb1df..52f9f2be2d 100644 --- a/GraphBLAS/Test/stat.m +++ b/GraphBLAS/Test/stat.m @@ -1,7 +1,7 @@ function stat %STAT report status of statement coverage and malloc debugging -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. global GraphBLAS_debug GraphBLAS_gbcov diff --git a/GraphBLAS/Test/test00.m b/GraphBLAS/Test/test00.m index e3a1ef5ce4..4b7836a829 100644 --- a/GraphBLAS/Test/test00.m +++ b/GraphBLAS/Test/test00.m @@ -1,7 +1,7 @@ function test00 %TEST00 test GB_mex_mis -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. rng ('default') ; diff --git a/GraphBLAS/Test/test01.m b/GraphBLAS/Test/test01.m index 50d3cb1ef2..3d9f4ff558 100644 --- a/GraphBLAS/Test/test01.m +++ b/GraphBLAS/Test/test01.m @@ -1,7 +1,7 @@ function test01 %TEST01 test GraphBLAS error handling -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. GB_mex_about ; diff --git a/GraphBLAS/Test/test02.m b/GraphBLAS/Test/test02.m index 98bf58f9d5..3a3add997b 100644 --- a/GraphBLAS/Test/test02.m +++ b/GraphBLAS/Test/test02.m @@ -1,7 +1,7 @@ function test02 %TEST02 test GrB_*_dup -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. [mult_ops unary_ops add_ops classes semirings] = GB_spec_opsall ; diff --git a/GraphBLAS/Test/test03.m b/GraphBLAS/Test/test03.m index bbd0cbb75a..307d7636c2 100644 --- a/GraphBLAS/Test/test03.m +++ b/GraphBLAS/Test/test03.m @@ -1,7 +1,7 @@ function test03 %TEST03 test GB_check functions -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. [mult_ops unary_ops add_ops classes semirings] = GB_spec_opsall ; diff --git a/GraphBLAS/Test/test04.m b/GraphBLAS/Test/test04.m index 0fb7d38cea..b594424a58 100644 --- a/GraphBLAS/Test/test04.m +++ b/GraphBLAS/Test/test04.m @@ -1,7 +1,7 @@ function test04 %TEST04 test and demo for accumulator/mask and transpose -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. fprintf ('\n-------------------- simple mask and transpose tests\n') ; diff --git a/GraphBLAS/Test/test05.m b/GraphBLAS/Test/test05.m index a5f1414146..fa0002e2ee 100644 --- a/GraphBLAS/Test/test05.m +++ b/GraphBLAS/Test/test05.m @@ -1,7 +1,7 @@ function test05 %TEST05 test GrB_*_setElement -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. A = sparse (5,5) ; diff --git a/GraphBLAS/Test/test06.m b/GraphBLAS/Test/test06.m index f9220370fa..09b69fde79 100644 --- a/GraphBLAS/Test/test06.m +++ b/GraphBLAS/Test/test06.m @@ -7,7 +7,7 @@ function test06 (A,B) % matrix id number from the SuiteSparse collection otherwise A is the sparse % matrix to use in the test -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. fprintf ('\n-------------- GrB_mxm on all semirings\n') ; diff --git a/GraphBLAS/Test/test07.m b/GraphBLAS/Test/test07.m index e31b37eb07..18b5d9da07 100644 --- a/GraphBLAS/Test/test07.m +++ b/GraphBLAS/Test/test07.m @@ -1,7 +1,7 @@ function test07 %TEST07 test GxB_subassign with a single pending tuple -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. % adds a single pending tuple diff --git a/GraphBLAS/Test/test07b.m b/GraphBLAS/Test/test07b.m index 876ad24449..970672b0a3 100644 --- a/GraphBLAS/Test/test07b.m +++ b/GraphBLAS/Test/test07b.m @@ -1,7 +1,7 @@ function test07b %TEST07B test GrB_assign with a single pending tuple -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. % adds a single pending tuple diff --git a/GraphBLAS/Test/test08.m b/GraphBLAS/Test/test08.m index 9573400dd9..fc517214c7 100644 --- a/GraphBLAS/Test/test08.m +++ b/GraphBLAS/Test/test08.m @@ -1,7 +1,7 @@ function test08 %TEST08 test GxB_subassign -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. rng ('default') ; diff --git a/GraphBLAS/Test/test08b.m b/GraphBLAS/Test/test08b.m index 03a9bb307d..7f82e9ee94 100644 --- a/GraphBLAS/Test/test08b.m +++ b/GraphBLAS/Test/test08b.m @@ -1,7 +1,7 @@ function test08b %TEST08B test GrB_assign -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. rng ('default') ; diff --git a/GraphBLAS/Test/test09.m b/GraphBLAS/Test/test09.m index 2911c61abb..4db7306bec 100644 --- a/GraphBLAS/Test/test09.m +++ b/GraphBLAS/Test/test09.m @@ -1,7 +1,7 @@ function test09 %TEST09 test GxB_subassign -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. fprintf ('\n-----------duplicate I,J test of GB_mex_subassign\n') ; diff --git a/GraphBLAS/Test/test09b.m b/GraphBLAS/Test/test09b.m index 1aa85961cc..5970c7cbca 100644 --- a/GraphBLAS/Test/test09b.m +++ b/GraphBLAS/Test/test09b.m @@ -1,7 +1,7 @@ function test09b %TEST09B test GrB_assign -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. fprintf ('\n-----------duplicate I,J test of GB_mex_assign\n') ; diff --git a/GraphBLAS/Test/test10.m b/GraphBLAS/Test/test10.m index 31a9f984ef..e3095d5b0f 100644 --- a/GraphBLAS/Test/test10.m +++ b/GraphBLAS/Test/test10.m @@ -1,7 +1,7 @@ function test10 %TEST10 test GrB_apply -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. fprintf ('\nquick GrB_apply tests\n') ; @@ -13,6 +13,7 @@ m = 8 ; n = 4 ; dt = struct ('inp0', 'tran') ; +dr = struct ('outp', 'replace') ; for k1 = 1:length(classes) aclass = classes {k1} ; @@ -51,6 +52,16 @@ C2 = GB_mex_apply (Cin, Mask, 'plus', op, A, []) ; GB_spec_compare (C1, C2) ; + % with C == mask, and outp = replace + C1 = GB_spec_apply (Cin, Cin.pattern, [], op, A, dr) ; + C2 = GB_mex_apply2 (Cin, [], op, A, dr) ; + GB_spec_compare (C1, C2) ; + + % with C == mask and accum, and outp = replace + C1 = GB_spec_apply (Cin, Cin.pattern, 'plus', op, A, dr) ; + C2 = GB_mex_apply2 (Cin, 'plus', op, A, dr) ; + GB_spec_compare (C1, C2) ; + % no mask, transpose C1 = GB_spec_apply (Cin, [], [], op, B, dt) ; C2 = GB_mex_apply (Cin, [], [], op, B, dt) ; diff --git a/GraphBLAS/Test/test11.m b/GraphBLAS/Test/test11.m index 801a9b7fdc..abf6224c0b 100644 --- a/GraphBLAS/Test/test11.m +++ b/GraphBLAS/Test/test11.m @@ -1,7 +1,7 @@ function test11 %TEST11 test GrB_*_extractTuples -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. fprintf ('\n ------------ testing GrB_extractTuples\n') ; diff --git a/GraphBLAS/Test/test12.m b/GraphBLAS/Test/test12.m index fa17d19273..cd1d06ad14 100644 --- a/GraphBLAS/Test/test12.m +++ b/GraphBLAS/Test/test12.m @@ -6,7 +6,7 @@ function test12 (cover) % if cover=1, do quick statement coverage tests % if cover=0, run larger problems -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. if (nargin < 1) @@ -30,14 +30,14 @@ function test12 (cover) fprintf ('\nWathen matrices:\n') ; -if (debug) - - fprintf ('Wathen test skipped when GraphBLAS compiled with NDEBUG\n') ; +% if (debug) +% fprintf ('Wathen test skipped when GraphBLAS compiled with NDEBUG\n') ; +% else -else - - for nx = 1:20 - for ny = 1:20 + for nx = [1 5 10] % 1:20 + fprintf ('%d:', nx) ; + for ny = [1 5 10] % 1:20 + fprintf ('%d', ny) ; for scale = 0:1 % reset the random number generator so RHO can be found @@ -47,6 +47,7 @@ function test12 (cover) A = gallery ('wathen' ,nx, ny, scale) ; anorm = norm (A,1) ; for method = 0:3 + fprintf ('.') ; B = GB_mex_wathen (nx, ny, method, scale, rho) ; assert (norm (A-B,1) < 16 * eps (norm (A,1))) ; end @@ -82,7 +83,7 @@ function test12 (cover) end end -end +% end fprintf ('test12: all tests passed\n') ; diff --git a/GraphBLAS/Test/test13.m b/GraphBLAS/Test/test13.m index 72ea86cefa..a0be5f70f8 100644 --- a/GraphBLAS/Test/test13.m +++ b/GraphBLAS/Test/test13.m @@ -1,7 +1,7 @@ function test13 %TEST13 test GrB_tranpsose -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. cinclass = 'int16' ; diff --git a/GraphBLAS/Test/test14.m b/GraphBLAS/Test/test14.m index bb651f4be3..eb3225f3dc 100644 --- a/GraphBLAS/Test/test14.m +++ b/GraphBLAS/Test/test14.m @@ -1,7 +1,7 @@ function test14 %TEST14 test GrB_reduce -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. fprintf ('\nreduce to column and scalar\n') ; diff --git a/GraphBLAS/Test/test15.m b/GraphBLAS/Test/test15.m index 30944218f0..d6a8e43d2d 100644 --- a/GraphBLAS/Test/test15.m +++ b/GraphBLAS/Test/test15.m @@ -1,7 +1,7 @@ function test15 %TEST15 test AxB and AdotB internal functions -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. fprintf ('\n --------------------- GB_mex_AxB, GB_mex_AdotB tests\n') ; diff --git a/GraphBLAS/Test/test16.m b/GraphBLAS/Test/test16.m index 207ad073c1..6609181db3 100644 --- a/GraphBLAS/Test/test16.m +++ b/GraphBLAS/Test/test16.m @@ -1,7 +1,7 @@ function test16 %TEST16 test user-defined complex type (runs all testc*.m) -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. % all complex matrix tests diff --git a/GraphBLAS/Test/test17.m b/GraphBLAS/Test/test17.m index f9a2ff73e0..a9d8ca7037 100644 --- a/GraphBLAS/Test/test17.m +++ b/GraphBLAS/Test/test17.m @@ -1,7 +1,7 @@ function test17 %TEST17 test GrB_*_extractElement -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. fprintf ('\n ------------ testing GrB_extractElement\n') ; diff --git a/GraphBLAS/Test/test18.m b/GraphBLAS/Test/test18.m index c9a26f3fdd..f08ca1d3d5 100644 --- a/GraphBLAS/Test/test18.m +++ b/GraphBLAS/Test/test18.m @@ -1,7 +1,7 @@ function test18(fulltest) %TEST18 test GrB_eWiseAdd and GrB_eWiseMult -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. if (nargin < 1) diff --git a/GraphBLAS/Test/test19.m b/GraphBLAS/Test/test19.m index 3f201a62db..ae433daed0 100644 --- a/GraphBLAS/Test/test19.m +++ b/GraphBLAS/Test/test19.m @@ -1,7 +1,7 @@ function test19(fulltest) %TEST19 test GxB_subassign and GrB_*_setElement with many pending operations -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. if (nargin < 1) diff --git a/GraphBLAS/Test/test19b.m b/GraphBLAS/Test/test19b.m index ca49b9d8c7..3822fcd527 100644 --- a/GraphBLAS/Test/test19b.m +++ b/GraphBLAS/Test/test19b.m @@ -1,7 +1,7 @@ function test19b(fulltest) %TEST19B test GrB_assign and GrB_*_setElement with many pending operations -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. fprintf ('\nGrB_assign and setElement test, many pending computations\n') ; diff --git a/GraphBLAS/Test/test20.m b/GraphBLAS/Test/test20.m index 48c4687623..193385ec19 100644 --- a/GraphBLAS/Test/test20.m +++ b/GraphBLAS/Test/test20.m @@ -1,7 +1,7 @@ function test20(fulltest) %TEST20 test GrB_mxm, mxv, and vxm -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. tic diff --git a/GraphBLAS/Test/test21.m b/GraphBLAS/Test/test21.m index 5fdbfd3c5a..b480ac34a7 100644 --- a/GraphBLAS/Test/test21.m +++ b/GraphBLAS/Test/test21.m @@ -1,7 +1,7 @@ function test21(fulltest) %TEST21 test GxB_subassign -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. if (nargin < 1) diff --git a/GraphBLAS/Test/test21b.m b/GraphBLAS/Test/test21b.m index 81dabfb914..4526f77555 100644 --- a/GraphBLAS/Test/test21b.m +++ b/GraphBLAS/Test/test21b.m @@ -1,7 +1,7 @@ function test21b %TEST21B test GrB_assign -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. fprintf ('\n--------------exhaustive test of GB_mex_assign\n') ; diff --git a/GraphBLAS/Test/test22.m b/GraphBLAS/Test/test22.m index 0384f7cb87..af38716d2f 100644 --- a/GraphBLAS/Test/test22.m +++ b/GraphBLAS/Test/test22.m @@ -1,7 +1,7 @@ function test22(fulltest) %TEST22 test GrB_transpose -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. if (nargin < 1) diff --git a/GraphBLAS/Test/test23.m b/GraphBLAS/Test/test23.m index 6add9f22f5..64b0adedd1 100644 --- a/GraphBLAS/Test/test23.m +++ b/GraphBLAS/Test/test23.m @@ -1,7 +1,7 @@ function test23(fulltest) %TEST23 test GrB_*_build -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. if (nargin < 1) diff --git a/GraphBLAS/Test/test24.m b/GraphBLAS/Test/test24.m index ec5ce4b9c4..9616dcc9c8 100644 --- a/GraphBLAS/Test/test24.m +++ b/GraphBLAS/Test/test24.m @@ -2,7 +2,7 @@ function test24(fulltest) %TEST24 test GrB_reduce % test24(fulltest); fulltest=1 if longer test, 0 for quick test -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. if (nargin < 1) diff --git a/GraphBLAS/Test/test25.m b/GraphBLAS/Test/test25.m index eb39086d97..4c24a2424f 100644 --- a/GraphBLAS/Test/test25.m +++ b/GraphBLAS/Test/test25.m @@ -1,7 +1,7 @@ function test25 %TEST25 test GxB_select -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. fprintf ('\nquick GxB_select tests\n') ; diff --git a/GraphBLAS/Test/test26.m b/GraphBLAS/Test/test26.m index 468095b1fd..44558d363e 100644 --- a/GraphBLAS/Test/test26.m +++ b/GraphBLAS/Test/test26.m @@ -1,7 +1,7 @@ function test26(longtests) %TEST26 performance test for GxB_select -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. fprintf ('\nperformance of GxB_select\n') ; diff --git a/GraphBLAS/Test/test27.m b/GraphBLAS/Test/test27.m index 24ace77ea4..3f5ab3ba15 100644 --- a/GraphBLAS/Test/test27.m +++ b/GraphBLAS/Test/test27.m @@ -1,6 +1,9 @@ function test27 %TEST27 test GxB_select with user-defined select op (band) +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. +% http://suitesparse.com See GraphBLAS/Doc/License.txt for license. + fprintf ('test 27: GxB_select with user-defined op (band)\n') ; for m = 1:10 diff --git a/GraphBLAS/Test/test28.m b/GraphBLAS/Test/test28.m index b8bfbcc77e..5221b4fa13 100644 --- a/GraphBLAS/Test/test28.m +++ b/GraphBLAS/Test/test28.m @@ -1,7 +1,7 @@ function test28 %TEST28 test mxm with aliased inputs, C = accum(C,C*C) -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. rng ('default') ; diff --git a/GraphBLAS/Test/test29.m b/GraphBLAS/Test/test29.m index 7ae8914c7c..4b85f1d3fc 100644 --- a/GraphBLAS/Test/test29.m +++ b/GraphBLAS/Test/test29.m @@ -1,6 +1,9 @@ function test29 %TEST29 GrB_reduce with zombies +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. +% http://suitesparse.com See GraphBLAS/Doc/License.txt for license. + fprintf ('\n------------------------- GrB_reduce with zombies\n') ; [accum_ops unary_ops add_ops classes] = GB_spec_opsall ; diff --git a/GraphBLAS/Test/test30.m b/GraphBLAS/Test/test30.m index 637e8e2bd1..7bc1149c21 100644 --- a/GraphBLAS/Test/test30.m +++ b/GraphBLAS/Test/test30.m @@ -1,7 +1,7 @@ function test30 %TEST30 test GxB_subassign -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. %% this test is too slow when debugging diff --git a/GraphBLAS/Test/test30b.m b/GraphBLAS/Test/test30b.m index 3beac3f70d..6d9bbb9e66 100644 --- a/GraphBLAS/Test/test30b.m +++ b/GraphBLAS/Test/test30b.m @@ -1,7 +1,7 @@ function test30b %TEST30B test GrB_assign -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. %% this test is too slow when debugging diff --git a/GraphBLAS/Test/test31.m b/GraphBLAS/Test/test31.m index 0ed3285629..07f943424f 100644 --- a/GraphBLAS/Test/test31.m +++ b/GraphBLAS/Test/test31.m @@ -1,7 +1,7 @@ function test31 %TEST31 test GrB_transpose -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. fprintf ('\n------------------- simple tests of GB_mex_transpose\n') ; diff --git a/GraphBLAS/Test/test32.m b/GraphBLAS/Test/test32.m index 3b8e5d70a4..9957a34b6d 100644 --- a/GraphBLAS/Test/test32.m +++ b/GraphBLAS/Test/test32.m @@ -1,7 +1,7 @@ function test32 %TEST32 test GrB_mxm -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. fprintf ('\n----- quick test for GB_mex_mxm\n') ; diff --git a/GraphBLAS/Test/test33.m b/GraphBLAS/Test/test33.m index d9e4598f65..b66aed73e4 100644 --- a/GraphBLAS/Test/test33.m +++ b/GraphBLAS/Test/test33.m @@ -1,7 +1,7 @@ function test33 %TEST33 test a semiring -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. semiring = struct ( ... diff --git a/GraphBLAS/Test/test34.m b/GraphBLAS/Test/test34.m index a53e6c7381..5a35d29465 100644 --- a/GraphBLAS/Test/test34.m +++ b/GraphBLAS/Test/test34.m @@ -1,7 +1,7 @@ function test34 %TEST34 test GrB_eWiseAdd -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. fprintf ('\n----- quick test for GB_mex_eWiseAdd_Matrix\n') ; diff --git a/GraphBLAS/Test/test35.m b/GraphBLAS/Test/test35.m index 4270b3ea49..8c370df612 100644 --- a/GraphBLAS/Test/test35.m +++ b/GraphBLAS/Test/test35.m @@ -1,7 +1,7 @@ function test35 %TEST35 test GrB_*_extractTuples -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. fprintf ('\n ---------------------- quick test of GrB_extractTuples\n') ; diff --git a/GraphBLAS/Test/test36.m b/GraphBLAS/Test/test36.m index e6e5dc63db..ade2471277 100644 --- a/GraphBLAS/Test/test36.m +++ b/GraphBLAS/Test/test36.m @@ -1,7 +1,7 @@ function test36 %TEST36 test matrix subref -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. fprintf ('\n---------------------------- performance of GB_Matrix_subref\n') ; diff --git a/GraphBLAS/Test/test37.m b/GraphBLAS/Test/test37.m index 36789311ea..92fa7edfbe 100644 --- a/GraphBLAS/Test/test37.m +++ b/GraphBLAS/Test/test37.m @@ -1,7 +1,7 @@ function test37 %TEST37 test qsort -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. fprintf ('\n------------ testing GB_mex_qsort performance\n') ; diff --git a/GraphBLAS/Test/test38.m b/GraphBLAS/Test/test38.m index 2a3f18594a..63ce77a955 100644 --- a/GraphBLAS/Test/test38.m +++ b/GraphBLAS/Test/test38.m @@ -1,7 +1,7 @@ function test38 %TEST38 test GrB_transpose -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. fprintf ('\n ----------- testing GB_mex_transpose on SuiteSparse matrices\n') ; diff --git a/GraphBLAS/Test/test39.m b/GraphBLAS/Test/test39.m index 380ba34306..30a3967979 100644 --- a/GraphBLAS/Test/test39.m +++ b/GraphBLAS/Test/test39.m @@ -1,7 +1,7 @@ function test39 %TEST39 test GrB_transpose performance -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. fprintf ('\n performance tests : GrB_transpose \n') ; diff --git a/GraphBLAS/Test/test40.m b/GraphBLAS/Test/test40.m index 43ab4ced94..0a7e5c520f 100644 --- a/GraphBLAS/Test/test40.m +++ b/GraphBLAS/Test/test40.m @@ -1,7 +1,7 @@ function test40 %TEST40 test GrB_Matrix_extractElement -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. fprintf ('\n ------ quick test of GrB_Matrix_extractElement\n') ; diff --git a/GraphBLAS/Test/test41.m b/GraphBLAS/Test/test41.m index 24d5716b37..55c4203ff5 100644 --- a/GraphBLAS/Test/test41.m +++ b/GraphBLAS/Test/test41.m @@ -1,7 +1,7 @@ function test41 %TEST41 test AxB symbolic -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. fprintf ('\n -------------- simple GB_mex_AxB symbolic and numeric tests\n') ; diff --git a/GraphBLAS/Test/test42.m b/GraphBLAS/Test/test42.m index 4f0e035e05..47168fe9fe 100644 --- a/GraphBLAS/Test/test42.m +++ b/GraphBLAS/Test/test42.m @@ -1,7 +1,7 @@ function test42 %TEST42 test GrB_Matrix_build -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. fprintf ('\n----------------------- performance tests for GrB_Matrix_build\n') ; diff --git a/GraphBLAS/Test/test43.m b/GraphBLAS/Test/test43.m index e9fb28f4c7..21f8577092 100644 --- a/GraphBLAS/Test/test43.m +++ b/GraphBLAS/Test/test43.m @@ -1,7 +1,7 @@ function test43 %TEST43 test subref -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. fprintf ('\n------------------------------ testing GB_mex_Matrix_subref\n') ; diff --git a/GraphBLAS/Test/test44.m b/GraphBLAS/Test/test44.m index 61f10ab9d7..46b979a19e 100644 --- a/GraphBLAS/Test/test44.m +++ b/GraphBLAS/Test/test44.m @@ -1,7 +1,7 @@ function test44 %TEST44 test qsort -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. fprintf ('\n------------------------------------- qsort tests\n') ; diff --git a/GraphBLAS/Test/test45.m b/GraphBLAS/Test/test45.m index 6a0308808a..61eebbce31 100644 --- a/GraphBLAS/Test/test45.m +++ b/GraphBLAS/Test/test45.m @@ -1,7 +1,7 @@ function test45 %TEST45 test GrB_*_setElement and GrB_*_*build -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. fprintf ('\n------------------ testing GrB_setElement and _build\n') ; diff --git a/GraphBLAS/Test/test46.m b/GraphBLAS/Test/test46.m index 5d231b609d..65d7de326b 100644 --- a/GraphBLAS/Test/test46.m +++ b/GraphBLAS/Test/test46.m @@ -1,7 +1,7 @@ function test46 %TEST46 performance test of GxB_subassign -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. fprintf ('\n--------------performance test GB_mex_subassign\n') ; @@ -61,15 +61,20 @@ Prob = ssget (2662) ; A = Prob.A ; +% n = 2^21 ; A = A (1:n,1:n) ; +% A = A (:) ; +% A = [A A] ; C = A ; C (1,1) = 1 ; [m n] = size (A) ; -ni = 5500 ; -nj = 7000 ; +ni = min (size (A, 1), 5500) ; +nj = min (size (A, 2), 7000) ; B = sprandn (ni, nj, 0.001) ; -I = randperm (m) ; I = I (1:ni) ; -J = randperm (n) ; J = J (1:nj) ; +% I = randperm (m) ; I = I (1:ni) ; +% J = randperm (n) ; J = J (1:nj) ; +I = randperm (m,ni) ; +J = randperm (n,nj) ; fprintf ('nnzB: %g\n', nnz (B)) ; fprintf ('MATLAB start:\n') @@ -91,6 +96,9 @@ assert (isequal (C, C3.matrix)) ; A = Prob.A ; +% A = A (:) ; +% A = [A A] ; +% n = 2^21 ; A = A (1:n,1:n) ; C = A ; C (1,1) = 1 ; diff --git a/GraphBLAS/Test/test46b.m b/GraphBLAS/Test/test46b.m index df8705f958..a477801331 100644 --- a/GraphBLAS/Test/test46b.m +++ b/GraphBLAS/Test/test46b.m @@ -1,7 +1,7 @@ function test46b %TEST46B performance test of GrB_assign -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. fprintf ('\n--------------performance test GB_mex_assign\n') ; diff --git a/GraphBLAS/Test/test47.m b/GraphBLAS/Test/test47.m index 8bbd8fea1e..51dc56ca9f 100644 --- a/GraphBLAS/Test/test47.m +++ b/GraphBLAS/Test/test47.m @@ -1,7 +1,7 @@ function test47 %TEST47 prformance test of GrB_vxm -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. d = struct ('inp1', 'tran', 'inp0', 'tran') ; diff --git a/GraphBLAS/Test/test48.m b/GraphBLAS/Test/test48.m index 33f06474a5..023f0f3a31 100644 --- a/GraphBLAS/Test/test48.m +++ b/GraphBLAS/Test/test48.m @@ -1,7 +1,7 @@ function test48 %TEST48 test GrB_mxm -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. d = struct ('inp1', 'tran', 'inp0', 'tran') ; diff --git a/GraphBLAS/Test/test49.m b/GraphBLAS/Test/test49.m index 27b8240e24..80cf01cf86 100644 --- a/GraphBLAS/Test/test49.m +++ b/GraphBLAS/Test/test49.m @@ -1,7 +1,7 @@ function test49 %TEST49 performance test of GrB_mxm (dot product method, A'*B) -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. d = struct ('inp0', 'tran') ; diff --git a/GraphBLAS/Test/test50.m b/GraphBLAS/Test/test50.m index 91fce1822f..adc4161ccd 100644 --- a/GraphBLAS/Test/test50.m +++ b/GraphBLAS/Test/test50.m @@ -1,7 +1,7 @@ function test50 %TEST50 test AxB numeric and symbolic -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. fprintf ('\n----------------------------- GB_mex_AxB numeric and symbolic\n') ; diff --git a/GraphBLAS/Test/test51.m b/GraphBLAS/Test/test51.m index 23c0b35fce..a35294c996 100644 --- a/GraphBLAS/Test/test51.m +++ b/GraphBLAS/Test/test51.m @@ -1,7 +1,7 @@ function test51 %TEST51 test GxB_subassign, multiply operations -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. fprintf ('\n-----------performance test GB_mex_subassign, multiple ops\n') ; diff --git a/GraphBLAS/Test/test51b.m b/GraphBLAS/Test/test51b.m index cb96e37658..645b33d729 100644 --- a/GraphBLAS/Test/test51b.m +++ b/GraphBLAS/Test/test51b.m @@ -1,7 +1,7 @@ function test51b %TEST51B test GrB_assign, multiply operations -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. fprintf ('\n-----------performance test GB_mex_assign, multiple ops\n') ; diff --git a/GraphBLAS/Test/test52.m b/GraphBLAS/Test/test52.m index dcdb93db52..e0e40edb91 100644 --- a/GraphBLAS/Test/test52.m +++ b/GraphBLAS/Test/test52.m @@ -1,7 +1,7 @@ function test52 %TEST52 test AdotB vs AxB -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. fprintf ('\n----------------------- AdotB versus AxB\n') ; @@ -45,14 +45,26 @@ end end +relwork = [ ] ; +reltime = [ ] ; + k = 10e6 ; fprintf ('\nbuilding random sparse matrices %d by M\n', k) ; -for m = [1:8 10:2:20 50 100 500 1000 3000] - A = sprandn (k, m, 0.1) ; - B = sprandn (k, m, 0.1) ; - Mask = spones (sprandn (m, m, 0.5)) ; - A (:,m) = sparse (rand (k,1)) ; - B (:,m) = sparse (rand (k,1)) ; +for m = [1 10 20:10:60 61:65 70:10:100] +fprintf ('\n') ; +for n = [1 10 20:10:60 61:65 70:10:100] + + d = 0.001 ; + A = sprandn (k, m, d) ; + B = sprandn (k, n, d) ; + Mask = spones (sprandn (m, n, 0.5)) ; + % A (:,m) = sparse (rand (k,1)) ; + % B (:,m) = sparse (rand (k,1)) ; + + cwork = m*n ; + awork = min (nnz(A) + k + m, nnz(B) + k + n) ; + + relwork = [relwork cwork/awork] ; % fprintf ('MATLAB:\n') ; tic @@ -69,13 +81,24 @@ C4 = GB_mex_AxB (A,B, true) ; t4 = toc ; + % fprintf ('GrB A''*B native:\n') ; + tic + C5 = GB_mex_AxB (A',B) ; + t5 = toc ; + + reltime = [reltime t2/t5] ; + fprintf (... - 'm %2d MATLAB: %10.4f AdotB : %10.4f GB,auto:: %10.4f', ... - m, t1, t2, t4) ; - fprintf (' speedup: %10.4f (no Mask)\n', t1/t4) ; +'m %3d n %3d %10.2e MATLAB: %10.4f AdotB : %10.4f GB,auto:: %10.4f outer %10.4f', ... + m, n, cwork/awork, t1, t2, t4, t5) ; + % fprintf (' speedup: %10.4f (no Mask)\n', t2/t5) ; + fprintf (' rel: %10.4f\n', t2/t5) ; assert (isequal (C, C2)) ; assert (isequal (C, C4)) ; + assert (isequal (C, C5)) ; + + %{ % fprintf ('MATLAB:\n') ; tic @@ -92,15 +115,25 @@ C4 = Mask .* GB_mex_AxB (A,B, true) ; t4 = toc ; + % fprintf ('GrB A''*B native:\n') ; + tic + C5 = Mask .* GB_mex_AxB (A',B) ; + t5 = toc ; + fprintf (... - 'm %2d MATLAB: %10.4f AdotB : %10.4f GB,auto:: %10.4f', ... - m, t1, t2, t4) ; + 'm %2d MATLAB: %10.4f AdotB : %10.4f GB,auto:: %10.4f outer %10.4f', ... + m, t1, t2, t4, t5) ; fprintf (' speedup: %10.4f (with Mask)\n', t1/t4) ; assert (isequal (C, C2)) ; assert (isequal (C, C4)) ; + %} + + loglog (relwork, reltime, 'o') ; + drawnow end +end k = 30e6 fprintf ('building random sparse matrix, %d by %d\n', k,2) ; @@ -189,6 +222,11 @@ y3 = GB_mex_AxB (A,x, true) ; toc +fprintf ('GrB (A'')xB outer:\n') ; +tic +y3 = GB_mex_AxB (A',x) ; +toc + assert (isequal (y1, sparse (y0))) ; assert (isequal (y1, y2)) ; assert (isequal (y1, y3)) ; @@ -215,6 +253,11 @@ y3 = GB_mex_AxB (x, A, true) ; toc +fprintf ('GrB (A''B outer:\n') ; +tic +y3 = GB_mex_AxB (x', A) ; +toc + assert (isequal (y1, sparse (y0))) ; assert (isequal (y1, y2)) ; assert (isequal (y1, y3)) ; @@ -239,5 +282,33 @@ assert (isequal (y1, sparse (y0))) ; assert (isequal (y1, y3)) ; + +fprintf ('\nA''*x where A is big and x is a very sparse vector\n') ; +x = sprandn (n,1, 0.0001) ; + +fprintf ('MATLAB: x sparse:\n') ; +tic +y1 = A'*x ; +toc + +fprintf ('GrB AdotB:\n') ; +tic +y2 = GB_mex_AdotB (A,x) ; +toc + +fprintf ('GrB A''xB auto select:\n') ; +tic +y3 = GB_mex_AxB (A,x, true) ; +toc + +fprintf ('GrB (A'')xB outer:\n') ; +tic +y3 = GB_mex_AxB (A',x) ; +toc + +assert (isequal (y1, y2)) ; +assert (isequal (y1, y3)) ; + + fprintf ('\ntest52: all tests passed\n') ; diff --git a/GraphBLAS/Test/test53.m b/GraphBLAS/Test/test53.m index 3f6dde0d2b..3794d56607 100644 --- a/GraphBLAS/Test/test53.m +++ b/GraphBLAS/Test/test53.m @@ -1,7 +1,7 @@ function test53 %TEST53 test GrB_Matrix_extract -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. fprintf ('\n==== exhaustive test for GrB_Matrix_extract:\n') ; diff --git a/GraphBLAS/Test/test54.m b/GraphBLAS/Test/test54.m index 4bb4b994b1..a8a909e2f0 100644 --- a/GraphBLAS/Test/test54.m +++ b/GraphBLAS/Test/test54.m @@ -1,7 +1,7 @@ function test54 %TEST54 test AxB, qsort vs bucket sort -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. fprintf ('\n======================= qsort vs C transpose for C=A*B\n') ; diff --git a/GraphBLAS/Test/test55.m b/GraphBLAS/Test/test55.m index 55852f314a..1c1cfa7c64 100644 --- a/GraphBLAS/Test/test55.m +++ b/GraphBLAS/Test/test55.m @@ -1,7 +1,7 @@ function test55 %TEST55 test GxB_subassign, illustrate duplicate indices, MATLAB vs GraphBLAS -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. % MATLAB and GraphBLAS differ on how repeated indices are handled diff --git a/GraphBLAS/Test/test55b.m b/GraphBLAS/Test/test55b.m index c1563cfa70..5cb68dca9a 100644 --- a/GraphBLAS/Test/test55b.m +++ b/GraphBLAS/Test/test55b.m @@ -1,7 +1,7 @@ function test55b %TEST55B test GrB_assign, illustrate duplicate indices, MATLAB vs GraphBLAS -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. % MATLAB and GraphBLAS differ on how repeated indices are handled diff --git a/GraphBLAS/Test/test56.m b/GraphBLAS/Test/test56.m index 445ec7fd7b..41f1110311 100644 --- a/GraphBLAS/Test/test56.m +++ b/GraphBLAS/Test/test56.m @@ -1,7 +1,7 @@ function test56 %TEST56 test GrB_*_build -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. op.opname = 'min' diff --git a/GraphBLAS/Test/test57.m b/GraphBLAS/Test/test57.m index 633d532535..71c1c577b8 100644 --- a/GraphBLAS/Test/test57.m +++ b/GraphBLAS/Test/test57.m @@ -5,7 +5,7 @@ function test57 (op) % test57(op) % test57 % Default op is 'max' if no arguments given -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. if (nargin < 1) diff --git a/GraphBLAS/Test/test58.m b/GraphBLAS/Test/test58.m index 2a51e71631..156993bfb4 100644 --- a/GraphBLAS/Test/test58.m +++ b/GraphBLAS/Test/test58.m @@ -1,7 +1,7 @@ function test58 (cover) %TEST58 test GrB_eWiseAdd -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. if (nargin < 1) diff --git a/GraphBLAS/Test/test59.m b/GraphBLAS/Test/test59.m index 9969f75343..840aaf3c9e 100644 --- a/GraphBLAS/Test/test59.m +++ b/GraphBLAS/Test/test59.m @@ -1,7 +1,7 @@ function test59 %TEST59 test GrB_mxm -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. fprintf ('\n----- quick test for GB_mex_mxm\n') ; diff --git a/GraphBLAS/Test/test60.m b/GraphBLAS/Test/test60.m index 1b3d42f248..fad9ad8b20 100644 --- a/GraphBLAS/Test/test60.m +++ b/GraphBLAS/Test/test60.m @@ -1,7 +1,7 @@ function test60 %TEST60 test min and max operators with NaNs -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. fprintf ('min\n') ; diff --git a/GraphBLAS/Test/test61.m b/GraphBLAS/Test/test61.m index ca56765153..d247b9aa64 100644 --- a/GraphBLAS/Test/test61.m +++ b/GraphBLAS/Test/test61.m @@ -1,7 +1,7 @@ function test61 %TEST61 test GrB_eMult performance -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. fprintf ('\n----------------------------- eMult performance tests\n') ; diff --git a/GraphBLAS/Test/test62.m b/GraphBLAS/Test/test62.m index b923ae2a13..dc7fa59d7b 100644 --- a/GraphBLAS/Test/test62.m +++ b/GraphBLAS/Test/test62.m @@ -1,7 +1,7 @@ function test62 %TEST62 test GrB_apply -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. fprintf ('\n ------------ testing GrB_apply\n') ; diff --git a/GraphBLAS/Test/test63.m b/GraphBLAS/Test/test63.m index 344df91ef2..4d873cf947 100644 --- a/GraphBLAS/Test/test63.m +++ b/GraphBLAS/Test/test63.m @@ -1,7 +1,7 @@ function test63 %TEST63 test GraphBLAS operators -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. fprintf ('\n ---------------------------- testing GB_mex_op\n') ; diff --git a/GraphBLAS/Test/test64.m b/GraphBLAS/Test/test64.m index a012e45d4a..8ab28b99b2 100644 --- a/GraphBLAS/Test/test64.m +++ b/GraphBLAS/Test/test64.m @@ -1,7 +1,7 @@ function test64 %TEST64 test GxB_*_subassign, scalar expansion, with and without duplicates -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. fprintf ('\n ------------------- quick test of GxB_*_subassign_scalar\n') ; diff --git a/GraphBLAS/Test/test64b.m b/GraphBLAS/Test/test64b.m index e97f7a27d7..6f1b9dd23d 100644 --- a/GraphBLAS/Test/test64b.m +++ b/GraphBLAS/Test/test64b.m @@ -1,7 +1,7 @@ function test64b %TEST64B test GrB_*_assign, scalar expansion, with and without duplicates -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. fprintf ('\n ------------------- quick test of GrB_*_assign_scalar\n') ; diff --git a/GraphBLAS/Test/test65.m b/GraphBLAS/Test/test65.m index 881245e340..1efa9b7c67 100644 --- a/GraphBLAS/Test/test65.m +++ b/GraphBLAS/Test/test65.m @@ -1,7 +1,7 @@ function test65 %TEST65 test type casting -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. X = logical (rand (4) > 0.5) ; diff --git a/GraphBLAS/Test/test66.m b/GraphBLAS/Test/test66.m index 9e86adc33c..cf5c24f228 100644 --- a/GraphBLAS/Test/test66.m +++ b/GraphBLAS/Test/test66.m @@ -1,7 +1,7 @@ function test66 %TEST66 test GrB_reduce -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. fprintf ('\n---- quick test for GrB_reduce_to_scalar and vector\n') ; diff --git a/GraphBLAS/Test/test67.m b/GraphBLAS/Test/test67.m index 66a952d1fb..af10a2f338 100644 --- a/GraphBLAS/Test/test67.m +++ b/GraphBLAS/Test/test67.m @@ -1,7 +1,7 @@ function test67 %TEST67 test GrB_apply -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. fprintf ('\n---------------------------- quick test of GrB_apply\n') ; diff --git a/GraphBLAS/Test/test68.m b/GraphBLAS/Test/test68.m index f25009061b..0c61e1e441 100644 --- a/GraphBLAS/Test/test68.m +++ b/GraphBLAS/Test/test68.m @@ -1,7 +1,7 @@ function test68 %TEST68 performance tests for eWiseMult -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. fprintf ('\n---------------------------- quick test of GrB_apply\n') ; diff --git a/GraphBLAS/Test/test69.m b/GraphBLAS/Test/test69.m index 7c49d8d414..280bfd287b 100644 --- a/GraphBLAS/Test/test69.m +++ b/GraphBLAS/Test/test69.m @@ -1,7 +1,7 @@ function test69 %TEST69 test GrB_assign with aliased inputs, C(:,:) = accum(C(:,:),C) -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. rng ('default') ; diff --git a/GraphBLAS/Test/test70.m b/GraphBLAS/Test/test70.m index f380f12ee8..c622cd0089 100644 --- a/GraphBLAS/Test/test70.m +++ b/GraphBLAS/Test/test70.m @@ -16,6 +16,9 @@ % % without doing any work, and requiring almost no memory % % See SuiteSparse/MATLAB_tools/SSMULT +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. +% http://suitesparse.com See GraphBLAS/Doc/License.txt for license. + addpath ('../Demo/MATLAB') ; % get all square matrices and sort by nnz(A) diff --git a/GraphBLAS/Test/test70_plot.m b/GraphBLAS/Test/test70_plot.m index e63226505d..a1add08f51 100644 --- a/GraphBLAS/Test/test70_plot.m +++ b/GraphBLAS/Test/test70_plot.m @@ -1,6 +1,9 @@ function test70_plot (T, Nedges, Nnodes) %TEST70_PLOT plot the results from test70 +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. +% http://suitesparse.com See GraphBLAS/Doc/License.txt for license. + if (nargin == 0) % load test70_results load test70_results_big diff --git a/GraphBLAS/Test/test71.m b/GraphBLAS/Test/test71.m index 3bc7a3410d..82a35809d5 100644 --- a/GraphBLAS/Test/test71.m +++ b/GraphBLAS/Test/test71.m @@ -16,6 +16,9 @@ % % Edit ll_memory_limit and nz_limit to match the memory on your machine. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. +% http://suitesparse.com See GraphBLAS/Doc/License.txt for license. + % matrices are too big for some methods. Edit memory sizes as needed. if (ismac || ispc) % assume this is a laptop with limited memory diff --git a/GraphBLAS/Test/test71_plot.m b/GraphBLAS/Test/test71_plot.m index 16e1cd1125..8a440e2c22 100644 --- a/GraphBLAS/Test/test71_plot.m +++ b/GraphBLAS/Test/test71_plot.m @@ -1,6 +1,9 @@ function test71_plot (T, Nedges, Nnodes, LLnz, LLmem, LLflops, Ntri, f) %TEST71_PLOT plot the results from test71 +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. +% http://suitesparse.com See GraphBLAS/Doc/License.txt for license. + if (nargin == 0) if (ismac || ispc) load test71_results diff --git a/GraphBLAS/Test/test71_table.m b/GraphBLAS/Test/test71_table.m index cad51ef8d3..72b7556689 100644 --- a/GraphBLAS/Test/test71_table.m +++ b/GraphBLAS/Test/test71_table.m @@ -1,6 +1,9 @@ function test71_table %TEST71_TABLE print the table for triangle counting results +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. +% http://suitesparse.com See GraphBLAS/Doc/License.txt for license. + load test71_results Kokkos = [ diff --git a/GraphBLAS/Test/test72.m b/GraphBLAS/Test/test72.m index de1e5de5d8..174cc375f8 100644 --- a/GraphBLAS/Test/test72.m +++ b/GraphBLAS/Test/test72.m @@ -1,6 +1,9 @@ function test72 %TEST72 special cases for mxm, ewise, ... +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. +% http://suitesparse.com See GraphBLAS/Doc/License.txt for license. + fprintf ('\n--------------test72: special cases\n') ; rng ('default') ; diff --git a/GraphBLAS/Test/test73.m b/GraphBLAS/Test/test73.m index 89ffd033dc..8149cb6fe8 100644 --- a/GraphBLAS/Test/test73.m +++ b/GraphBLAS/Test/test73.m @@ -1,7 +1,7 @@ function test73 %TEST73 performance of C = A*B, with mask -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. fprintf ('\n----------------- C=A*B performance\n') ; diff --git a/GraphBLAS/Test/test74.m b/GraphBLAS/Test/test74.m index 299410fc1c..ed8dd18448 100644 --- a/GraphBLAS/Test/test74.m +++ b/GraphBLAS/Test/test74.m @@ -2,7 +2,7 @@ %TEST74 test GrB_mxm: dot product method % built-in semirings, no typecast, no mask -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. if (nargin < 1) diff --git a/GraphBLAS/Test/test75.m b/GraphBLAS/Test/test75.m index 42c9ca8882..a5f23a6343 100644 --- a/GraphBLAS/Test/test75.m +++ b/GraphBLAS/Test/test75.m @@ -1,7 +1,7 @@ function test75 %TEST75 test GrB_mxm and GrB_vxm on all semirings (A'B dot product) -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. rng ('default') ; diff --git a/GraphBLAS/Test/test76.m b/GraphBLAS/Test/test76.m new file mode 100644 index 0000000000..76be5c41a4 --- /dev/null +++ b/GraphBLAS/Test/test76.m @@ -0,0 +1,30 @@ +% function test76 +%TEST76 test GxB_resize + +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. +% http://suitesparse.com See GraphBLAS/Doc/License.txt for license. + +clear +rng ('default') ; + +fprintf ('\n-------------- GrB_resize\n') ; + +[mult_ops unary_ops add_ops classes semirings] = GB_spec_opsall ; + +for k1 = 1:length(classes) + clas = classes {k1} ; + for nrows_old = [1 2 5 10] + for ncols_old = [1 2 5 10] + A = GB_spec_random (nrows_old, ncols_old, 0.5, 99, clas) ; + for nrows_new = [1 2 5 10 ] + for ncols_new = [1 2 5 10] + C1 = GB_spec_resize (A, nrows_new, ncols_new) ; + C2 = GB_mex_resize (A, nrows_new, ncols_new) ; + GB_spec_compare (C1, C2, 0) ; + end + end + end + end +end + +fprintf ('\ntest76: all tests passed\n') ; diff --git a/GraphBLAS/Test/test77.m b/GraphBLAS/Test/test77.m new file mode 100644 index 0000000000..36c50e9ad2 --- /dev/null +++ b/GraphBLAS/Test/test77.m @@ -0,0 +1,198 @@ +function test77 (fulltest) +%TEST77 test GxB_kron + +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. +% http://suitesparse.com See GraphBLAS/Doc/License.txt for license. + +if (nargin < 1) + fulltest = 0 ; +end + +[bin_ops unary_ops add_ops classes] = GB_spec_opsall ; + +if (fulltest) + fprintf ('--------------lengthy tests of GxB_kron\n') ; + k1test = 1:length(classes) ; +else + fprintf ('--------------quick tests of GxB_kron\n') ; + k1test = [1 2 4 10 11] ; +end + +rng ('default') ; + +dnn = struct ; +dtn = struct ( 'inp0', 'tran' ) ; +dnt = struct ( 'inp1', 'tran' ) ; +dtt = struct ( 'inp0', 'tran', 'inp1', 'tran' ) ; + +n_semirings = 0 ; +for k1 = k1test % 1:length (classes) + clas = classes {k1} ; + + fprintf ('\n%s:\n', clas) ; + + if (fulltest) + k2test = 1:length(bin_ops) ; + else + k2test = randperm (length(bin_ops), 2) ; + end + + for k2 = k2test % 1:length(bin_ops) + binop = bin_ops {k2} ; + + fprintf (' %s', binop) ; + + op.opname = binop ; + op.opclass = clas ; + fprintf (' binary op: [ %s %s ] ', binop, clas) ; + + for k4 = randi([0,length(bin_ops)]) % 0:length(bin_ops) + + clear accum + if (k4 == 0) + accum = '' ; + nclasses = 1 ; + fprintf ('accum: [ none ]') ; + else + accum.opname = bin_ops {k4} ; + nclasses = length (classes) ; + fprintf ('accum: %s ', accum.opname) ; + end + + for k5 = randi ([1 nclasses]) % nclasses + + if (k4 > 0) + accum.opclass = classes {k5} ; + fprintf ('%s\n', accum.opclass) ; + else + fprintf ('\n') ; + end + + for Mask_complement = [false true] + + if (Mask_complement) + dnn.mask = 'scmp' ; + dtn.mask = 'scmp' ; + dnt.mask = 'scmp' ; + dtt.mask = 'scmp' ; + else + dnn.mask = 'default' ; + dtn.mask = 'default' ; + dnt.mask = 'default' ; + dtt.mask = 'default' ; + end + + for C_replace = [false true] + + if (C_replace) + dnn.outp = 'replace' ; + dtn.outp = 'replace' ; + dnt.outp = 'replace' ; + dtt.outp = 'replace' ; + else + dnn.outp = 'default' ; + dtn.outp = 'default' ; + dnt.outp = 'default' ; + dtt.outp = 'default' ; + end + + % try some matrices + for am = [1 5 10 ] + for an = [ 1 5 10 ] + for bm = [1 4 9 ] + for bn = [1 4 9 ] + + A = sparse (100 * sprandn (am,an, 0.5)); + B = sparse (100 * sprandn (bm,bn, 0.5)); + cm = am * bm ; + cn = an * bn ; + C = sparse (100 * sprandn (cm,cn, 0.2)); + Mask = sprandn (cm,cn,0.2) ~= 0 ; + AT = A' ; + BT = B' ; + + %--------------------------------------- + % kron(A,B) + %--------------------------------------- + + % C = kron(A,B) + C0 = GB_spec_kron ... + (C, [ ], accum, op, A, B, dnn); + C1 = GB_mex_kron ... + (C, [ ], accum, op, A, B, dnn); + GB_spec_compare (C0, C1) ; + + % C = kron(A,B) with Mask + C0 = GB_spec_kron ... + (C, Mask, accum, op, A, B, dnn); + C1 = GB_mex_kron ... + (C, Mask, accum, op, A, B, dnn); + GB_spec_compare (C0, C1) ; + + %--------------------------------------- + % kron(A',B) + %--------------------------------------- + + % C = kron(A',B), no Mask + C0 = GB_spec_kron ... + (C, [ ], accum, op, AT, B, dtn); + C1 = GB_mex_kron ... + (C, [ ], accum, op, AT, B, dtn); + GB_spec_compare (C0, C1) ; + + % C = kron(A',B), with Mask + C0 = GB_spec_kron ... + (C, Mask, accum, op, AT, B, dtn); + C1 = GB_mex_kron ... + (C, Mask, accum, op, AT, B, dtn); + GB_spec_compare (C0, C1) ; + + %--------------------------------------- + % kron(A,B') + %--------------------------------------- + + % no mask + C0 = GB_spec_kron ... + (C, [ ], accum, op, A, BT, dnt); + C1 = GB_mex_kron ... + (C, [ ], accum, op, A, BT, dnt); + GB_spec_compare (C0, C1) ; + + % with mask + C0 = GB_spec_kron ... + (C, Mask, accum, op, A, BT, dnt); + C1 = GB_mex_kron ... + (C, Mask, accum, op, A, BT, dnt); + GB_spec_compare (C0, C1) ; + + %--------------------------------------- + % kron(A',B') + %--------------------------------------- + + % no Mask + C0 = GB_spec_kron ... + (C, [ ], accum, op, AT, BT, dtt); + C1 = GB_mex_kron ... + (C, [ ], accum, op, AT, BT, dtt); + GB_spec_compare (C0, C1) ; + + % with mask + C0 = GB_spec_kron ... + (C, Mask, accum, op, AT, BT, dtt); + C1 = GB_mex_kron ... + (C, Mask, accum, op, AT, BT, dtt); + GB_spec_compare (C0, C1) ; + + end + end + end + end + end + end + end + end + end +end + +fprintf ('\ntest77: all tests passed\n') ; + diff --git a/GraphBLAS/Test/test97.m b/GraphBLAS/Test/test97.m index cd7d667e73..f7a18abf66 100644 --- a/GraphBLAS/Test/test97.m +++ b/GraphBLAS/Test/test97.m @@ -1,7 +1,7 @@ function test97 %TEST97 test GB_assign, scalar expansion and zombies -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. rng ('default') ; diff --git a/GraphBLAS/Test/test98.m b/GraphBLAS/Test/test98.m index 928cf61fcc..6529e3da86 100644 --- a/GraphBLAS/Test/test98.m +++ b/GraphBLAS/Test/test98.m @@ -1,7 +1,7 @@ function test98 %TEST98 test GB_mxm, typecasting on the fly -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. % This test is for the (flops < NNZ(A)) case in GB_AxB_numeric.c diff --git a/GraphBLAS/Test/test99.m b/GraphBLAS/Test/test99.m index baed161143..efa3ce19b6 100644 --- a/GraphBLAS/Test/test99.m +++ b/GraphBLAS/Test/test99.m @@ -1,7 +1,7 @@ function test99 %TEST99 test GB_mex_transpose with explicit zeros in the Mask -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. rng ('default') ; diff --git a/GraphBLAS/Test/testall.m b/GraphBLAS/Test/testall.m index b4e4f13f39..5d9dd9e2c2 100644 --- a/GraphBLAS/Test/testall.m +++ b/GraphBLAS/Test/testall.m @@ -5,7 +5,7 @@ function testall (longtests) % testall ; % runs just the shorter tests (about 15 minutes) % testall(1) ; % runs all the tests (overnight). Requires SuiteSparse. -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. t = cputime ; @@ -60,12 +60,14 @@ function testall (longtests) logstat ('test19') ; % GxB_subassign, many pending operators logstat ('test12') ; % Wathen finite-element matrices (short test) logstat ('test10') ; % GrB_apply +logstat ('test76') ; % GxB_resize logstat ('test27') ; % quick test of GxB_select (band) logstat ('test25') ; % quick test of GxB_select logstat ('test74') ; % test GrB_mxm on all semirings, just dot product method logstat ('test99') ; % GB_mex_transpose with explicit zeros in the Mask logstat ('test23') ; % quick test of GB_*_build logstat ('test18') ; % quick tests of GrB_eWiseAdd and eWiseMult +logstat ('test77') ; % quick tests of GxB_kron logstat ('test16') ; % user-defined complex operators logstat ('test24') ; % test of GrB_Matrix_reduce logstat ('test21') ; % quick test of GB_mex_subassign diff --git a/GraphBLAS/Test/testc1.m b/GraphBLAS/Test/testc1.m index 0d8e8ff59e..dd5a2dca0e 100644 --- a/GraphBLAS/Test/testc1.m +++ b/GraphBLAS/Test/testc1.m @@ -1,7 +1,7 @@ function testc1 %TESTC1 test complex operators -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. rng 'default' diff --git a/GraphBLAS/Test/testc2.m b/GraphBLAS/Test/testc2.m index 7841abd82e..9fac1773cc 100644 --- a/GraphBLAS/Test/testc2.m +++ b/GraphBLAS/Test/testc2.m @@ -1,7 +1,7 @@ function testc2 %TESTC2 test complex A*B, A'*B, A*B', A'*B', A+B -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. maxerr = 0 ; diff --git a/GraphBLAS/Test/testc3.m b/GraphBLAS/Test/testc3.m index d8f04f7b54..52201c6243 100644 --- a/GraphBLAS/Test/testc3.m +++ b/GraphBLAS/Test/testc3.m @@ -1,7 +1,7 @@ function testc3 %TESTC3 test complex GrB_extract -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. d = struct ('outp', 'replace') ; diff --git a/GraphBLAS/Test/testc4.m b/GraphBLAS/Test/testc4.m index 0502ec3c6e..6f7b1c20f3 100644 --- a/GraphBLAS/Test/testc4.m +++ b/GraphBLAS/Test/testc4.m @@ -1,7 +1,7 @@ function testc4 %TESTC4 test complex extractElement and setElement -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. rng ('default') ; diff --git a/GraphBLAS/Test/testc5.m b/GraphBLAS/Test/testc5.m index c6ef98c6e8..c56fb274b1 100644 --- a/GraphBLAS/Test/testc5.m +++ b/GraphBLAS/Test/testc5.m @@ -1,7 +1,7 @@ function testc5 %TESTC5 test complex subref -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. seed = 1 ; diff --git a/GraphBLAS/Test/testc6.m b/GraphBLAS/Test/testc6.m index aa6929287a..43e52a7532 100644 --- a/GraphBLAS/Test/testc6.m +++ b/GraphBLAS/Test/testc6.m @@ -1,7 +1,7 @@ function testc6 %TESTC6 test complex apply -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. rng 'default' diff --git a/GraphBLAS/Test/testc7.m b/GraphBLAS/Test/testc7.m index 4c720677a4..2cec824895 100644 --- a/GraphBLAS/Test/testc7.m +++ b/GraphBLAS/Test/testc7.m @@ -1,7 +1,7 @@ function testc7 %TESTC7 test complex assign -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. rng ('default') diff --git a/GraphBLAS/Test/testc8.m b/GraphBLAS/Test/testc8.m index be71606781..5c0af05b6c 100644 --- a/GraphBLAS/Test/testc8.m +++ b/GraphBLAS/Test/testc8.m @@ -1,7 +1,7 @@ function testc8 %TESTC8 test complex eWiseAdd and eWiseMult -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. rng ('default') diff --git a/GraphBLAS/Test/testc9.m b/GraphBLAS/Test/testc9.m index 65cbaf9330..e307b78879 100644 --- a/GraphBLAS/Test/testc9.m +++ b/GraphBLAS/Test/testc9.m @@ -1,7 +1,7 @@ function testc9 %TESTC9 test complex extractTuples -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. seed = 1 ; diff --git a/GraphBLAS/Test/testca.m b/GraphBLAS/Test/testca.m index c1a3dac26a..3b71fe515c 100644 --- a/GraphBLAS/Test/testca.m +++ b/GraphBLAS/Test/testca.m @@ -1,7 +1,7 @@ function testca %TESTCA test complex mxm, mxv, and vxm -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. rng ('default') ; diff --git a/GraphBLAS/Test/testcb.m b/GraphBLAS/Test/testcb.m index 003c75fdd7..f7feb988ef 100644 --- a/GraphBLAS/Test/testcb.m +++ b/GraphBLAS/Test/testcb.m @@ -1,7 +1,7 @@ function testcb %TESTCB test complex reduce -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. seed = 1 ; diff --git a/GraphBLAS/Test/testcc.m b/GraphBLAS/Test/testcc.m index bfaa7c23f0..7ff2cc9a7f 100644 --- a/GraphBLAS/Test/testcc.m +++ b/GraphBLAS/Test/testcc.m @@ -1,7 +1,7 @@ function testcc %TESTCC test complex transpose -% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017, All Rights Reserved. +% SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2018, All Rights Reserved. % http://suitesparse.com See GraphBLAS/Doc/License.txt for license. dt = struct ('inp0', 'tran') ; diff --git a/KLU/Doc/ChangeLog b/KLU/Doc/ChangeLog index a98c9d33b5..70a1b4f97d 100644 --- a/KLU/Doc/ChangeLog +++ b/KLU/Doc/ChangeLog @@ -1,3 +1,7 @@ +Mar 12, 2018: version 1.3.9 + + * swapped arguments for KLU_malloc; not a bug, just more readable now + May 4, 2016: version 1.3.8 * minor changes to Makefile diff --git a/KLU/Doc/KLU_UserGuide.pdf b/KLU/Doc/KLU_UserGuide.pdf index f169aa5fa6..d5ae2f2a24 100644 Binary files a/KLU/Doc/KLU_UserGuide.pdf and b/KLU/Doc/KLU_UserGuide.pdf differ diff --git a/KLU/Doc/KLU_UserGuide.tex b/KLU/Doc/KLU_UserGuide.tex index 4dbcd5eb84..7ec756ed75 100644 --- a/KLU/Doc/KLU_UserGuide.tex +++ b/KLU/Doc/KLU_UserGuide.tex @@ -26,7 +26,7 @@ } \and Eka Palamadai Natarajan} -\date{VERSION 1.3.8, May 4, 2016} +\date{VERSION 1.3.9, Mar 12, 2018} \maketitle %------------------------------------------------------------------------------ diff --git a/KLU/Include/klu.h b/KLU/Include/klu.h index 2da483b06d..07611f72da 100644 --- a/KLU/Include/klu.h +++ b/KLU/Include/klu.h @@ -819,11 +819,11 @@ void *klu_l_realloc (size_t, size_t, size_t, void *, klu_l_common *) ; * #endif */ -#define KLU_DATE "May 4, 2016" +#define KLU_DATE "Mar 12, 2018" #define KLU_VERSION_CODE(main,sub) ((main) * 1000 + (sub)) #define KLU_MAIN_VERSION 1 #define KLU_SUB_VERSION 3 -#define KLU_SUBSUB_VERSION 8 +#define KLU_SUBSUB_VERSION 9 #define KLU_VERSION KLU_VERSION_CODE(KLU_MAIN_VERSION,KLU_SUB_VERSION) #ifdef __cplusplus diff --git a/KLU/Source/klu_analyze_given.c b/KLU/Source/klu_analyze_given.c index bee5473455..348c011b3b 100644 --- a/KLU/Source/klu_analyze_given.c +++ b/KLU/Source/klu_analyze_given.c @@ -96,7 +96,7 @@ KLU_symbolic *KLU_alloc_symbolic /* allocate the Symbolic object */ /* ---------------------------------------------------------------------- */ - Symbolic = KLU_malloc (sizeof (KLU_symbolic), 1, Common) ; + Symbolic = KLU_malloc (1, sizeof (KLU_symbolic), Common) ; if (Common->status < KLU_OK) { /* out of memory */ diff --git a/KLU/Source/klu_factor.c b/KLU/Source/klu_factor.c index 8a410e717b..d651f49e13 100644 --- a/KLU/Source/klu_factor.c +++ b/KLU/Source/klu_factor.c @@ -441,7 +441,7 @@ KLU_numeric *KLU_factor /* returns NULL if error, or a valid n1 = ((size_t) n) + 1 ; nzoff1 = ((size_t) nzoff) + 1 ; - Numeric = KLU_malloc (sizeof (KLU_numeric), 1, Common) ; + Numeric = KLU_malloc (1, sizeof (KLU_numeric), Common) ; if (Common->status < KLU_OK) { /* out of memory */ diff --git a/Makefile b/Makefile index fc8713a162..80f147c4c9 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ #------------------------------------------------------------------------------- -# Makefile for all SuiteSparse packages (except GraphBLAS) +# Makefile for all SuiteSparse packages #------------------------------------------------------------------------------- SUITESPARSE = $(CURDIR) @@ -12,7 +12,7 @@ include SuiteSparse_config/SuiteSparse_config.mk # Compile the default rules for each package go: metis ( cd SuiteSparse_config && $(MAKE) ) - ( cd GraphBLAS && $(MAKE) ) + ( cd GraphBLAS && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' ) ( cd AMD && $(MAKE) ) ( cd BTF && $(MAKE) ) ( cd CAMD && $(MAKE) ) @@ -37,7 +37,7 @@ endif # (note that CSparse is not installed; CXSparse is installed instead) install: metisinstall ( cd SuiteSparse_config && $(MAKE) install ) - ( cd GraphBLAS && $(MAKE) install ) + ( cd GraphBLAS && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' install ) ( cd AMD && $(MAKE) install ) ( cd BTF && $(MAKE) install ) ( cd CAMD && $(MAKE) install ) @@ -113,7 +113,7 @@ endif # static library library: metis ( cd SuiteSparse_config && $(MAKE) ) - ( cd GraphBLAS && $(MAKE) library ) + ( cd GraphBLAS && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' library ) ( cd AMD && $(MAKE) library ) ( cd BTF && $(MAKE) library ) ( cd CAMD && $(MAKE) library ) @@ -266,3 +266,13 @@ else @echo 'Using pre-installed METIS 5.1.0 library at ' '[$(MY_METIS_LIB)]' endif +# just compile GraphBLAS +gb: + echo $(CMAKE_OPTIONS) + ( cd GraphBLAS && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' ) + +# just install GraphBLAS +gbinstall: + echo $(CMAKE_OPTIONS) + ( cd GraphBLAS && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' install ) + diff --git a/README.txt b/README.txt index a435366803..e6bab995e2 100644 --- a/README.txt +++ b/README.txt @@ -1,6 +1,6 @@ SuiteSparse: A Suite of Sparse matrix packages at http://www.suitesparse.com -Dec 28, 2017. SuiteSparse VERSION 5.1.2 +Mar 15, 2018. SuiteSparse VERSION 5.2.0 Now includes GraphBLAS and a new interface to the SuiteSparse Matrix Collection (ssget), via MATLAB and a Java GUI, to http://sparse.tamu.edu. diff --git a/SuiteSparse_config/Makefile b/SuiteSparse_config/Makefile index 049768c731..10b3636f03 100644 --- 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.1.2 +VERSION = 5.2.0 SO_VERSION = 5 default: library diff --git a/SuiteSparse_config/README.txt b/SuiteSparse_config/README.txt index d03aa8f037..8555cc459e 100644 --- a/SuiteSparse_config/README.txt +++ b/SuiteSparse_config/README.txt @@ -1,4 +1,4 @@ -SuiteSparse_config, 2017, Timothy A. Davis, http://www.suitesparse.com +SuiteSparse_config, 2018, Timothy A. Davis, http://www.suitesparse.com (formerly the UFconfig package) This directory contains a default SuiteSparse_config.mk file. It tries to diff --git a/SuiteSparse_config/SuiteSparse_config.c b/SuiteSparse_config/SuiteSparse_config.c index b491539fea..595e46781f 100644 --- a/SuiteSparse_config/SuiteSparse_config.c +++ b/SuiteSparse_config/SuiteSparse_config.c @@ -4,7 +4,7 @@ /* SuiteSparse configuration : memory manager and printf functions. */ -/* Copyright (c) 2013, Timothy A. Davis. No licensing restrictions +/* Copyright (c) 2013-2018, Timothy A. Davis. No licensing restrictions * apply to this file or to the SuiteSparse_config directory. * Author: Timothy A. Davis. */ diff --git a/SuiteSparse_config/SuiteSparse_config.h b/SuiteSparse_config/SuiteSparse_config.h index f672f5e445..eaca4544fd 100644 --- a/SuiteSparse_config/SuiteSparse_config.h +++ b/SuiteSparse_config/SuiteSparse_config.h @@ -184,19 +184,19 @@ int SuiteSparse_divcomplex * * SuiteSparse contains the following packages: * - * SuiteSparse_config version 5.1.2 (version always the same as SuiteSparse) - * GraphBLAS version 1.1.2 + * SuiteSparse_config version 5.2.0 + * GraphBLAS version 2.0.1 * ssget version 2.0.0 * AMD version 2.4.6 * BTF version 1.2.6 * CAMD version 2.4.6 * CCOLAMD version 2.9.6 - * CHOLMOD version 3.0.11 + * CHOLMOD version 3.0.12 * COLAMD version 2.9.6 * CSparse version 3.2.0 * CXSparse version 3.2.0 * GPUQREngine version 1.0.5 - * KLU version 1.3.8 + * KLU version 1.3.9 * LDL version 2.2.6 * RBio version 2.2.6 * SPQR version 2.0.8 @@ -235,11 +235,11 @@ int SuiteSparse_version /* returns SUITESPARSE_VERSION */ */ #define SUITESPARSE_HAS_VERSION_FUNCTION -#define SUITESPARSE_DATE "Dec 28, 2017" +#define SUITESPARSE_DATE "Mar 15, 2018" #define SUITESPARSE_VER_CODE(main,sub) ((main) * 1000 + (sub)) #define SUITESPARSE_MAIN_VERSION 5 -#define SUITESPARSE_SUB_VERSION 1 -#define SUITESPARSE_SUBSUB_VERSION 2 +#define SUITESPARSE_SUB_VERSION 2 +#define SUITESPARSE_SUBSUB_VERSION 0 #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 index 9f456afc02..b4e59795a4 100644 --- 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.1.2 +SUITESPARSE_VERSION = 5.2.0 #=============================================================================== # Options you can change without editing this file: @@ -59,6 +59,8 @@ SUITESPARSE_VERSION = 5.1.2 INSTALL_INCLUDE ?= $(INSTALL)/include INSTALL_DOC ?= $(INSTALL)/share/doc/suitesparse-$(SUITESPARSE_VERSION) + CMAKE_OPTIONS ?= -DCMAKE_INSTALL_PREFIX=$(INSTALL) + #--------------------------------------------------------------------------- # optimization level #---------------------------------------------------------------------------