Skip to content

Commit e2539e2

Browse files
Merge pull request GraphBLAS#383 from GraphBLAS/v1.2.1
v1.2.1: date and version; minor fix to maxflow demo/tests printfs
2 parents 032cecb + 19ea25d commit e2539e2

File tree

4 files changed

+10
-9
lines changed

4 files changed

+10
-9
lines changed

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@
3939
cmake_minimum_required ( VERSION 3.20 ) # LAGraph can be built stand-alone
4040

4141
# version of LAGraph
42-
set ( LAGraph_DATE "July 25, 2025" )
42+
set ( LAGraph_DATE "Sept 8, 2025" )
4343
set ( LAGraph_VERSION_MAJOR 1 CACHE STRING "" FORCE )
4444
set ( LAGraph_VERSION_MINOR 2 CACHE STRING "" FORCE )
45-
set ( LAGraph_VERSION_SUB 0 CACHE STRING "" FORCE )
45+
set ( LAGraph_VERSION_SUB 1 CACHE STRING "" FORCE )
4646

4747
message ( STATUS "Building LAGraph version: v"
4848
${LAGraph_VERSION_MAJOR}.

experimental/benchmark/maxflow_demo.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ int main (int argc, char ** argv){
5454
if(end1 == 0 || end2 == 0){
5555
printf("values for source and sink are incorrect.\n");
5656
}
57-
printf("Starting max flow from %ld to %ld\n", S, T);
57+
printf("Starting max flow from %" PRIu64 " to %" PRIu64 "\n", S, T);
5858

5959
// LG_SET_BURBLE(1);
6060
double time = LAGraph_WallClockTime();
@@ -63,14 +63,15 @@ int main (int argc, char ** argv){
6363
printf("Time for LAGraph_MaxFlow: %g sec\n", time);
6464
printf("Max Flow is: %lf\n", flow);
6565

66-
printf("Starting max flow from %ld to %ld, with flow_matrix returned\n", S, T);
66+
printf("Starting max flow from %" PRIu64 " to %" PRIu64
67+
", with flow_matrix returned\n", S, T);
6768
time = LAGraph_WallClockTime();
6869
LAGRAPH_TRY(LAGr_MaxFlow(&flow, &flow_matrix, G, S, T, msg));
6970
time = LAGraph_WallClockTime() - time;
7071
printf("Time for LAGraph_MaxFlow with flow matrix: %g sec\n", time);
7172
printf("Max Flow is: %lf\n", flow);
7273
GRB_TRY (GrB_Matrix_nvals (&nflow, flow_matrix)) ;
73-
printf("# of entries in flow matrix: %lu\n", nflow);
74+
printf("# of entries in flow matrix: %" PRIu64 "\n", nflow);
7475

7576
LAGraph_Delete(&G, msg);
7677
GrB_free (&flow_matrix) ;

experimental/test/test_MaxFlow.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,14 +90,14 @@ void test_MaxFlow(void) {
9090
// test all source/destination pairs for small problems
9191
GrB_Index n ;
9292
OK (GrB_Matrix_nrows (&n, G->A)) ;
93-
printf ("n: %ld\n", (int64_t) n) ;
93+
printf ("n: %d\n", (int) n) ;
9494
if (n < 100)
9595
{
9696
for (GrB_Index src = 0 ; src < n ; src++)
9797
{
9898
for (GrB_Index dest = 0 ; dest < n ; dest++)
9999
{
100-
printf("src: %ld, dest: %ld\n", src, dest);
100+
printf("src: %d, dest: %d\n", (int) src, (int) dest);
101101
if (src == dest) continue ;
102102
OK(LAGr_MaxFlow(&flow, NULL, G, src, dest, msg));
103103
}

include/LAGraph.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@
3737
// See also the LAGraph_Version utility method, which returns these values.
3838
// These definitions are derived from LAGraph/CMakeLists.txt.
3939

40-
#define LAGRAPH_DATE "July 25, 2025"
40+
#define LAGRAPH_DATE "Sept 8, 2025"
4141
#define LAGRAPH_VERSION_MAJOR 1
4242
#define LAGRAPH_VERSION_MINOR 2
43-
#define LAGRAPH_VERSION_UPDATE 0
43+
#define LAGRAPH_VERSION_UPDATE 1
4444

4545
//==============================================================================
4646
// include files and helper macros

0 commit comments

Comments
 (0)