Core is UniformShape

Quantco · Aug 29, 2024 · 434d390 · 434d390
1 parent 7b7fa90
commit 434d390
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 24 deletions.
diff --git 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
@@ -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
@@ -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): ...