Update from merge errors

illinois-ceesd · Nov 24, 2024 · 85920d6 · 85920d6
1 parent 4b9451b
commit 85920d6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/pytato/array.py b/pytato/array.py
@@ -411,8 +411,10 @@ def {cls.__name__}_hash(self):
 ConvertibleToIndexExpr = Union[int, slice, "Array", EllipsisType, None]
 # IndexExpr = Union[IntegerT, "NormalizedSlice", "Array", None, EllipsisType]
 # IndexExpr = Union[IntegerT, "NormalizedSlice", "Array", None]
-DtypeOrScalar = Union[_dtype_any, ScalarT]
-ArrayOrScalar = Union["Array", ScalarT]
+# DtypeOrScalar = Union[_dtype_any, ScalarT]
+# ArrayOrScalar = Union["Array", ScalarT]
+DtypeOrScalar = Union[_dtype_any, Scalar]
+ArrayOrScalar = Union["Array", Scalar]
 IndexExpr = Union[Integer, "NormalizedSlice", "Array", None]
 PyScalarType = type[bool] | type[int] | type[float] | type[complex]
 DtypeOrPyScalarType = _dtype_any | PyScalarType

diff --git a/pytato/scalar_expr.py b/pytato/scalar_expr.py
@@ -85,7 +85,7 @@
 # {{{ scalar expressions
 
 INT_CLASSES = (int, np.integer)
-IntegralScalarExpression = Union[IntegerT, prim.Expression]
+# IntegralScalarExpression = Union[IntegerT, prim.Expression]
 Scalar = Union[np.number[Any], int, np.bool_, bool, float, complex]
 ScalarExpression = Union[Scalar, prim.Expression]
 PYTHON_SCALAR_CLASSES = (int, float, complex, bool)

diff --git a/pytato/utils.py b/pytato/utils.py
@@ -37,8 +37,10 @@
                           AdvancedIndexInNoncontiguousAxes,
                           ConvertibleToIndexExpr, IndexExpr, NormalizedSlice,
                           _dtype_any, Einsum)
+#from pytato.scalar_expr import (ScalarExpression, IntegralScalarExpression,
+#                                SCALAR_CLASSES, INT_CLASSES, BoolT)
 from pytato.scalar_expr import (ScalarExpression, IntegralScalarExpression,
-                                SCALAR_CLASSES, INT_CLASSES, BoolT)
+                                SCALAR_CLASSES, INT_CLASSES)
 from pytools import UniqueNameGenerator
 from pytato.transform import Mapper
 from pytools.tag import Tag