py:tensor的+-*/已修正

Author: miaobyte

front/py/deepx/nn/functional/elementwise.py

@@ -28,43 +28,48 @@ def _A_B_elementwiseop_C(
         send(ir)
     return outtensor
 def _A_b_elementwiseop_C(
-        a:Optional[Union[ Tensor, float, int]] = None, 
-        b: Optional[Union[ Tensor, float, int]] = None, 
+        a:Tensor,
+        b: Union[ float, int] ,
         op:str=None,
         out:Union[Tensor,str]="")->Tensor:
-    if isinstance(a,Tensor):
-        g=a.graph
-    else:
-        g=b.graph
-
+    g=a.graph
     opnode = g.add_op(op)
-    if isinstance(a,Tensor):
-        opnode.add_input(a.node)
-    else:
-        varnode=g.add_var("",a)
-        opnode.add_input(varnode)
+    opnode.add_input(a.node)
+    opnode.add_input(g.add_var("",b))
 
-    if isinstance(b,Tensor):
-        opnode.add_input(b.node)
+    outtensor=None
+    if isinstance(out,str):
+        outtensor=Tensor(shape=a.shape, dtype=a.dtype, device=a.device)
+        outtensor.addtograph(out)
     else:
-        varnode=g.add_var("",b)
-        opnode.add_input(varnode)
+        outtensor=out
+    outtensor.node.add_input(opnode)
+    if g.eager:
+        ir=DeepxIR(op, a.dtype, [a.node.name,b], [outtensor.node.name])
+        send(ir)
+    return outtensor
+def _a_B_elementwiseop_C(
+        a: Union[ float, int] ,
+        b: Tensor,
+        op:str=None,
+        out:Union[Tensor,str]="")->Tensor:
+    g=b.graph
+    opnode = g.add_op(op)
+    opnode.add_input(g.add_var("",a))
+    opnode.add_input(b.node)
 
     outtensor=None
     if isinstance(out,str):
-        outtensor=Tensor(shape=a.shape, dtype=a.dtype, device=a.device)
+        outtensor=Tensor(shape=b.shape, dtype=b.dtype, device=b.device)
         outtensor.addtograph(out)
     else:
         outtensor=out
     outtensor.node.add_input(opnode)
     if g.eager:
-        ir=None
-        if isinstance(a,Tensor):
-            ir=DeepxIR(op, a.dtype, [a.node.name,b], [outtensor.node.name])
-        else:
-            ir=DeepxIR(op, b.dtype, [a,b.node.name], [outtensor.node.name])
+        ir=DeepxIR(op, b.dtype, [a,b.node.name], [outtensor.node.name])
         send(ir)
     return outtensor
+
 #add
 OpNode.register("add")
 OpNode.register("add_scalar")
@@ -122,7 +127,7 @@ def div(
             return _A_b_elementwiseop_C(a,b,"div_scalar",out)
         else:
             #C=a/B
-            return _A_b_elementwiseop_C(a,b,"rdiv_scalar",out)
+            return _a_B_elementwiseop_C(a,b,"rdiv_scalar",out)
 #clamp
 OpNode.register("clamp")
 def clamp(

front/py/examples/2_ir/6_math.dot

@@ -0,0 +1,38 @@
+// Computational Graph
+digraph {
+	rankdir=TB
+	node [shape=record]
+	136406866977952 [label="tensor_1
+(2, 3)" color=skyblue fillcolor=aliceblue fontname="Sans-Serif" labeljust=l shape=box style=filled]
+	136406866572096 [label=constant color=darkslategray fillcolor=lightgray fontname="Courier Bold" labeljust=l shape=box style=filled]
+	136406866572000 [label="var_1
+1" color=orange fillcolor=moccasin fontname="Sans-Serif" labeljust=l shape=box style=filled]
+	136406866572048 [label=add_scalar color=darkslategray fillcolor=lightgray fontname="Courier Bold" labeljust=l shape=box style=filled]
+	136406866984816 [label="var_2
+3" color=orange fillcolor=moccasin fontname="Sans-Serif" labeljust=l shape=box style=filled]
+	136406866561488 [label="tensor_2
+(2, 3)" color=skyblue fillcolor=aliceblue fontname="Sans-Serif" labeljust=l shape=box style=filled]
+	136406866571808 [label="tensor_3
+(2, 3)" color=skyblue fillcolor=aliceblue fontname="Sans-Serif" labeljust=l shape=box style=filled]
+	136406866571568 [label=sqrt color=darkslategray fillcolor=lightgray fontname="Courier Bold" labeljust=l shape=box style=filled]
+	136406866571472 [label="tensor_4
+(2, 3)" color=skyblue fillcolor=aliceblue fontname="Sans-Serif" labeljust=l shape=box style=filled]
+	136406866570944 [label=sqrt color=darkslategray fillcolor=lightgray fontname="Courier Bold" labeljust=l shape=box style=filled]
+	136406866570848 [label=rdiv_scalar color=darkslategray fillcolor=lightgray fontname="Courier Bold" labeljust=l shape=box style=filled]
+	136406866570992 [label="var_3
+1" color=orange fillcolor=moccasin fontname="Sans-Serif" labeljust=l shape=box style=filled]
+	136406866570608 [label="tensor_5
+(2, 3)" color=skyblue fillcolor=aliceblue fontname="Sans-Serif" labeljust=l shape=box style=filled]
+	136406866572096 -> 136406866977952 [arrowsize=0.8 color=gray40 penwidth=1.2]
+	136406866572000 -> 136406866572096 [arrowsize=0.8 color=gray40 penwidth=1.2]
+	136406866977952 -> 136406866572048 [arrowsize=0.8 color=gray40 penwidth=1.2]
+	136406866984816 -> 136406866572048 [arrowsize=0.8 color=gray40 penwidth=1.2]
+	136406866572048 -> 136406866561488 [arrowsize=0.8 color=gray40 penwidth=1.2]
+	136406866571568 -> 136406866571808 [arrowsize=0.8 color=gray40 penwidth=1.2]
+	136406866561488 -> 136406866571568 [arrowsize=0.8 color=gray40 penwidth=1.2]
+	136406866570944 -> 136406866571472 [arrowsize=0.8 color=gray40 penwidth=1.2]
+	136406866561488 -> 136406866570944 [arrowsize=0.8 color=gray40 penwidth=1.2]
+	136406866570992 -> 136406866570848 [arrowsize=0.8 color=gray40 penwidth=1.2]
+	136406866571472 -> 136406866570848 [arrowsize=0.8 color=gray40 penwidth=1.2]
+	136406866570848 -> 136406866570608 [arrowsize=0.8 color=gray40 penwidth=1.2]
+}