From 434d3903c9f59f08435017619c4c266654812bb8 Mon Sep 17 00:00:00 2001 From: Aditya Goel Date: Thu, 29 Aug 2024 11:42:03 +0100 Subject: [PATCH] Core is UniformShape --- ndonnx/_core/_boolimpl.py | 11 +++-------- ndonnx/_core/_numericimpl.py | 11 +++-------- ndonnx/_core/_stringimpl.py | 11 +++-------- 3 files changed, 9 insertions(+), 24 deletions(-) diff --git a/ndonnx/_core/_boolimpl.py b/ndonnx/_core/_boolimpl.py index f8c93c8..be598f7 100644 --- a/ndonnx/_core/_boolimpl.py +++ b/ndonnx/_core/_boolimpl.py @@ -14,7 +14,6 @@ import ndonnx._opset_extensions as opx from ._coreimpl import CoreOperationsImpl -from ._interface import OperationsBlock from ._nullableimpl import NullableOperationsImpl from ._shapeimpl import UniformShapeOperations from ._utils import binary_op, unary_op, validate_core @@ -23,7 +22,7 @@ from ndonnx import Array -class _BooleanOperationsImpl(OperationsBlock): +class _BooleanOperationsImpl(UniformShapeOperations): @validate_core def equal(self, x, y) -> Array: return binary_op(x, y, opx.equal) @@ -165,11 +164,7 @@ def nonzero(self, x) -> tuple[Array, ...]: return ndx.nonzero(x.astype(ndx.int8)) -class BooleanOperationsImpl( - CoreOperationsImpl, _BooleanOperationsImpl, UniformShapeOperations -): ... +class BooleanOperationsImpl(CoreOperationsImpl, _BooleanOperationsImpl): ... -class NullableBooleanOperationsImpl( - NullableOperationsImpl, _BooleanOperationsImpl, UniformShapeOperations -): ... +class NullableBooleanOperationsImpl(NullableOperationsImpl, _BooleanOperationsImpl): ... diff --git a/ndonnx/_core/_numericimpl.py b/ndonnx/_core/_numericimpl.py index e01edd7..b4824bc 100644 --- a/ndonnx/_core/_numericimpl.py +++ b/ndonnx/_core/_numericimpl.py @@ -20,7 +20,6 @@ from ndonnx._utility import promote from ._coreimpl import CoreOperationsImpl -from ._interface import OperationsBlock from ._nullableimpl import NullableOperationsImpl from ._shapeimpl import UniformShapeOperations from ._utils import ( @@ -38,7 +37,7 @@ from ndonnx._corearray import _CoreArray -class _NumericOperationsImpl(OperationsBlock): +class _NumericOperationsImpl(UniformShapeOperations): # elementwise.py @validate_core @@ -971,14 +970,10 @@ def empty_like(self, x, dtype=None, device=None) -> ndx.Array: return ndx.full_like(x, 0, dtype=dtype) -class NumericOperationsImpl( - CoreOperationsImpl, _NumericOperationsImpl, UniformShapeOperations -): ... +class NumericOperationsImpl(CoreOperationsImpl, _NumericOperationsImpl): ... -class NullableNumericOperationsImpl( - NullableOperationsImpl, _NumericOperationsImpl, UniformShapeOperations -): ... +class NullableNumericOperationsImpl(NullableOperationsImpl, _NumericOperationsImpl): ... def _via_i64_f64( diff --git a/ndonnx/_core/_stringimpl.py b/ndonnx/_core/_stringimpl.py index 1ba2802..a1e5bdc 100644 --- a/ndonnx/_core/_stringimpl.py +++ b/ndonnx/_core/_stringimpl.py @@ -12,7 +12,6 @@ import ndonnx._opset_extensions as opx from ._coreimpl import CoreOperationsImpl -from ._interface import OperationsBlock from ._nullableimpl import NullableOperationsImpl from ._shapeimpl import UniformShapeOperations from ._utils import binary_op, validate_core @@ -21,7 +20,7 @@ from ndonnx import Array -class _StringOperationsImpl(OperationsBlock): +class _StringOperationsImpl(UniformShapeOperations): @validate_core def add(self, x, y) -> Array: return binary_op(x, y, opx.string_concat) @@ -71,11 +70,7 @@ def empty_like(self, x, dtype=None, device=None) -> ndx.Array: return ndx.zeros_like(x, dtype=dtype, device=device) -class StringOperationsImpl( - CoreOperationsImpl, _StringOperationsImpl, UniformShapeOperations -): ... +class StringOperationsImpl(CoreOperationsImpl, _StringOperationsImpl): ... -class NullableStringOperationsImpl( - NullableOperationsImpl, _StringOperationsImpl, UniformShapeOperations -): ... +class NullableStringOperationsImpl(NullableOperationsImpl, _StringOperationsImpl): ...