Merge pull request #355 from GraphBLAS/with_GraphBLAS_v10

maxflow: for GrB 10.0.0 or later

Author: DrTimothyAldenDavis

CMakeLists.txt

@@ -39,7 +39,7 @@
 cmake_minimum_required ( VERSION 3.20 ) # LAGraph can be built stand-alone
 
 # version of LAGraph
-set ( LAGraph_DATE "June 1, 2025" )
+set ( LAGraph_DATE "July 25, 2025" )
 set ( LAGraph_VERSION_MAJOR 1 CACHE STRING "" FORCE )
 set ( LAGraph_VERSION_MINOR 2 CACHE STRING "" FORCE )
 set ( LAGraph_VERSION_SUB   0 CACHE STRING "" FORCE )

ChangeLog

@@ -1,4 +1,4 @@
-June 1, 2025: version 1.2.0
+July 25, 2025: version 1.2.0
 
     * v2.1 C API: using the new GrB_get/set methods in the C API;
         LAGraph can now use a "vanilla" GraphBLAS that supports the v2.1

experimental/algorithm/LAGr_MaxFlow.c

@@ -1,16 +1,33 @@
+//------------------------------------------------------------------------------
+// LAGr_MaxFlow: max flow
+//------------------------------------------------------------------------------
+
+// LAGraph, (c) 2019-2022 by The LAGraph Contributors, All Rights Reserved.
+// SPDX-License-Identifier: BSD-2-Clause
+//
+// For additional details (including references to third party source code and
+// other files) see the LICENSE file or contact [email protected]. See
+// Contributors.txt for a full list of contributors. Created, in part, with
+// funding and support from the U.S. Government (see Acknowledgments.txt file).
+// DM22-0790
+
+// Contributed by Darin Peries and Tim Davis, Texas A&M University
+
+//------------------------------------------------------------------------------
 
 #include <LAGraphX.h>
 #include "LG_internal.h"
 #include <LAGraph.h>
 
+#if LG_SUITESPARSE_GRAPHBLAS_V10
+
 //------------------------------------------------------------------------------
 // LG_augment_maxflow
 //------------------------------------------------------------------------------
 
 // LG_augment_maxflow is a function used to sum the current excess flow of the
 // sink into the output variable f for each iteration.
 
-
 #undef  LG_FREE_ALL
 #define LG_FREE_ALL ;
 
@@ -450,13 +467,16 @@ JIT_STR(void MF_getResidual(double * res, const MF_flowEdge * flow_edge){
 JIT_STR(void MF_extractMatrixFlow(double* flow, const MF_flowEdge* edge){*flow = edge->flow;}, GRB_EMFLOW_STR)
 
 
+#endif
 
 //------------------------------------------------------------------------------
 // LAGraph_MaxFlow
 //------------------------------------------------------------------------------
 
 int LAGr_MaxFlow(double* f, GrB_Matrix* flow_mtx, LAGraph_Graph G, GrB_Index src, GrB_Index sink, char *msg){
 
+#if LG_SUITESPARSE_GRAPHBLAS_V10
+
   //types
   GrB_Type GrB_FlowEdge = NULL ;
   GrB_Type GrB_ResultTuple = NULL ;
@@ -930,4 +950,7 @@ int LAGr_MaxFlow(double* f, GrB_Matrix* flow_mtx, LAGraph_Graph G, GrB_Index src
 
   LG_FREE_ALL;
   return GrB_SUCCESS;
+#else
+  return GrB_NOT_IMPLEMENTED ;
+#endif
 }

experimental/algorithm/README.md

@@ -22,6 +22,8 @@
 * LAGraph_msf: Minimum spanning forest
 * LAGraph_scc: Strongly connected components
 
+* LAGraph_MaxFlow: maximum flow
+
 * LAGraph_AllKCore: all K-cores of a graph
 * LAGraph_KCore: a single K-core of a graph
 * LAGraph_KCoreDecompose:

experimental/test/test_MaxFlow.c

@@ -1,3 +1,19 @@
+//------------------------------------------------------------------------------
+// experimental/test/test_MaxFlow: tests for LAGr_MaxFlow
+//------------------------------------------------------------------------------
+
+// LAGraph, (c) 2019-2022 by The LAGraph Contributors, All Rights Reserved.
+// SPDX-License-Identifier: BSD-2-Clause
+//
+// For additional details (including references to third party source code and
+// other files) see the LICENSE file or contact [email protected]. See
+// Contributors.txt for a full list of contributors. Created, in part, with
+// funding and support from the U.S. Government (see Acknowledgments.txt file).
+// DM22-0790
+
+// Contributed by Darin Peries and Tim Davis, Texas A&M University
+
+//------------------------------------------------------------------------------
 
 #include <acutest.h>
 #include <LAGraphX.h>
@@ -34,6 +50,7 @@ test_info tests[] = {
 //399 11098623877 alt sink and src for test 6
 
 void test_MaxFlow(void) {
+#if LG_SUITESPARSE_GRAPHBLAS_V10
   LAGraph_Init(msg);
 //OK(LG_SET_BURBLE(1));
   OK(LG_SET_BURBLE(0));
@@ -61,10 +78,12 @@ void test_MaxFlow(void) {
     OK(LAGraph_Delete(&G, msg));
   }
   LAGraph_Finalize(msg);
+#endif
 }
 
 void test_MaxFlowMtx(void) {
   LAGraph_Init(msg);
+#if LG_SUITESPARSE_GRAPHBLAS_V10
 //OK(LG_SET_BURBLE(1));
   OK(LG_SET_BURBLE(0));
   OK(GxB_Global_Option_set(GxB_JIT_C_CONTROL, 4));
@@ -100,6 +119,7 @@ void test_MaxFlowMtx(void) {
     GrB_free(&flow_mtx);
     OK(LAGraph_Delete(&G, msg));
   }
+#endif
   LAGraph_Finalize(msg);
 }
 

include/LAGraph.h

@@ -37,7 +37,7 @@
 // See also the LAGraph_Version utility method, which returns these values.
 // These definitions are derived from LAGraph/CMakeLists.txt.
 
-#define LAGRAPH_DATE "June 1, 2025"
+#define LAGRAPH_DATE "July 25, 2025"
 #define LAGRAPH_VERSION_MAJOR  1
 #define LAGRAPH_VERSION_MINOR  2
 #define LAGRAPH_VERSION_UPDATE 0