Sync v1.2 branch, get new commits

Author: homka122

CMakeLists.txt

@@ -247,6 +247,11 @@ elseif ( "${CMAKE_C_COMPILER_ID}" STREQUAL "Intel" )
     #if ( CMAKE_C_COMPILER_VERSION VERSION_LESS 18.0 )
     #    message ( FATAL_ERROR "icc version must be at least 18.0" )
     #endif ( )
+elseif ( "${CMAKE_C_COMPILER_ID}" STREQUAL "AppleClang" )
+    # options for Apple Clang
+    # FIXME
+#    set ( CMAKE_C_FLAGS  "${CMAKE_C_FLAGS} -fsanitize=address" )
+#    set ( CMAKE_C_FLAGS  "${CMAKE_C_FLAGS} -fsanitize=thread" )
 elseif ( "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" AND NOT "${CMAKE_C_COMPILER_FRONTEND_VARIANT}" STREQUAL "MSVC" )
     # options for clang
     set ( CMAKE_C_FLAGS  "${CMAKE_C_FLAGS} -O3 " )

experimental/algorithm/LAGr_MarkovClustering.c

@@ -41,8 +41,6 @@
         GrB_free(c_f);                                                         \
     }
 
-#define DEBUG
-
 #include "LG_internal.h"
 #include <LAGraphX.h>
 
