diff --git a/include/LAGraph.h b/include/LAGraph.h index 7b1f25900b..8b6ffd5eb7 100644 --- a/include/LAGraph.h +++ b/include/LAGraph.h @@ -566,7 +566,7 @@ struct LAGraph_Graph_struct // unknown. For the adjacency matrix of a directed or undirected // graph, this is the number of self-edges in the graph. - // TODO: discuss new cached properties: emin, emax, nonzero. + // TODO: discuss new cached properties: emin, emax // emin is required for SSSP, which needs to know if emin > 0 or not. emax // might be useful for computing Delta for Delta-stepping. Knowing these // bounds might also be useful for future algorithms that use edge weights. diff --git a/src/benchmark/GAP_2022.txt b/src/benchmark/GAP_2022.txt index 2820ee55a6..ecaa47ca88 100644 --- a/src/benchmark/GAP_2022.txt +++ b/src/benchmark/GAP_2022.txt @@ -2,6 +2,7 @@ hypersparse: 20-core Intel(R) Xeon(R) CPU E5-2698 v4 @ 2.20GHz, with 40 threads (all default settings), gcc 11.2.0 -O3 (Ubuntu 20.04), unless otherwise indicated. Single socket system (no NUMA effects). +Feb 16, 2022 with SS:GrB v6.2.0beta (Feb 14, 2022 version) Feb 8, 2022 with SS:GrB v6.1.4 Jan 2, 2022 with SS:GrB v6.1.3 @@ -18,6 +19,7 @@ BC SS 23.984 * 33.425 * 9.185 * 6.511 33.533 (Jan 2) BFS GAP:2021 .309 .542 .209 .341 .316 (Nov 27) ------------------------------------------------------------------ +BFS SS .557 1.236 .365 .751 3.250 (Feb 16) BFS SS .550 1.316 .360 .742 3.284 (Feb 8) BFS SS .543 1.308 .366 .757 3.177 (Jan 2) diff --git a/src/benchmark/bfs_demo.c b/src/benchmark/bfs_demo.c index 60a1e5d868..5ca3e78f20 100644 --- a/src/benchmark/bfs_demo.c +++ b/src/benchmark/bfs_demo.c @@ -114,7 +114,7 @@ int main (int argc, char **argv) LAGraph_TRY (LAGraph_BreadthFirstSearch (NULL, &parent, G, src, msg)) ; GrB_free (&parent) ; LAGraph_TRY (LAGraph_Toc (&twarmup, tw, msg)) ; - printf ("warmup: parent only, pushonly: %g sec\n", twarmup) ; + printf ("warmup: parent only, pushpull: %g sec\n", twarmup) ; //-------------------------------------------------------------------------- // run the BFS on all source nodes diff --git a/src/utility/LG_internal.h b/src/utility/LG_internal.h index ba8bc583fc..1bbd99601c 100644 --- a/src/utility/LG_internal.h +++ b/src/utility/LG_internal.h @@ -153,7 +153,7 @@ typedef unsigned char LG_void ; { \ LG_ERROR_MSG ("LAGraph assertion \"" expression_message \ "\" failed:\nfile \"%s\", line %d\n", __FILE__, __LINE__) ; \ - LG_FREE_ALL ; \ + LG_FREE_ALL ; \ return (error_status) ; \ } \ } @@ -179,7 +179,7 @@ typedef unsigned char LG_void ; { \ LG_ERROR_MSG ("LAGraph assertion \"" LG_XSTR(expression) \ "\" failed:\nfile \"%s\", line %d\n", __FILE__, __LINE__) ; \ - LG_FREE_ALL ; \ + LG_FREE_ALL ; \ return (error_status) ; \ } \ } @@ -196,7 +196,7 @@ typedef unsigned char LG_void ; int LAGraph_status = LAGraph_method ; \ if (LAGraph_status < 0) \ { \ - LG_FREE_ALL ; \ + LG_FREE_ALL ; \ return (LAGraph_status) ; \ } \ }