Merge pull request #936 from DrTimothyAldenDavis/dev

SuiteSparse 7.10.2

Author: DrTimothyAldenDavis

.github/workflows/build-arch-emu.yaml

@@ -21,7 +21,8 @@ env:
 jobs:
 
   alpine:
-    runs-on: ubuntu-latest
+    # Run armv7 on aarch64 runners
+    runs-on: ${{ matrix.arch == 'armv7' && 'ubuntu-24.04-arm' || 'ubuntu-latest' }}
 
     defaults:
       run:
@@ -35,20 +36,24 @@ jobs:
       matrix:
         # For available CPU architectures, see:
         # https://github.com/marketplace/actions/setup-alpine-linux-environment
-        arch: [x86, armv7, ppc64le, s390x, riscv64]
+        arch: [x86, armv7, ppc64le, s390x, riscv64, loongarch64]
         include:
           - arch: x86
             ccache-max: 64M
             extra-build-libs: ":GraphBLAS:LAGraph"
             extra-check-libs: ":GraphBLAS:LAGraph"
           - arch: armv7
-            ccache-max: 25M
+            ccache-max: 60M
+            extra-build-libs: ":GraphBLAS:LAGraph"
+            extra-check-libs: ":GraphBLAS:LAGraph"
           - arch: ppc64le
             ccache-max: 28M
           - arch: s390x
             ccache-max: 28M
           - arch: riscv64
             ccache-max: 28M
+          - arch: loongarch64
+            ccache-max: 30M
 
     name: alpine (${{ matrix.arch }})
 
@@ -66,6 +71,9 @@ jobs:
         # shell: bash
         with:
           arch: ${{ matrix.arch }}
+          apk-tools-url: ${{ matrix.arch == 'armv7'
+              && 'https://gitlab.alpinelinux.org/api/v4/projects/5/packages/generic/v2.14.7/aarch64/apk.static#!sha256!27a975638ddc95a411c9f17c63383e335da9edf6bb7de2281d950c291a11f878'
+              || 'https://gitlab.alpinelinux.org/api/v4/projects/5/packages/generic/v2.14.7/x86_64/apk.static#!sha256!bdd044e0fd6cc388c5e571e1093efa5f35f7767cc5aa338b0a2576a429009a62' }}
           packages: >
             build-base
             ccache
@@ -82,6 +90,11 @@ jobs:
             libtool
           # ${{ matrix.arch != 'riscv64' && 'valgrind' || '' }}
 
+      - name: disable QEMU emulation
+        if: matrix.arch == 'armv7'
+        shell: bash
+        run: sudo update-binfmts --disable qemu-arm
+
       - name: get CPU information (emulated)
         run: lscpu
 

.github/workflows/root-cmakelists-msvc.yaml

@@ -23,7 +23,7 @@ jobs:
     # https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners
     runs-on: windows-latest
 
-    name: msvc (${{ matrix.cc }} ${{ matrix.openmp }} OpenMP, ${{ matrix.link }})
+    name: msvc (${{ matrix.cc }} ${{ matrix.openmp }} OpenMP ${{ matrix.cuda }} CUDA, ${{ matrix.link }})
 
     defaults:
       run:
@@ -36,23 +36,38 @@ jobs:
 
       matrix:
         openmp: [with]
+        cuda: [without]
         link: [both]
         cc: [cl]
         cxx: [cl]
         include:
           - openmp: with
+            cuda: with
+            link: both
+            cc: cl
+            cxx: cl
+          - openmp: with
+            cuda: with
+            link: static
+            cc: cl
+            cxx: cl
+          - openmp: with
+            cuda: without
             link: both
             cc: cl
             cxx: cl
           - openmp: without
+            cuda: without
             link: both
             cc: cl
             cxx: cl
           - openmp: with
+            cuda: without
             link: both
             cc: clang-cl
             cxx: clang-cl
           - openmp: with
+            cuda: without
             link: both
             cc: clang
             cxx: clang++
@@ -111,7 +126,7 @@ jobs:
 
           msystem: UCRT64
 
-      - uses: Jimver/cuda-toolkit@v0.2.21
+      - uses: Jimver/cuda-toolkit@v0.2.22
         name: install CUDA toolkit
         if: matrix.cuda == 'with'
         id: cuda-toolkit

CHOLMOD/CMakeLists.txt

@@ -12,10 +12,10 @@
 # cmake 3.22 is required to find the BLAS/LAPACK
 cmake_minimum_required ( VERSION 3.22 )
 
-set ( CHOLMOD_DATE "Feb 20, 2025" )
+set ( CHOLMOD_DATE "Apr 10, 2025" )
 set ( CHOLMOD_VERSION_MAJOR 5 CACHE STRING "" FORCE )
 set ( CHOLMOD_VERSION_MINOR 3 CACHE STRING "" FORCE )
