using new x-stuff in python wrappers

Author: fschlimb

ddptensor/__init__.py

@@ -3,26 +3,34 @@
 from os import getenv
 from . import array_api as api
 
-__impl_str = getenv("DDPNP_ARRAY", 'numpy')
-exec(f"import {__impl_str} as __impl")
+#__impl_str = getenv("DDPNP_ARRAY", 'numpy')
+#exec(f"import {__impl_str} as __impl")
 
 for op in api.ew_binary_ops:
+    OP = op.upper()
     exec(
-        f"{op} = lambda this, other: dtensor(_cdt.ew_binary_op(this._t, '{op}', other._t if isinstance(other, ddptensor) else other, False))"
+        f"{op} = lambda this, other: dtensor(_cdt.EWBinOp.op(_cdt.{OP}, this._t, other._t))"  # if isinstance(other, ddptensor) else other, False))"
     )
 
 for op in api.ew_unary_ops:
+    OP = op.upper()
     exec(
-        f"{op} = lambda this: dtensor(_cdt.ew_unary_op(this._t, '{op}', False))"
+        f"{op} = lambda this: dtensor(_cdt.EWUnyOp.op(_cdt.{OP}, this._t))"
     )
 
 for func in api.creators:
-    if func in ["empty", "full", "ones", "zeros",]:
+    FUNC = func.upper()
+    if func in ["empty", "ones", "zeros",]:
         exec(
-            f"{func} = lambda shape, *args, **kwargs: dtensor(_cdt.create(shape, '{func}', '{__impl_str}', *args, **kwargs))"
+            f"{func} = lambda shape, dtype: dtensor(_cdt.Creator.create_from_shape(_cdt.{FUNC}, shape, dtype))"
+        )
+    elif func == "full":
+        exec(
+            f"{func} = lambda shape, val, dtype: dtensor(_cdt.Creator.full(_cdt.{FUNC}, shape, val, dtype))"
         )
 
 for func in api.statisticals:
+    FUNC = func.upper()
     exec(
-        f"{func} = lambda this, **kwargs: dtensor(_cdt.reduce_op(this._t, '{func}', **kwargs))"
+        f"{func} = lambda this, dim: dtensor(_cdt.ReduceOp.op(_cdt.{FUNC}, this._t, dim))"
     )

ddptensor/ddptensor.py

@@ -29,36 +29,39 @@ def __repr__(self):
 
 
     for method in api.ew_binary_methods:
+        METHOD = method.upper()
         exec(
-            f"{method} = lambda self, other: dtensor(_cdt.ew_binary_op(self._t, '{method}', other._t if isinstance(other, dtensor) else other, True))"
+            f"{method} = lambda self, other: dtensor(_cdt.EWBinOp.op(_cdt.{METHOD}, self._t, other._t))" # if isinstance(other, dtensor) else other, True))"
         )
 
     for method in api.ew_binary_methods_inplace:
+        METHOD = method.upper()
         exec(
-            f"{method} = lambda self, other: (self, _cdt.ew_binary_op_inplace(self._t, '{method}', other._t if isinstance(other, dtensor) else other))[0]"
+            f"{method} = lambda self, other: (self, _cdt.IEWBinOp.op(_cdt.{METHOD}, self._t, other._t))[0]" # if isinstance(other, dtensor) else other))[0]"
         )
 
     for method in api.ew_unary_methods:
+        METHOD = method.upper()
         exec(
-            f"{method} = lambda self: dtensor(_cdt.ew_unary_op(self._t, '{method}', True))"
+            f"{method} = lambda self: dtensor(_cdt.EWUnyOp.op(_cdt.{METHOD}, self._t))"
         )
+        
+    # for method in unary_methods:
+    #     exec(
+    #         f"{method} = lambda self: self._t.{method}()"
+    #     )
 
-    for method in unary_methods:
-        exec(
-            f"{method} = lambda self: self._t.{method}()"
-        )
-
-    for att in t_attributes:
-        exec(
-            f"{att} = property(lambda self: self._t.{att})"
-        )
+    # for att in t_attributes:
+    #     exec(
+    #         f"{att} = property(lambda self: self._t.{att})"
+    #     )
 
-    def __getitem__(self, *args):
-        x = self._t.__getitem__(*args)
-        return dtensor(x)
+    # def __getitem__(self, *args):
+    #     x = self._t.__getitem__(*args)
+    #     return dtensor(x)
 
-    def __setitem__(self, key, value):
-        x = self._t.__setitem__(key, value._t if isinstance(value, dtensor) else value)
+    # def __setitem__(self, key, value):
+    #     x = self._t.__setitem__(key, value._t if isinstance(value, dtensor) else value)
 
-    def get_slice(self, *args):
-        return self._t.get_slice(*args)
+    # def get_slice(self, *args):
+    #     return self._t.get_slice(*args)

test/test_x.py

@@ -1,9 +1,9 @@
-import ddptensor._ddptensor as dt
-a = dt.Creator.create_from_shape(dt.ONES, [4,4], dt.float64)
-b = dt.Creator.create_from_shape(dt.ONES, [4,4], dt.float64)
-dt.IEWBinOp.op(dt.__IADD__, a, b)
+import ddptensor as dt
+a = dt.ones([4,4], dt.float64)
+b = dt.ones([4,4], dt.float64)
+a += b
 print(a)
-print(dt.EWBinOp.op(dt.EQUAL, a, b))
-print(dt.EWUnyOp.op(dt.SQRT, a))
-print(dt.ReduceOp.op(dt.SUM, a, [1]))
+print(a == b)
+print(dt.sqrt(a))
+print(dt.sum(a, [1]))
 dt.fini()