From aea1f17db4b9347bfaba461e7da4e2af76017690 Mon Sep 17 00:00:00 2001 From: Aditya Goel Date: Thu, 29 Aug 2024 12:00:09 +0100 Subject: [PATCH] Actually do Core is UniformShape --- ndonnx/_core/_boolimpl.py | 4 ++-- ndonnx/_core/_coreimpl.py | 4 ++-- ndonnx/_core/_nullableimpl.py | 4 ++-- ndonnx/_core/_numericimpl.py | 4 ++-- ndonnx/_core/_stringimpl.py | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ndonnx/_core/_boolimpl.py b/ndonnx/_core/_boolimpl.py index be598f7..fe56305 100644 --- a/ndonnx/_core/_boolimpl.py +++ b/ndonnx/_core/_boolimpl.py @@ -14,15 +14,15 @@ 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 if TYPE_CHECKING: from ndonnx import Array -class _BooleanOperationsImpl(UniformShapeOperations): +class _BooleanOperationsImpl(OperationsBlock): @validate_core def equal(self, x, y) -> Array: return binary_op(x, y, opx.equal) diff --git a/ndonnx/_core/_coreimpl.py b/ndonnx/_core/_coreimpl.py index f5cb85f..5515425 100644 --- a/ndonnx/_core/_coreimpl.py +++ b/ndonnx/_core/_coreimpl.py @@ -12,7 +12,7 @@ import ndonnx.additional as nda from ndonnx._corearray import _CoreArray -from ._interface import OperationsBlock +from ._shapeimpl import UniformShapeOperations from ._utils import validate_core if TYPE_CHECKING: @@ -20,7 +20,7 @@ from ndonnx._data_types import Dtype -class CoreOperationsImpl(OperationsBlock): +class CoreOperationsImpl(UniformShapeOperations): def make_array( self, shape: tuple[int | None | str, ...], diff --git a/ndonnx/_core/_nullableimpl.py b/ndonnx/_core/_nullableimpl.py index 8baa68c..835f4fd 100644 --- a/ndonnx/_core/_nullableimpl.py +++ b/ndonnx/_core/_nullableimpl.py @@ -6,7 +6,7 @@ import ndonnx as ndx -from ._interface import OperationsBlock +from ._shapeimpl import UniformShapeOperations from ._utils import validate_core if TYPE_CHECKING: @@ -16,7 +16,7 @@ Dtype = Union[CoreType, StructType] -class NullableOperationsImpl(OperationsBlock): +class NullableOperationsImpl(UniformShapeOperations): @validate_core def fill_null(self, x: Array, value) -> Array: value = ndx.asarray(value) diff --git a/ndonnx/_core/_numericimpl.py b/ndonnx/_core/_numericimpl.py index b4824bc..885c920 100644 --- a/ndonnx/_core/_numericimpl.py +++ b/ndonnx/_core/_numericimpl.py @@ -20,8 +20,8 @@ from ndonnx._utility import promote from ._coreimpl import CoreOperationsImpl +from ._interface import OperationsBlock from ._nullableimpl import NullableOperationsImpl -from ._shapeimpl import UniformShapeOperations from ._utils import ( binary_op, from_corearray, @@ -37,7 +37,7 @@ from ndonnx._corearray import _CoreArray -class _NumericOperationsImpl(UniformShapeOperations): +class _NumericOperationsImpl(OperationsBlock): # elementwise.py @validate_core diff --git a/ndonnx/_core/_stringimpl.py b/ndonnx/_core/_stringimpl.py index a1e5bdc..d414782 100644 --- a/ndonnx/_core/_stringimpl.py +++ b/ndonnx/_core/_stringimpl.py @@ -12,15 +12,15 @@ 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 if TYPE_CHECKING: from ndonnx import Array -class _StringOperationsImpl(UniformShapeOperations): +class _StringOperationsImpl(OperationsBlock): @validate_core def add(self, x, y) -> Array: return binary_op(x, y, opx.string_concat)