-set ( CHOLMOD_VERSION_SUB   1 CACHE STRING "" FORCE )
+set ( CHOLMOD_VERSION_SUB   2 CACHE STRING "" FORCE )
 
 message ( STATUS "Building CHOLMOD version: v"
     ${CHOLMOD_VERSION_MAJOR}.
@@ -383,12 +383,16 @@ if ( BUILD_SHARED_LIBS )
         OUTPUT_NAME cholmod
         SOVERSION ${CHOLMOD_VERSION_MAJOR}
         PUBLIC_HEADER "Include/cholmod.h"
-        WINDOWS_EXPORT_ALL_SYMBOLS ON
-        LINKER_LANGUAGE C )
+        WINDOWS_EXPORT_ALL_SYMBOLS ON )
 
     if ( CHOLMOD_HAS_CUDA )
-        set_target_properties ( CHOLMOD PROPERTIES CUDA_SEPARABLE_COMPILATION ON )
-        set_target_properties ( CHOLMOD PROPERTIES POSITION_INDEPENDENT_CODE ON )
+        set_target_properties ( CHOLMOD PROPERTIES
+            POSITION_INDEPENDENT_CODE ON
+            CUDA_SEPARABLE_COMPILATION ON
+            LINKER_LANGUAGE CUDA )
+    else ( )
+        set_target_properties ( CHOLMOD PROPERTIES
+            LINKER_LANGUAGE C )
     endif ( )
 
     if ( ${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.25" )
@@ -411,17 +415,27 @@ if ( BUILD_STATIC_LIBS )
         C_STANDARD 11
         C_STANDARD_REQUIRED ON
         OUTPUT_NAME cholmod
-        PUBLIC_HEADER "Include/cholmod.h"
-        LINKER_LANGUAGE C )
+        PUBLIC_HEADER "Include/cholmod.h" )
 
     if ( MSVC OR ("${CMAKE_C_SIMULATE_ID}" STREQUAL "MSVC") )
         set_target_properties ( CHOLMOD_static PROPERTIES
             OUTPUT_NAME cholmod_static )
     endif ( )
 
     if ( CHOLMOD_HAS_CUDA )
-        set_target_properties ( CHOLMOD_static PROPERTIES CUDA_SEPARABLE_COMPILATION on )
-        set_target_properties ( CHOLMOD_static PROPERTIES POSITION_INDEPENDENT_CODE on )
+        # Dependencies that are linking to this static library would need to
+        # use the CUDA compiler as the linker driver. Ideally, CMake would do
+        # that automatically. Until that is fixed in CMake, set the
+        # CUDA_RESOLVE_DEVICE_SYMBOLS property ON.
+        set_target_properties ( CHOLMOD_static PROPERTIES
+            POSITION_INDEPENDENT_CODE ON
+            CUDA_SEPARABLE_COMPILATION ON
+            CUDA_RESOLVE_DEVICE_SYMBOLS ON
+            CUDA_RUNTIME_LIBRARY Static
+            LINKER_LANGUAGE CUDA )
+    else ( )
+        set_target_properties ( CHOLMOD_static PROPERTIES
+            LINKER_LANGUAGE C )
     endif ( )
 
     if ( ${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.25" )

CHOLMOD/Config/cholmod.h.in

@@ -309,8 +309,8 @@ int cholmod_l_version (int version [3]) ;
 
 #define CHOLMOD__VERSION SUITESPARSE__VERCODE(@CHOLMOD_VERSION_MAJOR@,@CHOLMOD_VERSION_MINOR@,@CHOLMOD_VERSION_SUB@)
 #if !defined (SUITESPARSE__VERSION) || \
-    (SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,9,0))
-#error "CHOLMOD @CHOLMOD_VERSION_MAJOR@.@CHOLMOD_VERSION_MINOR@.@CHOLMOD_VERSION_SUB@ requires SuiteSparse_config 7.9.0 or later"
+    (SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,10,2))
+#error "CHOLMOD @CHOLMOD_VERSION_MAJOR@.@CHOLMOD_VERSION_MINOR@.@CHOLMOD_VERSION_SUB@ requires SuiteSparse_config 7.10.2 or later"
 #endif
 
 //------------------------------------------------------------------------------

CHOLMOD/Doc/ChangeLog

@@ -1,3 +1,7 @@
+Apr 10, 2025: version 5.3.2
+
+    * build system: use CUDA as linker if applicable
+
 Feb 20, 2025: version 5.3.1
 
     * minor changes: removing compiler warnings

CHOLMOD/Doc/cholmod_version.tex

@@ -1,2 +1,2 @@
 % version of SuiteSparse/CHOLMOD
-\date{VERSION 5.3.1, Feb 20, 2025}
+\date{VERSION 5.3.2, Apr 10, 2025}

