require GraphBLAS 10.2 or later for Louvain

Author: DrTimothyAldenDavis

.github/workflows/build.yml

@@ -19,7 +19,7 @@ jobs:
         # if there are multiple items in this list, only use should
         # deployit=true for just one of them.
          - {grb_version: 9.0.0, deployit: false}
-         - {grb_version: 10.1.0, deployit: true}
+         - {grb_version: 10.2.0, deployit: true}
 
     steps:
 
@@ -69,7 +69,7 @@ jobs:
       matrix:
         config:
          - {grb_version: 9.0.0}
-         - {grb_version: 10.1.0}
+         - {grb_version: 10.2.0}
 
     steps:
 
@@ -99,5 +99,5 @@ jobs:
         cd build
         cmake ..
         JOBS=2 make
-        ctest .
+        ctest . --rerun-failed --output-on-failure
 

experimental/algorithm/LAGr_Modularity2.c

@@ -75,11 +75,11 @@ int LAGr_Modularity2(
     GrB_Matrix S,
     char *msg)
 {
-    #if LG_SUITESPARSE_GRAPHBLAS_V10
+    #if LG_SUITESPARSE_GRAPHBLAS_V10_2
     LG_CLEAR_MSG;
     char MATRIX_TYPE[LAGRAPH_MSG_LEN];
 
-    GrB_set(GrB_GLOBAL, false, GxB_BURBLE);
+    // GrB_set(GrB_GLOBAL, false, GxB_BURBLE);
 
     GrB_Index n;
     GrB_Matrix k = NULL;
@@ -133,4 +133,4 @@ int LAGr_Modularity2(
 #else
     return (GrB_NOT_IMPLEMENTED);
 #endif
-}
+}

experimental/algorithm/LAGraph_IsolateSets.c

