Merge pull request #363 from GraphBLAS/v1.2

V1.2: revised msf, adding maxflow, revised scc

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

Makefile

@@ -19,7 +19,7 @@
 #
 # To compile with an alternate compiler:
 #
-#       make CC=gcc CXX=g++
+#       make CC=gcc CXX=g++ FC=gfortran
 #
 # To compile/install for system-wide usage (typically in /usr/local):
 #
@@ -48,28 +48,30 @@
 
 JOBS ?= 8
 
+F = -DSUITESPARSE_USE_FORTRAN=OFF
+
 default: library
 
 library:
-	( cd build && cmake $(CMAKE_OPTIONS) .. && cmake --build . --config Release -j${JOBS} )
+	( cd build && cmake $(F) $(CMAKE_OPTIONS) .. && cmake --build . --config Release -j${JOBS} )
 
 # install only in SuiteSparse/lib and SuiteSparse/include
 local:
-	( cd build && cmake $(CMAKE_OPTIONS) -USUITESPARSE_PKGFILEDIR -DSUITESPARSE_LOCAL_INSTALL=1 .. && cmake --build . --config Release -j${JOBS} )
+	( cd build && cmake $(F) $(CMAKE_OPTIONS) -USUITESPARSE_PKGFILEDIR -DSUITESPARSE_LOCAL_INSTALL=1 .. && cmake --build . --config Release -j${JOBS} )
 
 # install CMAKE_INSTALL_PREFIX
 global:
-	( cd build && cmake $(CMAKE_OPTIONS) -USUITESPARSE_PKGFILEDIR -DSUITESPARSE_LOCAL_INSTALL=0 .. && cmake --build . --config Release -j${JOBS} )
+	( cd build && cmake $(F) $(CMAKE_OPTIONS) -USUITESPARSE_PKGFILEDIR -DSUITESPARSE_LOCAL_INSTALL=0 .. && cmake --build . --config Release -j${JOBS} )
 
 vanilla:
-	( cd build && cmake $(CMAKE_OPTIONS) -USUITESPARSE_PKGFILEDIR -DLAGRAPH_VANILLA=1 .. && cmake --build . --config Release -j${JOBS} )
+	( cd build && cmake $(F) $(CMAKE_OPTIONS) -USUITESPARSE_PKGFILEDIR -DLAGRAPH_VANILLA=1 .. && cmake --build . --config Release -j${JOBS} )
 
 # compile with -g for debugging
 debug:
-	( cd build && cmake $(CMAKE_OPTIONS) -DCMAKE_BUILD_TYPE=Debug .. && cmake --build . --config Release -j${JOBS} )
+	( cd build && cmake $(F) $(CMAKE_OPTIONS) -DCMAKE_BUILD_TYPE=Debug .. && cmake --build . --config Release -j${JOBS} )
 
 vanilla_debug:
-	( cd build && cmake $(CMAKE_OPTIONS) -DCMAKE_BUILD_TYPE=Debug -USUITESPARSE_PKGFILEDIR -DLAGRAPH_VANILLA=1 .. && cmake --build . --config Release -j${JOBS} )
+	( cd build && cmake $(F) $(CMAKE_OPTIONS) -DCMAKE_BUILD_TYPE=Debug -USUITESPARSE_PKGFILEDIR -DLAGRAPH_VANILLA=1 .. && cmake --build . --config Release -j${JOBS} )
 
 all: library
 
@@ -83,7 +85,7 @@ verbose_test: library
 # dlopen and dlinit), and run the tests with valgrind.  For best results,
 # compile GraphBLAS without OpenMP and with the JIT disabled.
 memcheck: distclean
-	( cd build && cmake $(CMAKE_OPTIONS) -DCMAKE_BUILD_TYPE=Debug -DLAGRAPH_USE_OPENMP=0 .. )
+	( cd build && cmake $(F) $(CMAKE_OPTIONS) -DCMAKE_BUILD_TYPE=Debug -DLAGRAPH_USE_OPENMP=0 .. )
 	( cd build && cmake --build . --config Release -j${JOBS} )
 	( cd build && ctest . -T memcheck )
 
@@ -96,7 +98,7 @@ remake:
 
 # just run cmake to set things up
 setup:
-	( cd build && cmake $(CMAKE_OPTIONS) .. )
+	( cd build && cmake $(F) $(CMAKE_OPTIONS) .. )
 
 install:
 	( cd build && cmake --install . )
@@ -107,7 +109,7 @@ uninstall:
 
 # clean, compile, and run test coverage
 cov: distclean
