[Yaml]Unify dygraph/static yaml definition for reshape (#67152)

Aurelius84 · web-flow · commit a356da8442e7 · 2024-08-08T09:02:14.000+08:00
* [Yaml]Unify dygraph/static yaml definition for reshape

* fix infersymbolic
diff --git a/paddle/phi/ops/yaml/backward.yaml b/paddle/phi/ops/yaml/backward.yaml
@@ -2540,6 +2540,36 @@
     func : repeat_interleave_with_tensor_index_grad
     data_type : x
 
+- backward_op : reshape_double_grad
+  forward : reshape_grad (Tensor x, Tensor grad_out) -> Tensor(grad_x)
+  args : (Tensor grad_out, Tensor grad_x_grad)
+  output : Tensor(grad_out_grad)
+  infer_meta :
+    func : UnchangedInferMeta
+    param : [grad_out]
+  kernel :
+    func : reshape_double_grad
+  no_need_buffer : grad_out
+  inplace : (grad_x_grad -> grad_out_grad)
+
+- backward_op : reshape_grad
+  forward : reshape (Tensor x, IntArray shape) -> Tensor(out)
+  args : (Tensor x, Tensor out_grad)
+  output : Tensor(x_grad)
+  infer_meta :
+    func : GradSameWithXInferMeta
+    param : [x, out_grad]
+    spmd_rule: ReshapeGradInferSpmd
+  kernel :
+    func : reshape_grad
+    param : [x, out_grad]
+    data_type: out_grad
+    backend: out_grad
+    layout: out_grad
+  no_need_buffer : x
+  backward : reshape_double_grad
+  inplace : (out_grad -> x_grad)
+
 - backward_op : reverse_grad
   forward : reverse (Tensor x, IntArray axis) -> Tensor(out)
   args : (Tensor out_grad, IntArray axis)
diff --git a/paddle/phi/ops/yaml/inconsistent/dygraph_backward.yaml b/paddle/phi/ops/yaml/inconsistent/dygraph_backward.yaml
@@ -266,36 +266,6 @@
     func : multiply_triple_grad
   optional : fwd_grad_grad_x, fwd_grad_grad_y, grad_x_grad, grad_y_grad, grad_grad_out_grad
 
-- backward_op : reshape_double_grad
-  forward : reshape_grad (Tensor x, Tensor grad_out) -> Tensor(grad_x)
-  args : (Tensor grad_out, Tensor grad_x_grad)
-  output : Tensor(grad_out_grad)
-  infer_meta :
-    func : UnchangedInferMeta
-    param : [grad_out]
-  kernel :
-    func : reshape_double_grad
-  no_need_buffer : grad_out
-  inplace : (grad_x_grad -> grad_out_grad)
-
-- backward_op : reshape_grad
-  forward : reshape (Tensor x, IntArray shape) -> Tensor(out)
-  args : (Tensor x, Tensor out_grad)
-  output : Tensor(x_grad)
-  infer_meta :
-    func : GradSameWithXInferMeta
-    param : [x, out_grad]
-    spmd_rule: ReshapeGradInferSpmd
-  kernel :
-    func : reshape_grad
-    param : [x, out_grad]
-    data_type: out_grad
-    backend: out_grad
-    layout: out_grad
-  no_need_buffer : x
-  backward : reshape_double_grad
-  inplace : (out_grad -> x_grad)
-
 - backward_op : set_value_grad
   forward : set_value (Tensor x, IntArray starts, IntArray ends, IntArray steps, int64_t[] axes, int64_t[] decrease_axes, int64_t[] none_axes, int64_t[] shape, Scalar[] values) -> Tensor(out)
   args : (Tensor out_grad, IntArray starts, IntArray ends, IntArray steps, int64_t[] axes, int64_t[] decrease_axes, int64_t[] none_axes)
diff --git a/paddle/phi/ops/yaml/inconsistent/dygraph_ops.yaml b/paddle/phi/ops/yaml/inconsistent/dygraph_ops.yaml
@@ -292,20 +292,6 @@
   inplace : (x -> out)
   traits : paddle::dialect::ForwardOnlyTrait
 
-- op : reshape
-  args : (Tensor x, IntArray shape)
-  output : Tensor(out)
-  infer_meta :
-    func : ReshapeInferMeta
-    spmd_rule : ReshapeInferSpmd
-    local_shape: shape
-    global_shape: out
-  kernel :
-    func : reshape
-  inplace : (x -> out)
-  view: (x -> out)
-  backward: reshape_grad
-
 - op : set_value
   args : (Tensor x, IntArray starts, IntArray ends, IntArray steps, int64_t[] axes, int64_t[] decrease_axes, int64_t[] none_axes, int64_t[] shape, Scalar[] values)
   output : Tensor(out)
diff --git a/paddle/phi/ops/yaml/inconsistent/static_backward.yaml b/paddle/phi/ops/yaml/inconsistent/static_backward.yaml
@@ -364,36 +364,6 @@
     data_type : out_grad_in
   inplace : (out_grad_in -> out_grad_out)
 
-- backward_op : reshape_double_grad
-  forward : reshape_grad (Tensor x, Tensor grad_out) -> Tensor(grad_x)
-  args : (Tensor grad_out, Tensor grad_x_grad)
-  output : Tensor(grad_out_grad)
-  infer_meta :
-    func : UnchangedInferMeta
-    param : [grad_out]
-  kernel :
-    func : reshape_double_grad
-  no_need_buffer : grad_out
-  inplace : (grad_x_grad -> grad_out_grad)
-
-- backward_op : reshape_grad
-  forward : reshape (Tensor x, IntArray shape) -> Tensor(out)
-  args : (Tensor x, Tensor out_grad)
-  output : Tensor(x_grad)
-  infer_meta :
-    func : GradSameWithXInferMeta
-    param : [x, out_grad]
-    spmd_rule: StaticReshapeGradInferSpmd
-  kernel :
-    func : reshape_grad
-    param : [x, out_grad]
-    data_type: out_grad
-    backend: out_grad
-    layout: out_grad
-  backward : reshape_double_grad
-  no_need_buffer : x
-  inplace : (out_grad -> x_grad)
-
 - backward_op : row_conv_grad
   forward: row_conv (Tensor x, Tensor filter) -> Tensor(out)
   args: (Tensor x, Tensor filter, Tensor out_grad)
diff --git a/paddle/phi/ops/yaml/inconsistent/static_ops.yaml b/paddle/phi/ops/yaml/inconsistent/static_ops.yaml
@@ -708,19 +708,6 @@
   interfaces : paddle::dialect::InferSymbolicShapeInterface
   traits : paddle::dialect::ForwardOnlyTrait
 
-- op : reshape
-  args : (Tensor x, IntArray shape)
-  output : Tensor(out)
-  infer_meta :
-    func : ReshapeInferMeta
-    spmd_rule : ReshapeInferSpmd
-  kernel :
-    func : reshape
-  inplace : (x -> out)
-  view: (x -> out)
-  backward: reshape_grad
-  interfaces : paddle::dialect::InferSymbolicShapeInterface
-
 - op : row_conv
   args : (Tensor x, Tensor filter)
   output : Tensor(out)
diff --git a/paddle/phi/ops/yaml/legacy/backward_exclude.yaml b/paddle/phi/ops/yaml/legacy/backward_exclude.yaml
@@ -31,6 +31,8 @@
 - prod_grad
 - repeat_interleave_grad
 - repeat_interleave_with_tensor_index_grad
+- reshape_grad
+- reshape_double_grad
 - rnn_grad
 - set_value_with_tensor_grad
 - slice_double_grad
diff --git a/paddle/phi/ops/yaml/legacy/ops_exclude.yaml b/paddle/phi/ops/yaml/legacy/ops_exclude.yaml
@@ -72,6 +72,7 @@
 - read_file
 - repeat_interleave
 - repeat_interleave_with_tensor_index
+- reshape
 - rnn
 - sequence_mask
 - set_value_with_tensor
diff --git a/paddle/phi/ops/yaml/ops.yaml b/paddle/phi/ops/yaml/ops.yaml
@@ -3823,6 +3823,21 @@
     data_type : x
   backward: repeat_interleave_with_tensor_index_grad
 
+- op : reshape
+  args : (Tensor x, IntArray shape)
+  output : Tensor(out)
+  infer_meta :
+    func : ReshapeInferMeta
+    spmd_rule : ReshapeInferSpmd
+    local_shape: shape
+    global_shape: out
+  kernel :
+    func : reshape
+  inplace : (x -> out)
+  view: (x -> out)
+  backward: reshape_grad
+  interfaces : paddle::dialect::InferSymbolicShapeInterface
+
 - op : reverse
   args : (Tensor x, IntArray axis)
   output : Tensor
