Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to 9.4.5 -- Add IndexBinaryOp #136

Merged
merged 10 commits into from
Feb 24, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
- name: GraphBLAS (from source)
if: (contains(matrix.source, 'source'))
run: |
# From release (does not work with beta versions)
# From release (also works with beta versions)
GRAPHBLAS_PREFIX=${CONDA_PREFIX} bash suitesparse.sh refs/tags/$(cat GB_VERSION.txt).0

# From tag
Expand Down
2 changes: 1 addition & 1 deletion GB_VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9.3.1
9.4.5
5 changes: 4 additions & 1 deletion suitesparse.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@
set -x # echo on

# parse SuiteSparse version from first argument, a git tag that ends in the version (no leading v)
if [[ $1 =~ refs/tags/([0-9]*\.[0-9]*\.[0-9]*)\..*$ ]]; then
if [[ $1 =~ refs/tags/([0-9]*\.[0-9]*\.[0-9]*\.beta[0-9]*).*$ ]]; then
echo "Beta version detected"
VERSION=${BASH_REMATCH[1]}
elif [[ $1 =~ refs/tags/([0-9]*\.[0-9]*\.[0-9]*)\..*$ ]]; then
VERSION=${BASH_REMATCH[1]}
else
echo "Specify a SuiteSparse version, such as: $0 refs/tags/7.4.3.0 (got: $1)"
Expand Down
1 change: 1 addition & 0 deletions suitesparse_graphblas/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ def libget(name):
lib.GrB_NOT_IMPLEMENTED: ex.NotImplementedException,
# GxB Errors
lib.GxB_EXHAUSTED: StopIteration,
lib.GxB_JIT_ERROR: ex.JitError,
}
GrB_SUCCESS = lib.GrB_SUCCESS
GrB_NO_VALUE = lib.GrB_NO_VALUE
Expand Down
1 change: 1 addition & 0 deletions suitesparse_graphblas/create_headers.py
Original file line number Diff line number Diff line change
Expand Up @@ -625,6 +625,7 @@ def handle_function_node(node):
"Type": "type",
"UnaryOp": "unary",
"IndexUnaryOp": "indexunary",
"IndexBinaryOp": "indexbinary",
"Iterator": "iterator",
"Context": "context",
# "everything else" is "core"
Expand Down
4 changes: 4 additions & 0 deletions suitesparse_graphblas/exceptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,7 @@ class Panic(GraphBLASException):

class NotImplementedException(GraphBLASException):
pass


class JitError(GraphBLASException):
pass
201 changes: 112 additions & 89 deletions suitesparse_graphblas/suitesparse_graphblas.h

Large diffs are not rendered by default.

201 changes: 112 additions & 89 deletions suitesparse_graphblas/suitesparse_graphblas_no_complex.h

Large diffs are not rendered by default.

Loading