-	( cd build && cmake -DCOVERAGE=1 .. && cmake --build . --config Release -j${JOBS} && cmake --build . --target test_coverage )
+	( cd build && cmake $(F) -DCOVERAGE=1 .. && cmake --build . --config Release -j${JOBS} && cmake --build . --target test_coverage )
 
 # remove all files not in the distribution
 clean: distclean

cmake_modules/SuiteSparsePolicy.cmake

@@ -72,6 +72,19 @@
 #                       for your system.
 #                       Default: ON
 #
+#       *** WARNING:  Using the Intel icx compiler, the Intel MKL BLAS, and the
+#       GNU Fortran compiler together will result in two OpenMP libraries
+#       linked to the UMFPACK, CHOLMOD, ParU, and SPQR libraries.  This will
+#       cause serious performance issues.  This cmake file detects if icx and
+#       gfortran are in use, and issues a fatal error.  Otherwise, if the C,
+#       C++, and Fortran compilers have a different compiler ID, a warning is
+#       issued; this is NOT recommended, but it might be OK.  In that case,
+#       ensure that you are linking with just one OpenMP library.  If this
+#       occurs, disable the use of Fortran by setting SUITESPARSE_USE_FORTRAN
+#       to OFF, use a suite of C/C++/Fortran compilers with the same ID,
+#       or ensure that all your compiled libraries link against a single
+#       OpenMP library.
+#
 #   SUITESPARSE_PKGFILEDIR: Directory where CMake Config and pkg-config files
 #                       will be installed.  By default, CMake Config files will
 #                       be installed in the subfolder `cmake` of the directory
@@ -288,11 +301,36 @@ endif ( )
 include ( CheckLanguage )
 option ( SUITESPARSE_USE_FORTRAN "ON (default): use Fortran. OFF: do not use Fortran" ON )
 if ( SUITESPARSE_USE_FORTRAN )
+    message ( STATUS "Checking if Fortran is available and compatible with C/C++" )
     check_language ( Fortran )
     if ( CMAKE_Fortran_COMPILER )
+        # Fortran is available; ensure that it is compatible with C/C++
+        enable_language ( CXX )
         enable_language ( Fortran )
-        message ( STATUS "Fortran:          ${CMAKE_Fortran_COMPILER}" )
         set ( SUITESPARSE_HAS_FORTRAN ON )
+        if ( NOT "${CMAKE_Fortran_COMPILER_ID}" STREQUAL "${CMAKE_C_COMPILER_ID}" OR
+             NOT "${CMAKE_Fortran_COMPILER_ID}" STREQUAL "${CMAKE_CXX_COMPILER_ID}" )
+            message ( STATUS " " )
+            message ( STATUS "Incompatible Fortran/C/C++ compilers detected:" )
+            message ( STATUS "    Fortran:          ${CMAKE_Fortran_COMPILER}" )
+            message ( STATUS "    Fortran id:       ${CMAKE_Fortran_COMPILER_ID}" )
+            message ( STATUS "    C                 ${CMAKE_C_COMPILER}" )
+            message ( STATUS "    C       id:       ${CMAKE_C_COMPILER_ID}" )
+            message ( STATUS "    C++               ${CMAKE_CXX_COMPILER}" )
+            message ( STATUS "    C++     id:       ${CMAKE_CXX_COMPILER_ID}" )
+            if ( "${CMAKE_C_COMPILER_ID}" STREQUAL "IntelLLVM" )
+                # icx/icpx cannot be used with gfortran: this is a fatal error
+                message ( FATAL_ERROR "ERROR: Using Fortran with SuiteSparse requires that "
+                " it has the same compiler ID as the C/C++ compilers."
+                "  Use a compatible Fortran compiler, or set SUITESPARSE_USE_FORTRAN to OFF." )
+            else ( )
+                # other cases: just issue a warning and hope it works.
+                message ( WARNING "Warning: Using Fortran with SuiteSparse requires that "
+                " it has the same compiler ID as the C/C++ compilers."
+                "  Use a compatible Fortran compiler, or set SUITESPARSE_USE_FORTRAN to OFF." )
+            endif ( )
+        endif ( )
+        message ( STATUS "Fortran:          enabled" )
     else ( )
         # Fortran not available:
         set ( SUITESPARSE_HAS_FORTRAN OFF )

data/cycle_flow.mtx