@@ -62,11 +62,11 @@ int LAGraph_IsolateSet(
     uint64_t seed,
     char *msg)
 {
-#if LG_SUITESPARSE_GRAPHBLAS_V10
+#if LG_SUITESPARSE_GRAPHBLAS_V10_2
     LG_CLEAR_MSG;
 
     char MATRIX_TYPE[LAGRAPH_MSG_LEN];
-    GrB_set(GrB_GLOBAL, DEBUG, GxB_BURBLE);
+    // GrB_set(GrB_GLOBAL, DEBUG, GxB_BURBLE);
     GrB_Vector iset = NULL; // independent set (output vector)
     GrB_Vector score = NULL;
     GrB_Vector scoreA = NULL; // random score for each node
@@ -166,7 +166,7 @@ int LAGraph_IsolateSets(
     char *msg      // Error message buffer
 )
 {
-#if LG_SUITESPARSE_GRAPHBLAS_V10
+#if LG_SUITESPARSE_GRAPHBLAS_V10_2
     LG_CLEAR_MSG;
     // LG_TRY(LAGraph_CheckGraph(G, msg));
     LG_ASSERT(IsolateSets != NULL, GrB_NULL_POINTER);

experimental/algorithm/LAGraph_LouvainIS.c

@@ -23,7 +23,7 @@
 #include <stdio.h>
 #include <time.h>
 
-#if LG_SUITESPARSE_GRAPHBLAS_V10
+#if LG_SUITESPARSE_GRAPHBLAS_V10_2
 
 // #define TIMING
 #define DEBUG 0
@@ -43,29 +43,29 @@
 #define err(x, info)
 #endif
 
-typedef struct Theta
+typedef struct // Theta
 {
     double *d;
     double m;
     uint64_t seed;
 } Theta;
 #define THETA_DEFN                    \
-    "typedef struct Theta"            \
+    "typedef struct /* Theta */"      \
     "{"                               \
     "    double *d;"                  \
     "    double m;"                   \
     "    uint64_t seed;"              \
     "} Theta;"
 
-typedef struct argmax_tup
+typedef struct // argmax_tup
 {
     double score; /* change in modularity */
     int64_t comm; /* who */
     double tb;
 } argmax_tup;
 
 #define AM_TUP                                       \
-    "typedef struct argmax_tup\n"                    \
+    "typedef struct /* argmax_tup */ \n"             \
     "{\n"                                            \
     "    double score; /* change in modularity */\n" \
     "    int64_t comm;    /* who */\n"               \
@@ -292,9 +292,9 @@ int LAGraph_LouvainIS(
     LAGraph_Graph G,
     char *msg)
 {
-#if LG_SUITESPARSE_GRAPHBLAS_V10
+#if LG_SUITESPARSE_GRAPHBLAS_V10_2
     char MATRIX_TYPE[LAGRAPH_MSG_LEN];
-    GrB_set(GrB_GLOBAL, false, GxB_BURBLE);
+    // GrB_set(GrB_GLOBAL, false, GxB_BURBLE);
 
     GrB_Descriptor ri = NULL;
     GrB_Descriptor rv = NULL;

experimental/algorithm/LAGraph_LouvainSeq.c

@@ -155,9 +155,9 @@ int LAGraph_LouvainSeq(
     uint64_t seed,
     char *msg)
 {
-#if LG_SUITESPARSE_GRAPHBLAS_V10
+#if LG_SUITESPARSE_GRAPHBLAS_V10_2
     char MATRIX_TYPE[LAGRAPH_MSG_LEN];
-    GrB_set(GrB_GLOBAL, false, GxB_BURBLE);
+    // GrB_set(GrB_GLOBAL, false, GxB_BURBLE);
 
 
     GrB_Vector t_q = NULL, q1 = NULL, t = NULL, v = NULL;

experimental/test/test_IsolateSets.c

@@ -23,7 +23,7 @@ const matrix_info files[] = {
 };
 
 void test_IsolateSets(void){
-    #if LG_SUITESPARSE_GRAPHBLAS_V10
+    #if LG_SUITESPARSE_GRAPHBLAS_V10_2
     LAGraph_Init(msg);
     printf("\n");
     for(int k = 0;;k++)

experimental/test/test_louvain.c

@@ -40,8 +40,9 @@ const matrix_info files[] = {
 
 void test_LouvainSeq(void)
 {
-    #if LG_SUITESPARSE_GRAPHBLAS_V10
+    #if LG_SUITESPARSE_GRAPHBLAS_V10_2
     LAGraph_Init(msg);
+    // LG_SET_BURBLE (false) ;
 
     for (int k = 0;; k++)
     {
@@ -89,8 +90,9 @@ void test_LouvainSeq(void)
 }
 void test_LouvainIS(void)
 {
-    #if LG_SUITESPARSE_GRAPHBLAS_V10
+    #if LG_SUITESPARSE_GRAPHBLAS_V10_2
     LAGraph_Init(msg);
+    // LG_SET_BURBLE (true) ;
 
     for (int k = 0;; k++)
     {
@@ -120,6 +122,9 @@ void test_LouvainIS(void)
 
             double tsimple = LAGraph_WallClockTime();
             OK(LAGraph_LouvainIS(&S,seed, G, msg));
+            // GrB_Info info = (LAGraph_LouvainIS(&S,seed, G, msg));
+            // printf ("info %d\nmsg: %s\n", info, msg) ;
+            // OK (info) ;
 
             // OK(LAGraph_Louvain_res(&S,G,.3,msg));
             tsimple = LAGraph_WallClockTime() - tsimple;

experimental/test/test_modularity.c

@@ -29,7 +29,7 @@ const matrix_info files[] = {
     {"", "", -1, -1}};
 void test_modularity(void)
 {
-    #if LG_SUITESPARSE_GRAPHBLAS_V10
+    #if LG_SUITESPARSE_GRAPHBLAS_V10_2
     LAGraph_Init(msg);
     for (int k = 0;; k++)
     {