CHOLMOD/Include/cholmod.h

@@ -246,10 +246,10 @@
 // version control
 //------------------------------------------------------------------------------
 
-#define CHOLMOD_DATE "Feb 20, 2025"
+#define CHOLMOD_DATE "Apr 10, 2025"
 #define CHOLMOD_MAIN_VERSION   5
 #define CHOLMOD_SUB_VERSION    3
-#define CHOLMOD_SUBSUB_VERSION 1
+#define CHOLMOD_SUBSUB_VERSION 2
 
 #define CHOLMOD_VER_CODE(main,sub) SUITESPARSE_VER_CODE(main,sub)
 #define CHOLMOD_VERSION CHOLMOD_VER_CODE(5,3)
@@ -307,10 +307,10 @@ int cholmod_l_version (int version [3]) ;
 
 #include "SuiteSparse_config.h"
 
-#define CHOLMOD__VERSION SUITESPARSE__VERCODE(5,3,1)
+#define CHOLMOD__VERSION SUITESPARSE__VERCODE(5,3,2)
 #if !defined (SUITESPARSE__VERSION) || \
-    (SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,9,0))
-#error "CHOLMOD 5.3.1 requires SuiteSparse_config 7.9.0 or later"
+    (SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,10,2))
+#error "CHOLMOD 5.3.2 requires SuiteSparse_config 7.10.2 or later"
 #endif
 
 //------------------------------------------------------------------------------

CMakeLists.txt

@@ -64,6 +64,7 @@ endforeach ( )
 
 # CHOLMOD options affecting dependencies
 option ( CHOLMOD_CAMD "ON (default): use CAMD/CCOLAMD.  OFF: do not use CAMD/CCOLAMD" ON )
+option ( CHOLMOD_SUPERNODAL "ON (default): use Supernodal Module.  OFF: do not use Supernodal Module" ON )
 
 # KLU options affecting dependencies
 option ( KLU_USE_CHOLMOD "ON (default): use CHOLMOD in KLU.  OFF: do not use CHOLMOD in KLU" ON )
@@ -111,7 +112,7 @@ include ( SuiteSparsePolicy )
 
 if ( SUITESPARSE_USE_SYSTEM_GRAPHBLAS )
     list ( REMOVE_ITEM SUITESPARSE_ENABLE_PROJECTS "graphblas" )
-    find_package ( GraphBLAS 9.3.1 REQUIRED )
+    find_package ( GraphBLAS 10.0.3 REQUIRED )
 else ( )
     if ( "lagraph" IN_LIST SUITESPARSE_ENABLE_PROJECTS )
         # LAGraph requires GraphBLAS.
@@ -137,7 +138,7 @@ endif ( )
 
 if ( SUITESPARSE_USE_SYSTEM_UMFPACK )
     list ( REMOVE_ITEM SUITESPARSE_ENABLE_PROJECTS "umfpack" )
-    find_package ( UMFPACK 6.3.4 REQUIRED )
+    find_package ( UMFPACK 6.3.5 REQUIRED )
 else ( )
     if ( "paru" IN_LIST SUITESPARSE_ENABLE_PROJECTS )
         # ParU requires UMFPACK.
@@ -150,7 +151,7 @@ endif ( )
 
 if ( SUITESPARSE_USE_SYSTEM_CHOLMOD )
     list ( REMOVE_ITEM SUITESPARSE_ENABLE_PROJECTS "cholmod" )
