Skip to content

Commit 2e6920e

Browse files
authored
Upgrade to 9.4.5 -- Add IndexBinaryOp (#136)
1 parent ddb8a4c commit 2e6920e

8 files changed

+236
-181
lines changed

.github/workflows/test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
- name: GraphBLAS (from source)
4242
if: (contains(matrix.source, 'source'))
4343
run: |
44-
# From release (does not work with beta versions)
44+
# From release (also works with beta versions)
4545
GRAPHBLAS_PREFIX=${CONDA_PREFIX} bash suitesparse.sh refs/tags/$(cat GB_VERSION.txt).0
4646
4747
# From tag

GB_VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
9.3.1
1+
9.4.5

suitesparse.sh

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33
set -x # echo on
44

55
# parse SuiteSparse version from first argument, a git tag that ends in the version (no leading v)
6-
if [[ $1 =~ refs/tags/([0-9]*\.[0-9]*\.[0-9]*)\..*$ ]]; then
6+
if [[ $1 =~ refs/tags/([0-9]*\.[0-9]*\.[0-9]*\.beta[0-9]*).*$ ]]; then
7+
echo "Beta version detected"
8+
VERSION=${BASH_REMATCH[1]}
9+
elif [[ $1 =~ refs/tags/([0-9]*\.[0-9]*\.[0-9]*)\..*$ ]]; then
710
VERSION=${BASH_REMATCH[1]}
811
else
912
echo "Specify a SuiteSparse version, such as: $0 refs/tags/7.4.3.0 (got: $1)"

suitesparse_graphblas/__init__.py

+1
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ def libget(name):
172172
lib.GrB_NOT_IMPLEMENTED: ex.NotImplementedException,
173173
# GxB Errors
174174
lib.GxB_EXHAUSTED: StopIteration,
175+
lib.GxB_JIT_ERROR: ex.JitError,
175176
}
176177
GrB_SUCCESS = lib.GrB_SUCCESS
177178
GrB_NO_VALUE = lib.GrB_NO_VALUE

suitesparse_graphblas/create_headers.py

+1
Original file line numberDiff line numberDiff line change
@@ -625,6 +625,7 @@ def handle_function_node(node):
625625
"Type": "type",
626626
"UnaryOp": "unary",
627627
"IndexUnaryOp": "indexunary",
628+
"IndexBinaryOp": "indexbinary",
628629
"Iterator": "iterator",
629630
"Context": "context",
630631
# "everything else" is "core"

suitesparse_graphblas/exceptions.py

+4
Original file line numberDiff line numberDiff line change
@@ -60,3 +60,7 @@ class Panic(GraphBLASException):
6060

6161
class NotImplementedException(GraphBLASException):
6262
pass
63+
64+
65+
class JitError(GraphBLASException):
66+
pass

suitesparse_graphblas/suitesparse_graphblas.h

+112-89
Large diffs are not rendered by default.

suitesparse_graphblas/suitesparse_graphblas_no_complex.h

+112-89
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)