Process v741 branch with GB_PUBLIC as the empty string (#60)

* Process v741 branch with GB_PUBLIC as the empty string

* Don't use GB_PUBLIC at all (it could be removed)

* with 7.4.1.beta3

Author: eriknw

.github/workflows/test.yml

@@ -14,12 +14,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ["ubuntu-latest", "macos-latest", "windows-latest"]
-        source: ["conda-forge"]
-        # os: ["ubuntu-latest"]
-        # source: ["source"]
+        # os: ["ubuntu-latest", "macos-latest", "windows-latest"]
+        # source: ["conda-forge"]
+        os: ["ubuntu-latest"]
+        source: ["source"]
         python-version: ["3.8", "3.9", "3.10", "3.11"]
-        graphblas-version: ["7.4.0"]
+        graphblas-version: ["7.4.1.beta3"]
     steps:
     - name: Checkout
       uses: actions/checkout@v3
@@ -40,8 +40,15 @@ jobs:
       run: |
         # This isn't working!  Why not?
         # sh suitesparse.sh refs/tags/${{ matrix.graphblas-version }}
+
+        # From tag
         curl -L https://github.com/DrTimothyAldenDavis/GraphBLAS/archive/refs/tags/v${{ matrix.graphblas-version }}.tar.gz | tar xzf -
         pushd GraphBLAS-${{ matrix.graphblas-version }}/build
+
+        # From branch
+        # curl -L https://github.com/DrTimothyAldenDavis/GraphBLAS/tarball/${{ matrix.graphblas-version }} | tar xzf -
+        # pushd DrTim*/build
+
         echo ${CONDA_PREFIX}
         cmake -DCMAKE_INSTALL_PREFIX=${CONDA_PREFIX} -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_BUILD_TYPE=Release ..
         cat Makefile

suitesparse_graphblas/create_headers.py

@@ -315,6 +315,7 @@ def groupby(index, seq):
     "GxB",
     "CMPLX",
     "CMPLXF",
+    "GB_GLOBAL",
     "GB_PUBLIC",
     "GB_restrict",
     "GRAPHBLAS_H",
@@ -364,21 +365,21 @@ def get_groups(ast):
 
     seen = set()
     groups = {}
-    vals = {x for x in lines if "extern GrB_Info GxB" in x} - seen
-    vals |= {x for x in lines if "extern " in x and "GxB_Iterator" in x and "GB" not in x} - seen
+    vals = {x for x in lines if "GrB_Info GxB" in x} - seen
+    vals |= {x for x in lines if "GxB_Iterator" in x and "GB" not in x} - seen
     seen.update(vals)
     groups["GxB methods"] = sorted(vals, key=sort_key)
 
-    vals = {x for x in lines if "extern GrB_Info GrB" in x} - seen
+    vals = {x for x in lines if "GrB_Info GrB" in x} - seen
     seen.update(vals)
     groups["GrB methods"] = sorted(vals, key=sort_key)
 
-    vals = {x for x in lines if "extern GrB_Info GB" in x} - seen
-    vals |= {x for x in lines if "extern " in x and "GxB_Iterator" in x and "GB" in x} - seen
+    vals = {x for x in lines if "GrB_Info GB" in x} - seen
+    vals |= {x for x in lines if "GxB_Iterator" in x and "GB" in x and "typedef" not in x} - seen
     seen.update(vals)
     groups["GB methods"] = sorted(vals, key=sort_key)
 
-    missing_methods = {x for x in lines if "extern GrB_Info " in x} - seen
+    missing_methods = {x for x in lines if "GrB_Info " in x} - seen
     assert not missing_methods, ", ".join(sorted(missing_methods))
 
     vals = {x for x in lines if "extern GrB" in x} - seen
@@ -584,7 +585,7 @@ def __init__(self):
             self.functions = []
 
         def visit_Decl(self, node):
-            if isinstance(node.type, c_ast.FuncDecl) and node.storage == ["extern"]:
+            if isinstance(node.type, c_ast.FuncDecl) and node.storage == []:
                 self.functions.append(node)
 
     def handle_function_node(node):