python-graphblas 2023.12.0__py3-none-any.whl → 2025.2.0__py3-none-any.whl

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 = {}
 

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

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",

graphblas/core/base.py

@@ -513,7 +513,7 @@ class BaseType:
     _expect_op = _expect_op
 
     # Don't let non-scalars be coerced to numpy arrays
-    def __array__(self, dtype=None):
+    def __array__(self, dtype=None, *, copy=None):
         raise TypeError(
             f"{type(self).__name__} can't be directly converted to a numpy array; "
             f"perhaps use `{self.name}.to_coo()` method instead."

graphblas/core/dtypes.py

@@ -1,4 +1,5 @@
 import warnings
+from ast import literal_eval
 
 import numpy as np
 from numpy import promote_types, result_type
@@ -97,7 +98,7 @@ def register_anonymous(dtype, name=None):
             # Allow dtypes such as `"INT64[3, 4]"` for convenience
             base_dtype, shape = dtype.split("[", 1)
             base_dtype = lookup_dtype(base_dtype)
-            shape = np.lib.format.safe_eval(f"[{shape}")
+            shape = literal_eval(f"[{shape}")
             dtype = np.dtype((base_dtype.np_type, shape))
         else:
             raise
@@ -115,7 +116,17 @@ def register_anonymous(dtype, name=None):
     from ..exceptions import check_status_carg
 
     gb_obj = ffi.new("GrB_Type*")
-    if backend == "suitesparse":
+
+    if hasattr(lib, "GrB_Type_set_String"):
+        # We name this so that we can serialize and deserialize UDTs
+        # We don't yet have C definitions
+        np_repr = _dtype_to_string(dtype)
+        status = lib.GrB_Type_new(gb_obj, dtype.itemsize)
+        check_status_carg(status, "Type", gb_obj[0])
+        val_obj = ffi.new("char[]", np_repr.encode())
+        status = lib.GrB_Type_set_String(gb_obj[0], val_obj, lib.GrB_NAME)
+    elif backend == "suitesparse":
+        # For SuiteSparse < 9
         # We name this so that we can serialize and deserialize UDTs
         # We don't yet have C definitions
         np_repr = _dtype_to_string(dtype).encode()
@@ -375,8 +386,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
@@ -430,7 +440,7 @@ def _dtype_to_string(dtype):
         np_type = dtype.np_type
     s = str(np_type)
     try:
-        if np.dtype(np.lib.format.safe_eval(s)) == np_type:  # pragma: no branch (safety)
+        if np.dtype(literal_eval(s)) == np_type:  # pragma: no branch (safety)
             return s
     except Exception:
         pass
@@ -449,5 +459,5 @@ def _string_to_dtype(s):
         return lookup_dtype(s)
     except Exception:
         pass
-    np_type = np.dtype(np.lib.format.safe_eval(s))
+    np_type = np.dtype(literal_eval(s))
     return lookup_dtype(np_type)

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:

graphblas/core/formatting.py

@@ -630,7 +630,7 @@ def create_header(type_name, keys, vals, *, lower_border=False, name="", quote=T
         name = f'"{name}"'
     key_text = []
     val_text = []
-    for key, val in zip(keys, vals):
+    for key, val in zip(keys, vals, strict=True):
         width = max(len(key), len(val)) + 2
         key_text.append(key.rjust(width))
         val_text.append(val.rjust(width))

graphblas/core/infix.py

@@ -236,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
@@ -317,6 +316,7 @@ class MatrixInfixExpr(InfixExprBase):
     ndim = 2
     output_type = MatrixExpression
     _is_transposed = False
+    __networkx_backend__ = "graphblas"
     __networkx_plugin__ = "graphblas"
 
     def __init__(self, left, right):
@@ -396,7 +396,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__