Skip to content

Commit 8936b7f

Browse files
cuda testing
1 parent 428e0a2 commit 8936b7f

File tree

2 files changed

+14
-8
lines changed

2 files changed

+14
-8
lines changed

CMakeLists.txt

Lines changed: 3 additions & 3 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 "Sept 8, 2025" )
42+
set ( LAGraph_DATE "FIXME, 2025" )
4343
set ( LAGraph_VERSION_MAJOR 1 CACHE STRING "" FORCE )
44-
set ( LAGraph_VERSION_MINOR 2 CACHE STRING "" FORCE )
45-
set ( LAGraph_VERSION_SUB 1 CACHE STRING "" FORCE )
44+
set ( LAGraph_VERSION_MINOR 3 CACHE STRING "" FORCE )
45+
set ( LAGraph_VERSION_SUB 0 CACHE STRING "" FORCE )
4646

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

experimental/test/test_MaxFlow.c

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,11 @@ char msg[LAGRAPH_MSG_LEN];
2727
LAGraph_Graph G = NULL;
2828
GrB_Matrix A = NULL;
2929
#define LEN 512
30+
#ifdef GRAPHBLAS_HAS_CUDA
3031
#define NTESTS 4
31-
// #define NTESTS 7
32+
#else
33+
#define NTESTS 7
34+
#endif
3235
char filename[LEN + 1];
3336

3437
typedef struct{
@@ -44,10 +47,13 @@ test_info tests[] = {
4447
{"matrix_random_flow.mtx", 0,9, 22, LAGraph_ADJACENCY_DIRECTED},
4548
{"rand.mtx", 0, 19, 37, LAGraph_ADJACENCY_DIRECTED},
4649
{"mcl.mtx", 0, 9, 0, LAGraph_ADJACENCY_DIRECTED},
47-
// FIXME: re-enable these matrices:
48-
//{"cycle_flow.mtx", 0, 89, 1, LAGraph_ADJACENCY_DIRECTED},
49-
//{"random_weighted_general2.mtx", 0, 299, 11098623877, LAGraph_ADJACENCY_UNDIRECTED},
50-
//{"random_weighted_general1.mtx", 0, 499, 6264009335, LAGraph_ADJACENCY_UNDIRECTED}
50+
#ifndef GRAPHBLAS_HAS_CUDA
51+
// FIXME: the CUDA cases are currently very slow for these matrices,
52+
// when the GPU is hacked to always be used regardless of problem size:
53+
{"cycle_flow.mtx", 0, 89, 1, LAGraph_ADJACENCY_DIRECTED},
54+
{"random_weighted_general2.mtx", 0, 299, 11098623877, LAGraph_ADJACENCY_UNDIRECTED},
55+
{"random_weighted_general1.mtx", 0, 499, 6264009335, LAGraph_ADJACENCY_UNDIRECTED}
56+
#endif
5157
};
5258

5359
//399 11098623877 alt sink and src for test 6

0 commit comments

Comments
 (0)