Update to SuiteSparse:GraphBLAS 9.1.0

.github/workflows/wheels.yml

@@ -144,10 +144,6 @@ jobs:
         run: |
           brew fetch --retry coreutils && brew install coreutils
           brew fetch --retry libomp && brew install libomp
-          if [[ ${{ matrix.cibw_archs }} == "arm64" ]] ; then
-            echo "Building universal libomp manually"
-            sh add_arm_to_libomp_dylib.sh || exit 1
-          fi
 
       - uses: pypa/cibuildwheel@v2.16
         with:

.pre-commit-config.yaml

@@ -9,7 +9,7 @@ default_language_version:
     python: python3
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.6.0
     hooks:
       - id: check-added-large-files
       - id: check-ast
@@ -20,21 +20,21 @@ repos:
       - id: mixed-line-ending
       # - id: trailing-whitespace
   - repo: https://github.com/abravalheri/validate-pyproject
-    rev: v0.14
+    rev: v0.18
     hooks:
       - id: validate-pyproject
         name: Validate pyproject.toml
   - repo: https://github.com/PyCQA/autoflake
-    rev: v2.2.1
+    rev: v2.3.1
     hooks:
       - id: autoflake
         args: [--in-place]
   - repo: https://github.com/pycqa/isort
-    rev: 5.12.0
+    rev: 5.13.2
     hooks:
       - id: isort
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.13.0
+    rev: v3.15.2
     hooks:
       - id: pyupgrade
         args: [--py38-plus]
@@ -44,19 +44,19 @@ repos:
   #     - id: auto-walrus
   #       args: [--line-length, "100"]
   - repo: https://github.com/psf/black
-    rev: 23.9.1
+    rev: 24.4.2
     hooks:
       - id: black
       # - id: black-jupyter
   - repo: https://github.com/PyCQA/flake8
-    rev: 6.1.0
+    rev: 7.0.0
     hooks:
       - id: flake8
         additional_dependencies: &flake8_dependencies
         # These versions need updated manually
-        - flake8==6.1.0
+        - flake8==7.0.0
         - flake8-comprehensions==3.14.0
-        - flake8-bugbear==23.9.16
+        - flake8-bugbear==24.4.26
         # - flake8-simplify==0.20.0
   - repo: https://github.com/asottile/yesqa
     rev: v1.5.0
@@ -71,6 +71,6 @@ repos:
   #     - id: pyroma
   #       args: [-n, "10", .]
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.6.0
     hooks:
       - id: no-commit-to-branch  # no commit directly to main

GB_VERSION.txt

@@ -1 +1 @@
-8.2.1
+9.1.0

build_graphblas_cffi.py

@@ -19,12 +19,15 @@
     graphblas_root = "C:\\GraphBLAS" if is_win else sys.prefix
 
 include_dirs = [os.path.join(graphblas_root, "include")]
+include_dirs.append(os.path.join(graphblas_root, "include", "suitesparse"))
 library_dirs = [os.path.join(graphblas_root, "lib")]
 if is_win:
     include_dirs.append(os.path.join(sys.prefix, "Library", "include"))
+    include_dirs.append(os.path.join(sys.prefix, "Library", "include", "suitesparse"))
     library_dirs.append(os.path.join(sys.prefix, "Library", "lib"))
 
     include_dirs.append(os.path.join(graphblas_root, "include"))
+    include_dirs.append(os.path.join(graphblas_root, "include", "suitesparse"))
     library_dirs.append(os.path.join(graphblas_root, "lib"))
     library_dirs.append(os.path.join(graphblas_root, "bin"))
 

pyproject.toml

@@ -96,7 +96,7 @@ dirty_template = "{tag}+{ccount}.g{sha}.dirty"
 
 [tool.black]
 line-length = 100
-target-version = ["py38", "py39", "py310", "py311"]
+target-version = ["py38", "py39", "py310", "py311", "py312"]
 
 [tool.isort]
 sections = ["FUTURE", "STDLIB", "THIRDPARTY", "FIRSTPARTY", "LOCALFOLDER"]

suitesparse_graphblas/create_headers.py

@@ -21,6 +21,7 @@
 Run `python create_headers.py --help` to see more help.
 
 """
+
 import argparse
 import os
 import re
@@ -325,6 +326,7 @@ def groupby(index, seq):
     "RMM_WRAP_H",
     "GXB_COMPLEX_H",
     "GxB_STATIC_INLINE_VOID",
+    "GxB_HAVE_COMPLEX_C99",
     # deprecated
     "GxB_HYPER",
 }
@@ -633,6 +635,7 @@ def handle_function_node(node):
                 "init": "core",
                 "wait": "core",
                 "deserialize": "core",
+                "Serialized": "core",  # Added in version 9
             }[group]
         return {
             "name": node.name,
@@ -782,7 +785,7 @@ def main():
     parser.add_argument(
         "--graphblas",
         help="Path to GraphBLAS.h of SuiteSparse.  Default will look in Python prefix path.",
-        default=os.path.join(sys.prefix, "include", "GraphBLAS.h"),
+        default=os.path.join(sys.prefix, "include", "suitesparse", "GraphBLAS.h"),
     )
     parser.add_argument(
         "--show-skipped",