@@ -0,0 +1,95 @@
+%%MatrixMarket matrix coordinate real general
+% A 90x90 adjacency matrix representing a cycle of 90 vertices.
+% Each edge has capacity = 1.
+% There are 90 edges in total.
+90 90 90
+1 2 1
+2 3 1
+3 4 1
+4 5 1
+5 6 1
+6 7 1
+7 8 1
+8 9 1
+9 10 1
+10 11 1
+11 12 1
+12 13 1
+13 14 1
+14 15 1
+15 16 1
+16 17 1
+17 18 1
+18 19 1
+19 20 1
+20 21 1
+21 22 1
+22 23 1
+23 24 1
+24 25 1
+25 26 1
+26 27 1
+27 28 1
+28 29 1
+29 30 1
+30 31 1
+31 32 1
+32 33 1
+33 34 1
+34 35 1
+35 36 1
+36 37 1
+37 38 1
+38 39 1
+39 40 1
+40 41 1
+41 42 1
+42 43 1
+43 44 1
+44 45 1
+45 46 1
+46 47 1
+47 48 1
+48 49 1
+49 50 1
+50 51 1
+51 52 1
+52 53 1
+53 54 1
+54 55 1
+55 56 1
+56 57 1
+57 58 1
+58 59 1
+59 60 1
+60 61 1
+61 62 1
+62 63 1
+63 64 1
+64 65 1
+65 66 1
+66 67 1
+67 68 1
+68 69 1
+69 70 1
+70 71 1
+71 72 1
+72 73 1
+73 74 1
+74 75 1
+75 76 1
+76 77 1
+77 78 1
+78 79 1
+79 80 1
+80 81 1
+81 82 1
+82 83 1
+83 84 1
+84 85 1
+85 86 1
+86 87 1
+87 88 1
+88 89 1
+89 90 1
+90 1 1

data/matrix_random_flow.mtx

@@ -0,0 +1,23 @@
+%%MatrixMarket matrix coordinate integer general
+%
+10 10 20
+1 4 55
+3 1 11
+3 2 67
+3 5 10
+4 1 29
+4 9 22
+5 4 78
+5 9 9
+6 2 75
+6 3 87
+6 8 30
+7 4 60
+7 6 89
+7 8 11
+7 9 23
+8 1 55
+8 5 98
+8 7 89
+8 10 30
+9 7 46

data/rand.mtx

@@ -0,0 +1,38 @@
+%%MatrixMarket matrix coordinate real general
+20 20 36
+1 2 10
+1 3 15
+1 4 5
+1 5 7
+2 6 10
+3 6 5
+3 7 10
+4 7 5
+4 8 5
+5 8 7
+6 9 8
+6 10 10
+7 10 5
+7 11 5
+8 9 5
+8 11 7
+9 12 10
+9 13 3
+10 13 10
+10 14 5
+11 14 10
+11 12 5
+12 15 5
+12 16 7
+13 16 10
+13 17 5
+14 17 10
+14 15 3
+15 18 7
+15 19 5
+16 19 10
+16 20 10
+17 20 15
+17 18 5
+18 20 5
+19 20 10

data/wiki.mtx

@@ -0,0 +1,9 @@
+%%MatrixMarket matrix coordinate real general
+% 6x6 matrix with 6 non-zero entries
+6 6 6
+1 2 2
+1 3 9
+2 3 1
+3 5 7
+4 6 7
+5 6 4

experimental/algorithm/LAGr_EdgeBetweennessCentrality.c

@@ -66,15 +66,15 @@
 // (1+x)/y function for double: z = (1 + x) / y
 //------------------------------------------------------------------------------
 
-void add_one_divide_function (double *z, const double *x, const double *y)
+void LG_EBC_add_one_divide_function (double *z, const double *x, const double *y)
 {
     double a = (*(x)) ;
     double b = (*(y)) ;
     (*(z)) = (1 + a) / b ;
 }
 
 #define ADD_ONE_DIVIDE_FUNCTION_DEFN                                           \
-"void add_one_divide_function (double *z, const double *x, const double *y)\n" \
+"void LG_EBC_add_one_divide_function (double *z, const double *x, const double *y)\n" \
 "{                                                                         \n" \
 "    double a = (*(x)) ;                                                   \n" \
 "    double b = (*(y)) ;                                                   \n" \
@@ -203,9 +203,9 @@ int LAGr_EdgeBetweennessCentrality
     // =========================================================================
 
     GRB_TRY (GxB_BinaryOp_new (&Add_One_Divide,
-        (GxB_binary_function) add_one_divide_function,
+        (GxB_binary_function) LG_EBC_add_one_divide_function,
         GrB_FP64, GrB_FP64, GrB_FP64,
-        "add_one_divide_function", ADD_ONE_DIVIDE_FUNCTION_DEFN)) ;
+        "LG_EBC_add_one_divide_function", ADD_ONE_DIVIDE_FUNCTION_DEFN)) ;
 
     // Initialize the frontier, paths, Update, and bc_vertex_flow
     GRB_TRY (GrB_Vector_new (&paths,    GrB_FP64, n)) ;