-    find_package ( CHOLMOD 5.3.0 REQUIRED )
+    find_package ( CHOLMOD 5.3.2 REQUIRED )
 else ( )
     if ( ( KLU_USE_CHOLMOD AND "klu" IN_LIST SUITESPARSE_ENABLE_PROJECTS )
             OR ( UMFPACK_USE_CHOLMOD AND "umfpack" IN_LIST SUITESPARSE_ENABLE_PROJECTS )
@@ -224,7 +225,7 @@ endif ( )
 
 if ( SUITESPARSE_USE_SYSTEM_SUITESPARSE_CONFIG )
     list ( REMOVE_ITEM SUITESPARSE_ENABLE_PROJECTS "suitesparse_config" )
-    find_package ( SuiteSparse_config 7.8.2 REQUIRED )
+    find_package ( SuiteSparse_config 7.10.2 REQUIRED )
 else ( )
     if ( "mongoose" IN_LIST SUITESPARSE_ENABLE_PROJECTS
             OR "amd" IN_LIST SUITESPARSE_ENABLE_PROJECTS
@@ -266,6 +267,19 @@ if ( CMAKE_VERSION VERSION_LESS 3.24 )
 endif ( )
 
 
+# BLAS is only required for some sub-projects
+option ( SUITESPARSE_REQUIRE_BLAS "Must not be set to OFF if any SuiteSparse project requires BLAS functions" ON )
+
+if ( ("cholmod" IN_LIST SUITESPARSE_ENABLE_PROJECTS AND CHOLMOD_SUPERNODAL)
+        OR "paru" IN_LIST SUITESPARSE_ENABLE_PROJECTS
+        OR "spqr" IN_LIST SUITESPARSE_ENABLE_PROJECTS
+        OR "umfpack" IN_LIST SUITESPARSE_ENABLE_PROJECTS )
+    if ( NOT SUITESPARSE_REQUIRE_BLAS )
+        message ( FATAL_ERROR "SUITESPARSE_REQUIRE_BLAS must not be set to OFF when building CHOLMOD with SUPERNODAL, ParU, SPQR, or UMFPACK." )
+    endif ( )
+
+endif ( )
+
 #-------------------------------------------------------------------------------
 # include selected projects
 #-------------------------------------------------------------------------------

ChangeLog

@@ -1,3 +1,32 @@
+Apr 10, 2025: version 7.10.2
+
+    * GraphBLAS v10.0.3: performance of setElement.  Update to xxHash and
+        cpu_features.  Octave interface updated for the Mac.
+    * CHOLMOD 5.3.2: use CUDA as linker, if applicable
+    * SuiteSparse_config 7.10.2: allow the installer to compile without
+        the BLAS.
+    * Package versions in this release: (* denotes a new version)
+        SuiteSparse_config 7.10.2   *
+        AMD 3.3.3
+        BTF 2.3.2
+        CAMD 3.3.3
+        CCOLAMD 3.3.4
+        CHOLMOD 5.3.2               *
+        COLAMD 3.3.4
+        CSparse 4.3.2
+        CXSparse 4.4.1
+        Example 1.8.7               *
+        GraphBLAS 10.0.3            *
+        KLU 2.3.5
+        LDL 3.3.2
+        LAGraph 1.1.5
+        SuiteSparse_Mongoose 3.3.4
+        ParU 1.0.0
+        RBio 4.3.4
+        SPEX 3.2.3
+        SPQR 4.3.4
+        UMFPACK 6.3.5
+
 Mar 6, 2025: version 7.10.1
 
     * GraphBLAS v10.0.1: bug fix, when using user-defined monoids in GrB_mxm

Example/CMakeLists.txt

@@ -28,9 +28,9 @@ cmake_minimum_required ( VERSION 3.22 )
 #   set ( CMAKE_PREFIX_PATH /opt/SuiteSparse )
 #
 # The following is added, just to simplify building this Example if it is
-# located inside SuiteSparse itself and compiled with SUITESPARSE_LOCAL_INSTALL set to ON.
-# Normally you would not use this in a stand-alone library that relies on
-# SuiteSparse:
+# located inside SuiteSparse itself and compiled with SUITESPARSE_LOCAL_INSTALL
+# set to ON.  Normally you would not use this in a stand-alone library that
+# relies on SuiteSparse:
 
     set ( CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${CMAKE_SOURCE_DIR}/.. )
 
@@ -53,10 +53,10 @@ message ( STATUS "MY prefix path:    ${CMAKE_PREFIX_PATH}" )
 #-------------------------------------------------------------------------------
 
 # cmake inserts the date and version number into Include/my.h:
-set ( MY_DATE "Mar 6, 2025" )
+set ( MY_DATE "Apr 10, 2025" )
 set ( MY_VERSION_MAJOR 1 )
 set ( MY_VERSION_MINOR 8 )
-set ( MY_VERSION_PATCH 6 )
+set ( MY_VERSION_PATCH 7 )
 
 message ( STATUS "Building MY library version: v"
     ${MY_VERSION_MAJOR}.
@@ -87,15 +87,15 @@ project ( my
 #-------------------------------------------------------------------------------
 
 # look for all SuiteSparse packages:
-find_package ( SuiteSparse_config 7.10.1 REQUIRED )
+find_package ( SuiteSparse_config 7.10.2 REQUIRED )
 find_package ( AMD 3.3.3 REQUIRED )
 find_package ( BTF 2.3.2 REQUIRED )
 find_package ( CAMD 3.3.3 REQUIRED )
 find_package ( CCOLAMD 3.3.4 REQUIRED )
-find_package ( CHOLMOD 5.3.1 REQUIRED )
+find_package ( CHOLMOD 5.3.2 REQUIRED )
 find_package ( COLAMD 3.3.4 REQUIRED )
 find_package ( CXSparse 4.4.1 REQUIRED )
-find_package ( GraphBLAS 10.0.1 )
+find_package ( GraphBLAS 10.0.3 )
 find_package ( KLU 2.3.5 REQUIRED )
 find_package ( KLU_CHOLMOD 2.3.5 REQUIRED )
 find_package ( LDL 3.3.2 REQUIRED )