@@ -205,7 +203,7 @@ int LAGr_MarkovClustering(
     GRB_TRY(GrB_Vector_nvals(&p_nvals, argmax_p));
     LG_TRY(LAGraph_Malloc((void **)&pi, p_nvals, sizeof(GrB_Index), msg));
     LG_TRY(LAGraph_Malloc((void **)&px, p_nvals, sizeof(GrB_Index), msg));
-    GRB_TRY(GrB_Vector_extractTuples_INT64(pi, px, &p_nvals, argmax_p));
+    GRB_TRY(GrB_Vector_extractTuples_INT64(pi, (int64_t *) px, &p_nvals, argmax_p));
 
     // Sometimes (particularly, when the pruning threshold is high), some
     // columns in the steady-state T have no values, i.e., they are not
@@ -259,7 +257,7 @@ int LAGr_MarkovClustering(
 
     GrB_Vector c = NULL;
     GRB_TRY(GrB_Vector_new(&c, GrB_INT64, n));
-    GRB_TRY(GrB_Vector_build_INT64(c, pi, px, n, NULL));
+    GRB_TRY(GrB_Vector_build_INT64(c, pi, (int64_t *) px, n, NULL));
     GrB_Vector_wait(c, GrB_MATERIALIZE);
 
     LAGraph_Free((void *)&pi, NULL);

experimental/algorithm/LAGr_Modularity.c

@@ -126,7 +126,7 @@ int LAGr_Modularity(
     GrB_Index *cI, *cX;
     LAGRAPH_TRY(LAGraph_Malloc((void **)&cI, n, sizeof(GrB_Index), msg));
     LAGRAPH_TRY(LAGraph_Malloc((void **)&cX, n, sizeof(GrB_Index), msg));
-    GRB_TRY(GrB_Vector_extractTuples_INT64(cI, cX, &n, c));
+    GRB_TRY(GrB_Vector_extractTuples_INT64(cI, (int64_t *) cX, &n, c));
     GRB_TRY(GxB_Matrix_build_Scalar(C, cX, cI, ONE_INT64, n));
     GrB_Matrix_wait(C, GrB_MATERIALIZE);
     LAGraph_Free((void **)&cI, NULL);
@@ -183,9 +183,9 @@ int LAGr_Modularity(
         LAGraph_Malloc((void **)&k_outX, nclusters, sizeof(GrB_Index), msg));
     LAGRAPH_TRY(
         LAGraph_Malloc((void **)&k_inX, nclusters, sizeof(GrB_Index), msg));
-    GRB_TRY(GrB_Vector_extractTuples_INT64(NULL, lX, &nclusters, l));
-    GRB_TRY(GrB_Vector_extractTuples_INT64(NULL, k_outX, &nclusters, k_out));
-    GRB_TRY(GrB_Vector_extractTuples_INT64(NULL, k_inX, &nclusters, k_in));
+    GRB_TRY(GrB_Vector_extractTuples_INT64(NULL, (int64_t *) lX, &nclusters, l));
+    GRB_TRY(GrB_Vector_extractTuples_INT64(NULL, (int64_t *) k_outX, &nclusters, k_out));
+    GRB_TRY(GrB_Vector_extractTuples_INT64(NULL, (int64_t *) k_inX, &nclusters, k_in));
 
     GrB_Index m, out_degree_sum, in_degree_sum, L_c;
     GRB_TRY(GrB_reduce(&out_degree_sum, NULL, GrB_PLUS_MONOID_INT64, out_degree,

experimental/algorithm/LAGr_PartitionQuality.c

@@ -44,8 +44,6 @@
         LG_FREE_WORK;                                                          \
     }
 
-#define DEBUG 0
-
 #include "LG_internal.h"
 #include <LAGraphX.h>
 
@@ -89,7 +87,7 @@ int LAGr_PartitionQuality(
     // Delete self-edges, not relevant to these clustering metrics
     GRB_TRY(GrB_select(A, NULL, NULL, GrB_OFFDIAG, A, 0, NULL));
 
-#if DEBUG
+#if 0
     FILE *f = fopen("./data/pp_sanitized_data.mtx", "w");
     LAGRAPH_TRY(LAGraph_MMWrite(A, f, NULL, msg));
     fclose(f);
@@ -111,7 +109,7 @@ int LAGr_PartitionQuality(
     GrB_Index *cI, *cX;
     LAGRAPH_TRY(LAGraph_Malloc((void **)&cI, n, sizeof(GrB_Index), msg));
     LAGRAPH_TRY(LAGraph_Malloc((void **)&cX, n, sizeof(GrB_Index), msg));
-    GRB_TRY(GrB_Vector_extractTuples_INT64(cI, cX, &n, c));
+    GRB_TRY(GrB_Vector_extractTuples_INT64(cI, (int64_t *) cX, &n, c));
     GRB_TRY(GxB_Matrix_build_Scalar(C, cX, cI, ONE_INT64, n));
     GrB_Matrix_wait(C, GrB_MATERIALIZE);
     LAGraph_Free((void **)&cI, NULL);

experimental/algorithm/LAGr_PeerPressureClustering.c

@@ -48,8 +48,6 @@
         GrB_free(c_f);                                                         \
     }
 
-#define DEBUG
-
 #include "LG_internal.h"
 #include <LAGraphX.h>
 
@@ -203,7 +201,7 @@ int LAGr_PeerPressureClustering(
             GrB_vxm(m_index, NULL, NULL, GxB_MIN_SECONDI_INT64, ones, E, NULL));
         // m_index_values(i) = argmax(T(:, i))
         GRB_TRY(
-            GrB_Vector_extractTuples_INT64(NULL, m_index_values, &n, m_index));
+            GrB_Vector_extractTuples_INT64(NULL, (int64_t *) m_index_values, &n, m_index));
         GRB_TRY(GrB_Matrix_new(&C_temp, GrB_BOOL, n, n));
         GRB_TRY(GrB_extract(C_temp, NULL, NULL, I, GrB_ALL, n, m_index_values,
                             n, NULL));

experimental/algorithm/LAGr_TriangleCount_GPU.c

@@ -125,11 +125,12 @@ void dump_matrix (GrB_Matrix C, char *filename)
     int64_t *I = malloc ((cnvals+1) * sizeof (int64_t)) ;
     int64_t *J = malloc ((cnvals+1) * sizeof (int64_t)) ;
     int64_t *X = malloc ((cnvals+1) * sizeof (int64_t)) ;
-    GrB_Matrix_extractTuples_INT64 (I,J,X,&cnvals,C) ;
+    GrB_Matrix_extractTuples_INT64 ((GrB_Index *) I,(GrB_Index *) J,
+        X, &cnvals, C) ;
     FILE *f = fopen (filename, "w") ;
     for (int64_t k = 0 ; k < cnvals ; k++)
     {
-        fprintf (f, "%ld %ld %ld\n", I [k], J [k], X [k]) ;
+        fprintf (f, "%ld %ld %ld\n", (long) I [k], (long) J [k], (long) X [k]) ;
     }
     free (I) ;
     free (J) ;
@@ -421,10 +422,10 @@ int LAGr_TriangleCount_GPU
 
             t = LAGraph_WallClockTime ( ) ;
 
-            dump_matrix (L, "L") ;
-            dump_matrix (U, "U") ;
+//          dump_matrix (L, "L") ;
+//          dump_matrix (U, "U") ;
             GRB_TRY (GrB_mxm (C, U, NULL, semiring, U, L, GrB_DESC_ST1)) ;
-            dump_matrix (C, "C") ;
+//          dump_matrix (C, "C") ;
 
             GRB_TRY (GrB_reduce (&ntri, NULL, monoid, C, NULL)) ;
             t = LAGraph_WallClockTime ( ) - t ;

experimental/algorithm/LAGraph_EstimateDiameter.c

@@ -201,7 +201,7 @@ int LAGraph_EstimateDiameter
 
         // set up source list for next round
         // get the number of peripheral nodes 
-        int64_t nperi = 0;
+        GrB_Index nperi = 0;
         GRB_TRY (GrB_Vector_new (&candidateSrcs, int_type, n)) ;
         GRB_TRY (GrB_select(candidateSrcs, NULL, NULL, eqOp, ecc, d, NULL)) ;
         GRB_TRY (GrB_Vector_nvals(&nperi, candidateSrcs)) ;

experimental/algorithm/LAGraph_VertexCentrality_Triangle.c

@@ -24,8 +24,9 @@
 // (this could be modified); results are undefined if this condition doesn't
 // hold.
 
-// P. Burkhardt, "Triangle centrality," https://arxiv.org/pdf/2105.00110.pdf,
-// April 2021.
+// Paul Burkhardt. 2024. Triangle Centrality. ACM Trans. Knowl. Discov. Data
+// 18, 9, Article 217 (November 2024), 34 pages.
+// https://doi.org/10.1145/3685677
 
 // Method 3 is by far the fastest.
 

experimental/algorithm/LAGraph_argminmax.c

@@ -116,7 +116,9 @@ int argminmax
     GrB_Matrix_free (&D) ;
     GrB_Matrix_free (&G) ;
     GrB_Matrix_free (&y) ;
+    return (GrB_SUCCESS) ;
 }
+
 //------------------------------------------------------------------------------
 // gbargminmax: mexFunction to compute the argmin/max of each row/column of A
 //------------------------------------------------------------------------------

experimental/benchmark/hdip_fiedler_demo.c

@@ -11,29 +11,6 @@
 
 //------------------------------------------------------------------------------
 
-// This main program is a simple driver for testing and benchmarking the
-// LAGraph_HelloWorld "algorithm", in experimental/algorithm.  To use it,
-// compile LAGraph while in the build folder with these commands:
-//
-//      cd LAGraph/build
-//      cmake ..
-//      make -j8
-//
-// Then run this demo with an input matrix.  For example:
-//
-//      ./experimental/benchmark/hellworld_demo ../data/west0067.mtx
-//      ./experimental/benchmark/hellworld_demo < ../data/west0067.mtx
-//      ./experimental/benchmark/hellworld_demo ../data/karate.mtx
-//
-// If you create your own algorithm and want to mimic this main program, call
-// it write in experimental/benchmark/whatever_demo.c (with "_demo.c" as the
-// end of the filename), and the cmake will find it and compile it.
-
-// This main program makes use of supporting utilities in
-// src/benchmark/LAGraph_demo.h and src/utility/LG_internal.h.
-// See helloworld2_demo.c for a main program that just uses the
-// user-callable methods in LAGraph.h and LAGraphX.h.
-
 #include "../../src/benchmark/LAGraph_demo.h"
 #include "LAGraphX.h"
 #include "LG_internal.h"
@@ -386,7 +363,7 @@ int main(int argc, char **argv)
     }
 
     printf("\n=============================Testing karate lambda:\n");
-    err = abs(lambda_result - 1.3297);
+    err = fabs(lambda_result - 1.3297);
     if (err < 1e-4)
     {
         printf("Test passed.\n");
@@ -412,7 +389,7 @@ int main(int argc, char **argv)
     }
 
     printf("\n=============================Testing bucky lambda:\n");
-    err = abs(lambda_result - 0.2434);
+    err = fabs(lambda_result - 0.2434);
     if (err < 1e-4)
     {
         printf("Test passed.\n");
@@ -438,7 +415,7 @@ int main(int argc, char **argv)
     }
 
     printf("\n=============================Testing west0067 lambda:\n");
-    err = abs(lambda_result - 6.5586);
+    err = fabs(lambda_result - 6.5586);
     if (err < 1e-4)
     {
         printf("Test passed.\n");