python-graphblas 2023.10.0__tar.gz → 2024.2.0__tar.gz

{python-graphblas-2023.10.0/python_graphblas.egg-info → python-graphblas-2024.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-graphblas
-Version: 2023.10.0
+Version: 2024.2.0
 Summary: Python library for GraphBLAS: high-performance sparse linear algebra for scalable graph analytics
 Author: Jim Kitchen, Python-graphblas contributors
 Author-email: Erik Welch <erik.n.welch@gmail.com>
@@ -234,11 +234,11 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: numpy>=1.21
+Requires-Dist: numpy>=1.22
 Requires-Dist: donfig>=0.6
 Requires-Dist: pyyaml>=5.4
 Requires-Dist: suitesparse-graphblas<9,>=7.4.0.0
-Requires-Dist: numba>=0.55; python_version < "3.12"
+Requires-Dist: numba>=0.55; python_version < "3.13"
 Provides-Extra: suitesparse
 Requires-Dist: suitesparse-graphblas<9,>=7.4.0.0; extra == "suitesparse"
 Provides-Extra: networkx
@@ -248,16 +248,16 @@ Requires-Dist: numba>=0.55; extra == "numba"
 Provides-Extra: pandas
 Requires-Dist: pandas>=1.2; extra == "pandas"
 Provides-Extra: scipy
-Requires-Dist: scipy>=1.8; extra == "scipy"
+Requires-Dist: scipy>=1.9; extra == "scipy"
 Provides-Extra: suitesparse-udf
 Requires-Dist: python-graphblas[numba,suitesparse]; extra == "suitesparse-udf"
 Provides-Extra: repr
 Requires-Dist: python-graphblas[pandas]; extra == "repr"
 Provides-Extra: io
 Requires-Dist: python-graphblas[networkx,scipy]; extra == "io"
-Requires-Dist: python-graphblas[numba]; python_version < "3.12" and extra == "io"
+Requires-Dist: python-graphblas[numba]; python_version < "3.13" and extra == "io"
 Requires-Dist: awkward>=1.9; extra == "io"
-Requires-Dist: sparse>=0.13; python_version < "3.12" and extra == "io"
+Requires-Dist: sparse>=0.13; python_version < "3.13" and extra == "io"
 Requires-Dist: fast-matrix-market>=1.4.5; extra == "io"
 Provides-Extra: viz
 Requires-Dist: python-graphblas[networkx,scipy]; extra == "viz"
@@ -273,10 +273,10 @@ Requires-Dist: pytest>=6.2; extra == "test"
 Requires-Dist: tomli>=1; extra == "test"
 Provides-Extra: default
 Requires-Dist: python-graphblas[pandas,scipy,suitesparse]; extra == "default"
-Requires-Dist: python-graphblas[numba]; python_version < "3.12" and extra == "default"
+Requires-Dist: python-graphblas[numba]; python_version < "3.13" and extra == "default"
 Provides-Extra: all
 Requires-Dist: python-graphblas[default,io,test,viz]; extra == "all"
-Requires-Dist: python-graphblas[datashade]; python_version < "3.12" and extra == "all"
+Requires-Dist: python-graphblas[datashade]; python_version < "3.13" and extra == "all"
 
 ![Python-graphblas](https://raw.githubusercontent.com/python-graphblas/python-graphblas/main/docs/_static/img/logo-horizontal-medium-big.svg)
 
@@ -289,7 +289,7 @@ Requires-Dist: python-graphblas[datashade]; python_version < "3.12" and extra ==
 [![PyPI - Python Version](https://img.shields.io/pypi/pyversions/python-graphblas)](https://pypi.python.org/pypi/python-graphblas/)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/python-graphblas/python-graphblas/blob/main/LICENSE)
 <br>
-[![Tests](https://github.com/python-graphblas/python-graphblas/workflows/Tests/badge.svg?branch=main)](https://github.com/python-graphblas/python-graphblas/actions)
+[![Tests](https://github.com/python-graphblas/python-graphblas/actions/workflows/test_and_build.yml/badge.svg?branch=main)](https://github.com/python-graphblas/python-graphblas/actions)
 [![Docs](https://readthedocs.org/projects/python-graphblas/badge/?version=latest)](https://python-graphblas.readthedocs.io/en/latest/)
 [![Coverage](https://codecov.io/gh/python-graphblas/python-graphblas/graph/badge.svg?token=D7HHLDPQ2Q)](https://codecov.io/gh/python-graphblas/python-graphblas)
 [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.7328791.svg)](https://doi.org/10.5281/zenodo.7328791)

{python-graphblas-2023.10.0 → python-graphblas-2024.2.0}/README.md

@@ -9,7 +9,7 @@
 [![PyPI - Python Version](https://img.shields.io/pypi/pyversions/python-graphblas)](https://pypi.python.org/pypi/python-graphblas/)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/python-graphblas/python-graphblas/blob/main/LICENSE)
 <br>
-[![Tests](https://github.com/python-graphblas/python-graphblas/workflows/Tests/badge.svg?branch=main)](https://github.com/python-graphblas/python-graphblas/actions)
+[![Tests](https://github.com/python-graphblas/python-graphblas/actions/workflows/test_and_build.yml/badge.svg?branch=main)](https://github.com/python-graphblas/python-graphblas/actions)
 [![Docs](https://readthedocs.org/projects/python-graphblas/badge/?version=latest)](https://python-graphblas.readthedocs.io/en/latest/)
 [![Coverage](https://codecov.io/gh/python-graphblas/python-graphblas/graph/badge.svg?token=D7HHLDPQ2Q)](https://codecov.io/gh/python-graphblas/python-graphblas)
 [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.7328791.svg)](https://doi.org/10.5281/zenodo.7328791)

{python-graphblas-2023.10.0 → python-graphblas-2024.2.0}/graphblas/__init__.py

@@ -39,6 +39,7 @@ del get_config
 backend = None
 _init_params = None
 _SPECIAL_ATTRS = {
+    "MAX_SIZE",  # The maximum size of Vector and Matrix dimensions (GrB_INDEX_MAX + 1)
     "Matrix",
     "Recorder",
     "Scalar",
@@ -205,6 +206,10 @@ def _load(name):
     if name in {"Matrix", "Vector", "Scalar", "Recorder"}:
         module = _import_module(f".core.{name.lower()}", __name__)
         globals()[name] = getattr(module, name)
+    elif name == "MAX_SIZE":
+        from .core import lib
+
+        globals()[name] = lib.GrB_INDEX_MAX + 1
     else:
         # Everything else is a module
         globals()[name] = _import_module(f".{name}", __name__)

{python-graphblas-2023.10.0 → python-graphblas-2024.2.0}/graphblas/agg/__init__.py

@@ -73,7 +73,8 @@ Custom recipes (specific to SuiteSparse:GraphBLAS):
 #   - bxnor monoid: even bits
 #   - bnor monoid: odd bits
 """
-# All items are dynamically added by classes in core/agg.py
+
+# All items are dynamically added by classes in core/operator/agg.py
 # This module acts as a container of Aggregator instances
 _deprecated = {}
 

{python-graphblas-2023.10.0 → python-graphblas-2024.2.0}/graphblas/binary/numpy.py

@@ -5,6 +5,7 @@ See list of numpy ufuncs supported by numpy here:
 https://numba.readthedocs.io/en/stable/reference/numpysupported.html#math-operations
 
 """
+
 import numpy as _np
 
 from .. import _STANDARD_OPERATOR_NAMES

{python-graphblas-2023.10.0 → python-graphblas-2024.2.0}/graphblas/core/automethods.py

@@ -7,6 +7,7 @@ To automatically create the functions, run:
 $ python -m graphblas.core.automethods
 
 """
+
 from .. import config
 
 
@@ -281,10 +282,6 @@ def to_edgelist(self):
     return self._get_value("to_edgelist")
 
 
-def to_values(self):
-    return self._get_value("to_values")
-
-
 def value(self):
     return self._get_value("value")
 
@@ -398,7 +395,6 @@ def _main():
         "ss",
         "to_coo",
         "to_dense",
-        "to_values",
     }
     vector = {
         "_as_matrix",

{python-graphblas-2023.10.0 → python-graphblas-2024.2.0}/graphblas/core/base.py

@@ -263,23 +263,31 @@ class BaseType:
         )
 
     def __or__(self, other):
-        from .infix import _ewise_infix_expr
+        from .infix import _ewise_infix_expr, _ewise_mult_expr_types
 
+        if isinstance(other, _ewise_mult_expr_types):
+            raise TypeError("XXX")
         return _ewise_infix_expr(self, other, method="ewise_add", within="__or__")
 
     def __ror__(self, other):
-        from .infix import _ewise_infix_expr
+        from .infix import _ewise_infix_expr, _ewise_mult_expr_types
 
+        if isinstance(other, _ewise_mult_expr_types):
+            raise TypeError("XXX")
         return _ewise_infix_expr(other, self, method="ewise_add", within="__ror__")
 
     def __and__(self, other):
-        from .infix import _ewise_infix_expr
+        from .infix import _ewise_add_expr_types, _ewise_infix_expr
 
+        if isinstance(other, _ewise_add_expr_types):
+            raise TypeError("XXX")
         return _ewise_infix_expr(self, other, method="ewise_mult", within="__and__")
 
     def __rand__(self, other):
-        from .infix import _ewise_infix_expr
+        from .infix import _ewise_add_expr_types, _ewise_infix_expr
 
+        if isinstance(other, _ewise_add_expr_types):
+            raise TypeError("XXX")
         return _ewise_infix_expr(other, self, method="ewise_mult", within="__rand__")
 
     def __matmul__(self, other):

{python-graphblas-2023.10.0 → python-graphblas-2024.2.0}/graphblas/core/dtypes.py

@@ -375,8 +375,7 @@ def lookup_dtype(key, value=None):
 
 
 def unify(type1, type2, *, is_left_scalar=False, is_right_scalar=False):
-    """
-    Returns a type that can hold both type1 and type2.
+    """Returns a type that can hold both type1 and type2.
 
     For example:
     unify(INT32, INT64) -> INT64

{python-graphblas-2023.10.0 → python-graphblas-2024.2.0}/graphblas/core/expr.py

@@ -147,13 +147,13 @@ class IndexerResolver:
         return self.indices[0]._py_index()
 
     def parse_indices(self, indices, shape):
-        """
-        Returns
+        """Returns
         -------
             [(rows, rowsize), (cols, colsize)] for Matrix
             [(idx, idx_size)] for Vector
 
         Within each tuple, if the index is of type int, the size will be None
+
         """
         if len(shape) == 1:
             if type(indices) is tuple:
@@ -312,8 +312,8 @@ class AmbiguousAssignOrExtract:
         Updater(self.parent, opts=opts)._setitem(self.resolved_indexes, expr, is_submask=False)
 
     def new(self, dtype=None, *, mask=None, input_mask=None, name=None, **opts):
-        """
-        Force extraction of the indexes into a new object
+        """Force extraction of the indexes into a new object.
+
         dtype and mask are the only controllable parameters.
         """
         if input_mask is not None:

{python-graphblas-2023.10.0 → python-graphblas-2024.2.0}/graphblas/core/infix.py

@@ -1,8 +1,9 @@
 from .. import backend, binary
 from ..dtypes import BOOL
+from ..exceptions import DimensionMismatch
 from ..monoid import land, lor
 from ..semiring import any_pair
-from . import automethods, utils
+from . import automethods, recorder, utils
 from .base import _expect_op, _expect_type
 from .expr import InfixExprBase
 from .mask import Mask
@@ -125,6 +126,19 @@ class ScalarEwiseAddExpr(ScalarInfixExpr):
 
     _to_expr = _ewise_add_to_expr
 
+    # Allow e.g. `plus(x | y | z)`
+    __or__ = Scalar.__or__
+    __ror__ = Scalar.__ror__
+    _ewise_add = Scalar._ewise_add
+    _ewise_union = Scalar._ewise_union
+
+    # Don't allow e.g. `plus(x | y & z)`
+    def __and__(self, other):
+        raise TypeError("XXX")
+
+    def __rand__(self, other):
+        raise TypeError("XXX")
+
 
 class ScalarEwiseMultExpr(ScalarInfixExpr):
     __slots__ = ()
@@ -134,6 +148,18 @@ class ScalarEwiseMultExpr(ScalarInfixExpr):
 
     _to_expr = _ewise_mult_to_expr
 
+    # Allow e.g. `plus(x & y & z)`
+    __and__ = Scalar.__and__
+    __rand__ = Scalar.__rand__
+    _ewise_mult = Scalar._ewise_mult
+
+    # Don't allow e.g. `plus(x | y & z)`
+    def __or__(self, other):
+        raise TypeError("XXX")
+
+    def __ror__(self, other):
+        raise TypeError("XXX")
+
 
 class ScalarMatMulExpr(ScalarInfixExpr):
     __slots__ = ()
@@ -210,7 +236,6 @@ class VectorInfixExpr(InfixExprBase):
     to_coo = wrapdoc(Vector.to_coo)(property(automethods.to_coo))
     to_dense = wrapdoc(Vector.to_dense)(property(automethods.to_dense))
     to_dict = wrapdoc(Vector.to_dict)(property(automethods.to_dict))
-    to_values = wrapdoc(Vector.to_values)(property(automethods.to_values))
     vxm = wrapdoc(Vector.vxm)(property(automethods.vxm))
     wait = wrapdoc(Vector.wait)(property(automethods.wait))
     # These raise exceptions
@@ -238,6 +263,15 @@ class VectorEwiseAddExpr(VectorInfixExpr):
 
     _to_expr = _ewise_add_to_expr
 
+    # Allow e.g. `plus(x | y | z)`
+    __or__ = Vector.__or__
+    __ror__ = Vector.__ror__
+    _ewise_add = Vector._ewise_add
+    _ewise_union = Vector._ewise_union
+    # Don't allow e.g. `plus(x | y & z)`
+    __and__ = ScalarEwiseAddExpr.__and__  # raises
+    __rand__ = ScalarEwiseAddExpr.__rand__  # raises
+
 
 class VectorEwiseMultExpr(VectorInfixExpr):
     __slots__ = ()
@@ -247,6 +281,14 @@ class VectorEwiseMultExpr(VectorInfixExpr):
 
     _to_expr = _ewise_mult_to_expr
 
+    # Allow e.g. `plus(x & y & z)`
+    __and__ = Vector.__and__
+    __rand__ = Vector.__rand__
+    _ewise_mult = Vector._ewise_mult
+    # Don't allow e.g. `plus(x | y & z)`
+    __or__ = ScalarEwiseMultExpr.__or__  # raises
+    __ror__ = ScalarEwiseMultExpr.__ror__  # raises
+
 
 class VectorMatMulExpr(VectorInfixExpr):
     __slots__ = "method_name"
@@ -258,6 +300,11 @@ class VectorMatMulExpr(VectorInfixExpr):
         self.method_name = method_name
         self._size = size
 
+    __matmul__ = Vector.__matmul__
+    __rmatmul__ = Vector.__rmatmul__
+    _inner = Vector._inner
+    _vxm = Vector._vxm
+
 
 utils._output_types[VectorEwiseAddExpr] = Vector
 utils._output_types[VectorEwiseMultExpr] = Vector
@@ -348,7 +395,6 @@ class MatrixInfixExpr(InfixExprBase):
     to_dense = wrapdoc(Matrix.to_dense)(property(automethods.to_dense))
     to_dicts = wrapdoc(Matrix.to_dicts)(property(automethods.to_dicts))
     to_edgelist = wrapdoc(Matrix.to_edgelist)(property(automethods.to_edgelist))
-    to_values = wrapdoc(Matrix.to_values)(property(automethods.to_values))
     wait = wrapdoc(Matrix.wait)(property(automethods.wait))
     # These raise exceptions
     __array__ = Matrix.__array__
@@ -375,6 +421,15 @@ class MatrixEwiseAddExpr(MatrixInfixExpr):
 
     _to_expr = _ewise_add_to_expr
 
+    # Allow e.g. `plus(x | y | z)`
+    __or__ = Matrix.__or__
+    __ror__ = Matrix.__ror__
+    _ewise_add = Matrix._ewise_add
+    _ewise_union = Matrix._ewise_union
+    # Don't allow e.g. `plus(x | y & z)`
+    __and__ = VectorEwiseAddExpr.__and__  # raises
+    __rand__ = VectorEwiseAddExpr.__rand__  # raises
+
 
 class MatrixEwiseMultExpr(MatrixInfixExpr):
     __slots__ = ()
@@ -384,6 +439,14 @@ class MatrixEwiseMultExpr(MatrixInfixExpr):
 
     _to_expr = _ewise_mult_to_expr
 
+    # Allow e.g. `plus(x & y & z)`
+    __and__ = Matrix.__and__
+    __rand__ = Matrix.__rand__
+    _ewise_mult = Matrix._ewise_mult
+    # Don't allow e.g. `plus(x | y & z)`
+    __or__ = VectorEwiseMultExpr.__or__  # raises
+    __ror__ = VectorEwiseMultExpr.__ror__  # raises
+
 
 class MatrixMatMulExpr(MatrixInfixExpr):
     __slots__ = ()
@@ -396,49 +459,73 @@ class MatrixMatMulExpr(MatrixInfixExpr):
         self._nrows = nrows
         self._ncols = ncols
 
+    __matmul__ = Matrix.__matmul__
+    __rmatmul__ = Matrix.__rmatmul__
+    _mxm = Matrix._mxm
+    _mxv = Matrix._mxv
+
 
 utils._output_types[MatrixEwiseAddExpr] = Matrix
 utils._output_types[MatrixEwiseMultExpr] = Matrix
 utils._output_types[MatrixMatMulExpr] = Matrix
 
 
+def _dummy(obj, obj_type):
+    with recorder.skip_record:
+        return output_type(obj)(BOOL, *obj.shape, name="")
+
+
+def _mismatched(left, right, method, op):
+    # Create dummy expression to raise on incompatible dimensions
+    getattr(_dummy(left) if isinstance(left, InfixExprBase) else left, method)(
+        _dummy(right) if isinstance(right, InfixExprBase) else right, op
+    )
+    raise DimensionMismatch  # pragma: no cover
+
+
 def _ewise_infix_expr(left, right, *, method, within):
     left_type = output_type(left)
     right_type = output_type(right)
 
     types = {Vector, Matrix, TransposedMatrix}
     if left_type in types and right_type in types:
-        # Create dummy expression to check compatibility of dimensions, etc.
-        expr = getattr(left, method)(right, binary.any)
-        if expr.output_type is Vector:
-            if method == "ewise_mult":
-                return VectorEwiseMultExpr(left, right)
-            return VectorEwiseAddExpr(left, right)
+        if left_type is Vector:
+            if right_type is Vector:
+                if left._size != right._size:
+                    _mismatched(left, right, method, binary.first)
+                if method == "ewise_mult":
+                    return VectorEwiseMultExpr(left, right)
+                return VectorEwiseAddExpr(left, right)
+            if left._size != right._nrows:
+                _mismatched(left, right, method, binary.first)
+        elif right_type is Vector:
+            if left._ncols != right._size:
+                _mismatched(left, right, method, binary.first)
+        elif left.shape != right.shape:
+            _mismatched(left, right, method, binary.first)
         if method == "ewise_mult":
             return MatrixEwiseMultExpr(left, right)
         return MatrixEwiseAddExpr(left, right)
+
     if within == "__or__" and isinstance(right, Mask):
         return right.__ror__(left)
     if within == "__and__" and isinstance(right, Mask):
         return right.__rand__(left)
     if left_type in types:
         left._expect_type(right, tuple(types), within=within, argname="right")
-    elif right_type in types:
+    if right_type in types:
         right._expect_type(left, tuple(types), within=within, argname="left")
-    elif left_type is Scalar:
-        # Create dummy expression to check compatibility of dimensions, etc.
-        expr = getattr(left, method)(right, binary.any)
+    if left_type is Scalar:
         if method == "ewise_mult":
             return ScalarEwiseMultExpr(left, right)
         return ScalarEwiseAddExpr(left, right)
-    elif right_type is Scalar:
-        # Create dummy expression to check compatibility of dimensions, etc.
-        expr = getattr(right, method)(left, binary.any)
+    if right_type is Scalar:
         if method == "ewise_mult":
             return ScalarEwiseMultExpr(right, left)
         return ScalarEwiseAddExpr(right, left)
-    else:  # pragma: no cover (sanity)
-        raise TypeError(f"Bad types for ewise infix: {type(left).__name__}, {type(right).__name__}")
+    raise TypeError(  # pragma: no cover (sanity)
+        f"Bad types for ewise infix: {type(left).__name__}, {type(right).__name__}"
+    )
 
 
 def _matmul_infix_expr(left, right, *, within):
@@ -447,55 +534,55 @@ def _matmul_infix_expr(left, right, *, within):
 
     if left_type is Vector:
         if right_type is Matrix or right_type is TransposedMatrix:
-            method = "vxm"
-        elif right_type is Vector:
-            method = "inner"
-        else:
-            right = left._expect_type(
-                right,
-                (Matrix, TransposedMatrix),
-                within=within,
-                argname="right",
-            )
-    elif left_type is Matrix or left_type is TransposedMatrix:
+            if left._size != right._nrows:
+                _mismatched(left, right, "vxm", any_pair[BOOL])
+            return VectorMatMulExpr(left, right, method_name="vxm", size=right._ncols)
         if right_type is Vector:
-            method = "mxv"
-        elif right_type is Matrix or right_type is TransposedMatrix:
-            method = "mxm"
-        else:
-            right = left._expect_type(
-                right,
-                (Vector, Matrix, TransposedMatrix),
-                within=within,
-                argname="right",
-            )
-    elif right_type is Vector:
-        left = right._expect_type(
+            if left._size != right._size:
+                _mismatched(left, right, "inner", any_pair[BOOL])
+            return ScalarMatMulExpr(left, right)
+        left._expect_type(
+            right,
+            (Matrix, TransposedMatrix, Vector),
+            within=within,
+            argname="right",
+        )
+    if left_type is Matrix or left_type is TransposedMatrix:
+        if right_type is Vector:
+            if left._ncols != right._size:
+                _mismatched(left, right, "mxv", any_pair[BOOL])
+            return VectorMatMulExpr(left, right, method_name="mxv", size=left._nrows)
+        if right_type is Matrix or right_type is TransposedMatrix:
+            if left._ncols != right._nrows:
+                _mismatched(left, right, "mxm", any_pair[BOOL])
+            return MatrixMatMulExpr(left, right, nrows=left._nrows, ncols=right._ncols)
+        left._expect_type(
+            right,
+            (Vector, Matrix, TransposedMatrix),
+            within=within,
+            argname="right",
+        )
+    if right_type is Vector:
+        right._expect_type(
             left,
             (Matrix, TransposedMatrix),
             within=within,
             argname="left",
         )
-    elif right_type is Matrix or right_type is TransposedMatrix:
-        left = right._expect_type(
+    if right_type is Matrix or right_type is TransposedMatrix:
+        right._expect_type(
             left,
             (Vector, Matrix, TransposedMatrix),
             within=within,
             argname="left",
         )
-    else:  # pragma: no cover (sanity)
-        raise TypeError(
-            f"Bad types for matmul infix: {type(left).__name__}, {type(right).__name__}"
-        )
+    raise TypeError(  # pragma: no cover (sanity)
+        f"Bad types for matmul infix: {type(left).__name__}, {type(right).__name__}"
+    )
 
-    # Create dummy expression to check compatibility of dimensions, etc.
-    expr = getattr(left, method)(right, any_pair[bool])
-    if expr.output_type is Vector:
-        return VectorMatMulExpr(left, right, method_name=method, size=expr._size)
-    if expr.output_type is Matrix:
-        return MatrixMatMulExpr(left, right, nrows=expr._nrows, ncols=expr._ncols)
-    return ScalarMatMulExpr(left, right)
 
+_ewise_add_expr_types = (MatrixEwiseAddExpr, VectorEwiseAddExpr, ScalarEwiseAddExpr)
+_ewise_mult_expr_types = (MatrixEwiseMultExpr, VectorEwiseMultExpr, ScalarEwiseMultExpr)
 
 # Import infixmethods, which has side effects
 from . import infixmethods  # noqa: E402, F401 isort:skip