changeshape:broadcast

Author: miaobyte

front/py/deepx/nn/functional/__init__.py

@@ -4,7 +4,7 @@
 from .matmul import matmul
 from .init import *
 from .reduce import reduce_max,reduce_min,sum,prod,mean
-from .changeshape import transpose,reshape,broadcast_shape,broadcast,unsqueeze
+from .changeshape import transpose,reshape,broadcast_shape,broadcast_to,unsqueeze
 from .activite import relu,sigmoid,swish
 __all__ = [
     "newtensor",
@@ -13,7 +13,7 @@
     "add","sub","mul","div","clamp","exp","sqrt","rsqrt",
     "matmul",
     "max","min","sum","prod","mean",
-    "transpose","reshape","broadcast_shape","broadcast","unsqueeze",
+    "transpose","reshape","broadcast_shape","broadcast_to","unsqueeze",
     "relu","sigmoid","swish",
-    "broadcast"
+    
 ]

front/py/deepx/nn/functional/changeshape.py

@@ -138,11 +138,13 @@ def expand(t:Tensor,shape:list[int],out:Union[Tensor,str]='')->Tensor:
         ir=DeepxIR("expand",'',[t.node.name,*map(str, shape)], [outtensor.node.name])
         send(ir)
     return outtensor
-# 修复 broadcast 函数缩进
-def broadcast(a: Tensor, b: Tensor) -> Tuple[Tensor,Tensor]:
+
+def broadcast_to(a: Tensor, shape: tuple,out:Union[Tensor,str]='') -> Tensor:
     # 计算广播后的形状
     try:
-        target_shape = broadcast_shape(a.shape, b.shape)
+        target_shape = broadcast_shape(a.shape, shape)
+        if target_shape!=shape:
+            raise ValueError(f"广播失败：{a.shape} 无法广播为 {shape} ")
     except ValueError as e:
         raise ValueError(f"广播失败：{e}") from e
 
@@ -152,21 +154,11 @@ def broadcast(a: Tensor, b: Tensor) -> Tuple[Tensor,Tensor]:
         a_reshaped =  reshape(a,a_reshape)
     else:
         a_reshaped=a
-    if b.shape != target_shape:
-        b_reshape = [1] * (len(target_shape) - b.ndimension) + list(b.shape)
-        b_reshaped = reshape(b,b_reshape)
-    else:
-        b_reshaped=b
-    
+   
     # 执行实际广播
     if a_reshaped.shape != target_shape:
-        a_broadcasted =  expand(a_reshaped,target_shape)
+        a_broadcasted =  expand(a_reshaped,target_shape,out)
     else:
         a_broadcasted=a_reshaped
-        
-    if b_reshaped.shape != target_shape:
-        b_broadcasted =  expand(b_reshaped,target_shape)
-    else:
-        b_broadcasted=b_reshaped
 
-    return a_broadcasted, b_broadcasted
+    return a_broadcasted 

front/py/deepx/tensor/changeshape.py

@@ -30,3 +30,16 @@ def expand(self,shape:tuple)->Tensor:
     from deepx.nn.functional import expand as expand_func
     result=expand_func(self,shape,False)
     return result
+
+@tensor_method
+def broadcastshape(self,other:Tensor)->tuple[int]:
+    from deepx.nn.functional import broadcastshape as broadcastshape_func
+    result=broadcastshape_func(self.shape,other.shape)
+    return result
+
+@tensor_method
+def broadcast_to(self,shape:tuple,out:Union[Tensor,str]='')->Tensor:
+    from deepx.nn.functional import broadcast_to as broadcast_to_func
+    result=broadcast_to_func(self,shape,out)
+    return result
+

front/py/examples/2_ir/2_broadcast.py

@@ -0,0 +1,35 @@
+// Computational Graph
+digraph {
+	rankdir=TB
+	node [shape=record]
+	139089324388896 [label="a
+(4, 2, 3)" color=skyblue fillcolor=aliceblue fontname="Sans-Serif" labeljust=l shape=box style=filled]
+	139089324378240 [label=constant color=darkslategray fillcolor=lightgray fontname="Courier Bold" labeljust=l shape=box style=filled]
+	139089324389088 [label="var_1
+1" color=orange fillcolor=moccasin fontname="Sans-Serif" labeljust=l shape=box style=filled]
+	139089324621536 [label="b
+(2, 1)" color=skyblue fillcolor=aliceblue fontname="Sans-Serif" labeljust=l shape=box style=filled]
+	139089325015104 [label=constant color=darkslategray fillcolor=lightgray fontname="Courier Bold" labeljust=l shape=box style=filled]
+	139089324621584 [label="var_2
+1" color=orange fillcolor=moccasin fontname="Sans-Serif" labeljust=l shape=box style=filled]
+	139089325015200 [label="tensor_3
+(1, 2, 1)" color=skyblue fillcolor=aliceblue fontname="Sans-Serif" labeljust=l shape=box style=filled]
+	139089325015488 [label=reshape color=darkslategray fillcolor=lightgray fontname="Courier Bold" labeljust=l shape=box style=filled]
+	139089325015440 [label="vector_1
+[1, 2, 1]" color=darkseagreen fillcolor=honeydew fontname="Sans-Serif" labeljust=l shape=box style=filled]
+	139089325015584 [label="b.broadcasted
+(4, 2, 3)" color=skyblue fillcolor=aliceblue fontname="Sans-Serif" labeljust=l shape=box style=filled]
+	139089325015872 [label=expand color=darkslategray fillcolor=lightgray fontname="Courier Bold" labeljust=l shape=box style=filled]
+	139089325015824 [label="vector_2
+(4, 2, 3)" color=darkseagreen fillcolor=honeydew fontname="Sans-Serif" labeljust=l shape=box style=filled]
+	139089324378240 -> 139089324388896 [arrowsize=0.8 color=gray40 penwidth=1.2]
+	139089324389088 -> 139089324378240 [arrowsize=0.8 color=gray40 penwidth=1.2]
+	139089325015104 -> 139089324621536 [arrowsize=0.8 color=gray40 penwidth=1.2]
+	139089324621584 -> 139089325015104 [arrowsize=0.8 color=gray40 penwidth=1.2]
+	139089325015488 -> 139089325015200 [arrowsize=0.8 color=gray40 penwidth=1.2]
+	139089324621536 -> 139089325015488 [arrowsize=0.8 color=gray40 penwidth=1.2]
+	139089325015440 -> 139089325015488 [arrowsize=0.8 color=gray40 penwidth=1.2]
+	139089325015872 -> 139089325015584 [arrowsize=0.8 color=gray40 penwidth=1.2]
+	139089325015200 -> 139089325015872 [arrowsize=0.8 color=gray40 penwidth=1.2]
+	139089325015824 -> 139089325015872 [arrowsize=0.8 color=gray40 penwidth=1.2]
+}

front/py/examples/2_ir/4_changeshape_broadcast.dot

@@ -0,0 +1,12 @@
+from deepx import Tensor,ones,broadcast_to
+
+a=ones( 4,2,3 ,name="a")
+b=ones(  2,1 ,name='b')
+
+bb=b.broadcast_to( a.shape,out="b.broadcasted")
+
+print(bb)
+import os
+script_name = os.path.splitext(os.path.basename( os.path.abspath(__file__)))[0]  # 获取不带后缀的脚本名
+str=b.graph.to_dot()
+str.render(script_name+".dot", format='svg')