Merge pull request #24 from eriknw/v600_alpha11

Updated to SS:GB v6.0.0.alpha16

Author: eriknw

.github/workflows/test.yml

@@ -15,7 +15,9 @@ jobs:
       fail-fast: false
       matrix:
         os: ["ubuntu-latest", "macos-latest", "windows-latest"]
-        python-version: [3.7, 3.8, 3.9]
+        python-version: ["3.7", "3.8", "3.9", "3.10"]
+        source: ["conda-forge"]
+        graphblas-version: ["6.0.2"]
     steps:
     - name: Checkout
       uses: actions/checkout@v2
@@ -27,6 +29,23 @@ jobs:
         environment-file: continuous_integration/environment.yml
         channels: conda-forge
         activate-environment: suitesparse-graphblas
+    - name: GraphBLAS (from conda-forge)
+      if: (contains(matrix.source, 'conda-forge'))
+      run: |
+        conda install -c conda-forge graphblas=${{ matrix.graphblas-version }}
+    - name: GraphBLAS (from source)
+      if: (contains(matrix.source, 'source'))
+      run: |
+        # This isn't working!  Why not?
+        # sh suitesparse.sh refs/tags/${{ matrix.graphblas-version }}
+        curl -L https://github.com/DrTimothyAldenDavis/GraphBLAS/archive/refs/tags/v${{ matrix.graphblas-version }}.tar.gz | tar xzf -
+        pushd GraphBLAS-${{ matrix.graphblas-version }}/build
+        echo ${CONDA_PREFIX}
+        cmake -DCMAKE_INSTALL_PREFIX=${CONDA_PREFIX} -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_BUILD_TYPE=Release ..
+        cat Makefile
+        make all JOBS=16
+        make install
+        popd
     - name: Build
       run: |
         python setup.py build_ext --inplace

.github/workflows/wheels.yml

@@ -18,9 +18,9 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v2
     - name: Build manylinux Python wheels
-      uses: RalfG/python-wheels-manylinux-build@v0.3.4-manylinux2014_x86_64
+      uses: RalfG/python-wheels-manylinux-build@v0.4.0-manylinux2014_x86_64
       with:
-        python-versions: 'cp37-cp37m cp38-cp38 cp39-cp39'
+        python-versions: 'cp37-cp37m cp38-cp38 cp39-cp39 cp310-cp310'
         build-requirements: 'cffi numpy>=1.18,<1.19 cython'
         pre-build-command: ${{ format('sh suitesparse.sh {0}', github.ref) }}
     - name: Publish wheels to PyPI

continuous_integration/environment.yml

@@ -3,7 +3,7 @@ channels:
   - conda-forge
   - defaults
 dependencies:
-  - graphblas=5.1.10
+  # - graphblas=6.0.2
   - cffi
   - cython
   - numpy

suitesparse_graphblas/create_headers.py

@@ -261,6 +261,7 @@ def groupby(index, seq):
 }
 
 DEFINES = {
+    "GrB_INDEX_MAX",
     "GxB_STDC_VERSION",
     "GxB_IMPLEMENTATION_MAJOR",
     "GxB_IMPLEMENTATION_MINOR",
@@ -290,6 +291,13 @@ def groupby(index, seq):
     "GxB_BEGIN",
     "GxB_END",
     "GxB_INC",
+    "GxB_FAST_IMPORT",
+    "GxB_MAX_NAME_LEN",
+    "GxB_COMPRESSION_DEFAULT",
+    "GxB_COMPRESSION_INTEL",
+    "GxB_COMPRESSION_LZ4",
+    "GxB_COMPRESSION_LZ4HC",
+    "GxB_COMPRESSION_NONE",
 }
 
 CHAR_DEFINES = {
@@ -321,6 +329,9 @@ def groupby(index, seq):
     "GxB_cuda_malloc",
     "GxB_cuda_free",
 }
+IGNORE_ENUMS = {
+    "memory_order",
+}
 
 
 class VisitEnumTypedef(c_generator.CGenerator):
@@ -360,7 +371,7 @@ def get_groups(ast):
     groups["GB methods"] = sorted(vals, key=sort_key)
 
     missing_methods = {x for x in lines if "extern GrB_Info " in x} - seen
-    assert not missing_methods
+    assert not missing_methods, ", ".join(sorted(missing_methods))
 
     vals = {x for x in lines if "extern GrB" in x} - seen
     seen.update(vals)
@@ -379,7 +390,7 @@ def get_groups(ast):
     groups["GrB const"] = sorted(vals, key=sort_key)
 
     missing_const = {x for x in lines if "extern const" in x} - seen
-    assert not missing_const
+    assert not missing_const, ", ".join(sorted(missing_const))
 
     vals = {x for x in lines if "typedef" in x and "GxB" in x and "(" not in x} - seen
     seen.update(vals)
@@ -390,7 +401,7 @@ def get_groups(ast):
     groups["GrB typedef"] = sorted(vals, key=sort_key)
 
     missing_typedefs = {x for x in lines if "typedef" in x and "GB" in x and "(" not in x} - seen
-    assert not missing_typedefs
+    assert not missing_typedefs, ", ".join(sorted(missing_typedefs))
     assert all(x.endswith(";") for x in seen)  # sanity check
 
     g = VisitEnumTypedef()
@@ -408,14 +419,15 @@ def get_groups(ast):
     groups["GxB typedef enums"] = sorted(vals, key=lambda x: sort_key(x.rsplit("}", 1)[-1]))
 
     missing_enums = set(enums) - set(groups["GrB typedef enums"]) - set(groups["GxB typedef enums"])
-    assert not missing_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))
 
     vals = {x for x in lines if "typedef" in x and "GxB" in x} - seen
     seen.update(vals)
     groups["GxB typedef funcs"] = sorted(vals, key=sort_key)
 
     vals = {x for x in lines if "typedef" in x and "GrB" in x} - seen
-    assert not vals
+    assert not vals, ", ".join(sorted(vals))
     groups["not seen"] = sorted(set(lines) - seen, key=sort_key)
     for group in groups["not seen"]:
         assert "extern" not in group, group

suitesparse_graphblas/io/binary.py

@@ -90,7 +90,7 @@ def binwrite(A, filename, comments=None, opener=Path.open):
     if isinstance(filename, str):
         filename = Path(filename)
 
-    check_status(A, lib.GrB_Matrix_wait(A))
+    check_status(A, lib.GrB_Matrix_wait(A[0], lib.GrB_MATERIALIZE))
 
     ffinew = ffi.new