Update to SuiteSparse:GraphBLAS 10.0.1 (#139)

Author: eriknw

.pre-commit-config.yaml

@@ -6,21 +6,28 @@
 #  - &flake8_dependencies below needs updated manually
 fail_fast: true
 default_language_version:
-    python: python3
+  python: python3
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v5.0.0
     hooks:
       - id: check-added-large-files
+      - id: check-case-conflict
+      - id: check-merge-conflict
       - id: check-ast
       - id: check-toml
       - id: check-yaml
+      # - id: check-executables-have-shebangs
+      - id: check-vcs-permalinks
+      - id: destroyed-symlinks
+      - id: detect-private-key
       - id: debug-statements
       - id: end-of-file-fixer
       - id: mixed-line-ending
-      # - id: trailing-whitespace
+        args: [--fix=lf]
+      - id: trailing-whitespace
   - repo: https://github.com/abravalheri/validate-pyproject
-    rev: v0.20.2
+    rev: v0.24
     hooks:
       - id: validate-pyproject
         name: Validate pyproject.toml
@@ -30,34 +37,29 @@ repos:
       - id: autoflake
         args: [--in-place]
   - repo: https://github.com/pycqa/isort
-    rev: 5.13.2
+    rev: 6.0.1
     hooks:
       - id: isort
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.18.0
+    rev: v3.19.1
     hooks:
       - id: pyupgrade
         args: [--py39-plus]
-  # - repo: https://github.com/MarcoGorelli/auto-walrus
-  #   rev: v0.2.2
-  #   hooks:
-  #     - id: auto-walrus
-  #       args: [--line-length, "100"]
   - repo: https://github.com/psf/black
-    rev: 24.10.0
+    rev: 25.1.0
     hooks:
       - id: black
-      # - id: black-jupyter
   - repo: https://github.com/PyCQA/flake8
-    rev: 7.1.1
+    rev: 7.1.2
     hooks:
       - id: flake8
+        args: ["--config=.flake8"]
         additional_dependencies: &flake8_dependencies
         # These versions need updated manually
-        - flake8==7.1.1
-        - flake8-comprehensions==3.15.0
-        - flake8-bugbear==24.8.19
-        # - flake8-simplify==0.20.0
+        - flake8==7.1.2
+        - flake8-comprehensions==3.16.0
+        - flake8-bugbear==24.12.12
+        # - flake8-simplify==0.21.0
   - repo: https://github.com/asottile/yesqa
     rev: v1.5.0
     hooks:
@@ -70,6 +72,15 @@ repos:
   #   hooks:
   #     - id: pyroma
   #       args: [-n, "10", .]
+  - repo: https://github.com/python-jsonschema/check-jsonschema
+    rev: 0.31.3
+    hooks:
+      - id: check-dependabot
+      - id: check-github-workflows
+  - repo: meta
+    hooks:
+      - id: check-hooks-apply
+      - id: check-useless-excludes
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v5.0.0
     hooks:

Dockerfile

@@ -28,7 +28,7 @@ COPY --from=suitesparse /build/pycparser/utils/fake_libc_include/* /usr/local/li
 
 RUN apt-get update && apt-get install -yq build-essential git
 RUN pip3 install numpy cffi pytest cython
-    
+
 RUN mkdir -p /psg
 ADD . /psg
 

GB_VERSION.txt

@@ -1 +1 @@
-9.4.5
+10.0.1

docker_build.sh

@@ -4,7 +4,7 @@ if [ $# -eq 0 ]
 
 Example: ./docker_build.sh v5.1.3 5.1.3.1 main clone push
 
-If location is clone then a fresh git clone will be used.  
+If location is clone then a fresh git clone will be used.
 If push is provided then the script will attempt to push to dockerhub."
         exit 1
 fi
@@ -27,7 +27,7 @@ then
     fi
     trap "exit 1"           HUP INT PIPE QUIT TERM
     trap 'rm -rf "$TMPDIR"' EXIT
-    
+
     cd $TMPDIR
     git clone --branch $BRANCH https://github.com/GraphBLAS/python-suitesparse-graphblas.git
     cd python-suitesparse-graphblas

suitesparse_graphblas/create_headers.py

@@ -56,6 +56,8 @@ def groupby(index, seq):
 AUTO = "/* This file is automatically generated */"
 
 DEPRECATED = {
+    # Strongly deprecated in SuiteSparse:GraphBLAS 10; will be removed in 11
+    "GrB_Field",
     # enums
     "GxB_IS_HYPER",
     "GrB_SCMP",
@@ -298,6 +300,7 @@ def groupby(index, seq):
     "GxB_COMPRESSION_LZ4HC",
     "GxB_COMPRESSION_ZSTD",
     "GxB_COMPRESSION_NONE",
+    "GxB_USE_VALUES",
 }
 
 CHAR_DEFINES = {
@@ -354,6 +357,22 @@ def visit_Typedef(self, node):
         return rv
 
 
+class VisitStruct(c_generator.CGenerator):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.results = []
+
+    def visit_Struct(self, node):
+        rv = super().visit_Struct(node)
+        if (
+            ("GxB_" in node.name or "GrB_" in node.name)
+            and "_struct" in node.name
+            and node.decls is not None
+        ):
+            self.results.append(rv + ";")
+        return rv
+
+
 def get_ast(filename):
     fake_include = os.path.dirname(pycparser.__file__) + "utils/fake_libc_include"
     ast = parse_file(filename, cpp_args=f"-I{fake_include}")
@@ -428,6 +447,21 @@ def get_groups(ast):
         seen.update(val.splitlines())
     groups["GxB typedef enums"] = sorted(vals, key=lambda x: sort_key(x.rsplit("}", 1)[-1]))
 
+    g = VisitStruct()
+    _ = g.visit(ast)
+    structs = g.results
+
+    # No non-opaque GrB structs yet
+    # vals = {x for x in structs if "struct GrB" in x}
+    # for val in vals:
+    #     seen.update(val.splitlines())
+    # groups["GrB struct"] = sorted(vals)
+
+    vals = {x for x in structs if "struct GxB" in x}
+    for val in vals:
+        seen.update(val.splitlines())
+    groups["GxB struct"] = sorted(vals)
+
     missing_enums = set(enums) - set(groups["GrB typedef enums"]) - set(groups["GxB typedef enums"])
     missing_enums = {x for x in missing_enums if not any(y in x for y in IGNORE_ENUMS)}
     assert not missing_enums, ", ".join(sorted(missing_enums))
@@ -581,6 +615,12 @@ def handle_typedef_funcs(group):
 
     rv["GxB typedef funcs"] = list(handle_typedef_funcs(groups["GxB typedef funcs"]))
 
+    def handle_structs(group):
+        for text in group:
+            yield {"text": text}
+
+    rv["GxB struct"] = list(handle_structs(groups["GxB struct"]))
+
     class FuncDeclVisitor(c_ast.NodeVisitor):
         def __init__(self):
             self.functions = []
@@ -628,6 +668,7 @@ def handle_function_node(node):
                 "IndexBinaryOp": "indexbinary",
                 "Iterator": "iterator",
                 "Context": "context",
+                "Container": "container",
                 # "everything else" is "core"
                 "getVersion": "core",
                 "Global": "core",
@@ -655,6 +696,13 @@ def handle_function_node(node):
         len(grb_nodes),
         len(groups["GrB methods"]),
     )
+
+    # Temporary hack for v10.0.1, which duplicates `GxB_Serialized_get_Scalar`
+    temp_seen = set()
+    gxb_nodes = [
+        temp_seen.add(node.name) or node for node in gxb_nodes if node.name not in temp_seen
+    ]
+
     assert len(gxb_nodes) == len(groups["GxB methods"]), (
         len(gxb_nodes),
         len(groups["GxB methods"]),
@@ -701,6 +749,10 @@ def create_header_text(groups, *, char_defines=None, defines=None):
     for group in groups["GxB typedef funcs"]:
         text.append(group["text"])
     text.append("")
+    text.append("/* GxB structs */")
+    for group in groups["GxB struct"]:
+        text.append(group["text"])
+    text.append("")
     text.append("/* GrB enums */")
     for group in groups["GrB typedef enums"]:
         text.append(group["text"])