deepxIR:front、excuter对接中

Author: miaobyte

front/py/deepx/tensor/elementwise.py

@@ -3,27 +3,38 @@
 from .deepxir import DeepxIR
 OpNode.register("add")
 
-@tensor_method
-def add(self, other):
-    resultnode = self.graph.add_tensor("", self)
-    opnode = self.graph.add_op("add")
-    opnode.add_input(self.node)
-    opnode.add_input(other.node)
-    resultnode.add_input(opnode)
-    if self.graph.eager:
-        ir=DeepxIR("add", self._dtype, [self.node.name, other.node.name], [resultnode.name])
+def add(a:Tensor,b:Tensor,out:Tensor):
+    opnode = a.graph.add_op("add")
+    opnode.add_input(a.node)
+    opnode.add_input(b.node)
+    out.node.add_input(opnode)
+    if a.graph.eager:
+        ir=DeepxIR("add", a.dtype, [a.node.name, b.node.name], [out.node.name])
         print(ir)
-    return resultnode
+
+@tensor_method
+def add_(self, other):
+    result = Tensor(dtype=self.dtype,shape=self.shape)   
+    result._node = self.graph.add_tensor("", self)
+    add(self,other,result)
+    return result
 
 OpNode.register("mul")
 
+def mul(a:Tensor,b:Tensor,out:Tensor):
+    opnode = a.graph.add_op("mul")
+    opnode.add_input(a.node)
+    opnode.add_input(b.node)
+    out.node.add_input(opnode)
+    if a.graph.eager:
+        ir=DeepxIR("mul", a.dtype, [a.node.name, b.node.name], [out.node.name])
+        print(ir)
+        
 @tensor_method
-def mul(self, other):
-    result = self.graph.add_tensor("", self.dtype, self.shape, self.requires_grad)
-    op = self.graph.add_op("mul")
-    op.add_input(self.node)
-    op.add_input(other.node)
-    result.add_input(op)
+def mul_(self, other):
+    result = Tensor(dtype=self.dtype,shape=self.shape)   
+    result._node = self.graph.add_tensor("", self)
+    mul(self,other,result)
     return result 
 
 

front/py/deepx/tensor/tensor.py

@@ -27,8 +27,6 @@ def __init__(self, data=None, shape=None, device=None, dtype=None, graph=None):
             self._dtype = infer_dtype(data)
         else:
             self._dtype = dtype
-            self._data = data.astype(DTYPE_MAP[dtype], casting='safe')
-        self._node.dtype = dtype
         # shape
         if shape is not None:
             if isinstance(shape, (tuple, list)) and all(isinstance(i, int) for i in shape):
@@ -51,10 +49,7 @@ def __init__(self, data=None, shape=None, device=None, dtype=None, graph=None):
             self._device = device
         else:
             self._device = Device.CPU  # 默认设备
-        
-        self._dtype = dtype
- 
-        self.data = data
+
     # shape
     @property
     def shape(self):
@@ -78,6 +73,7 @@ def numel(self):
 
 
     #dtype device
+    @property
     def dtype(self):
         return self._dtype
 

front/py/examples/2_ir/2_add.py

@@ -1,7 +1,20 @@
-from deepx.tensor import Tensor
+from deepx.tensor import Tensor,mul,add
 print()
 
 t1 = Tensor([1,2,3])
 t2 = Tensor([4,5,6])
-t3 = t1.add(t2)
+t3 = t1.add_(t2)
+
+f1=Tensor([0.5,0.1,6])
+f2=t3.add_(f1)
+
+f3=Tensor([1,2,3])
+f4=f2.mul_(f3)
+
+f5=Tensor([1,2,3])
+f6=Tensor([1,2,3])
+mul(f5,f3,out=f6)
+
+f7=Tensor([1,2,3])
+mul(f5,f6,f7)
 

front/py/examples/2_ir/2_addshape.py

@@ -0,0 +1,6 @@
+from deepx.tensor import Tensor,mul,add
+print()
+
+t1 = Tensor(shape=[2,3,4],dtype="float32")
+t2 = Tensor(shape=[2,3,4],dtype="float32")
+t3 = t1.add_(t2)