【PIR OpTest Fix No.10】 fix test_row_conv_op (#59636)

xingmingyyj · web-flow · commit fbce185fe752 · 2023-12-13T15:52:18.000+08:00
* test_row_conv_op

* fix

* Update utils.cc

* fix
diff --git a/paddle/fluid/pir/dialect/op_generator/ops_api_gen.py b/paddle/fluid/pir/dialect/op_generator/ops_api_gen.py
@@ -126,6 +126,7 @@
     'fused_dot_product_attention',
     'recv_v2',
     'rnn_',
+    'row_conv',
     'seed',
     'send_v2',
     'shadow_feed',
diff --git a/paddle/fluid/pir/dialect/operator/ir/ops.yaml b/paddle/fluid/pir/dialect/operator/ir/ops.yaml
@@ -1055,6 +1055,14 @@
   intermediate : reserve
   view : (dropout_state_in -> dropout_state_out)
 
+- op : row_conv
+  args : (Tensor x, Tensor filter)
+  output : Tensor(out)
+  infer_meta :
+     func: RowConvInferMeta
+  kernel :
+     func : row_conv
+
 - op : rrelu
   args : (Tensor x, float lower, float upper, bool is_test)
   output : Tensor(out), Tensor(noise)
diff --git a/paddle/fluid/pir/dialect/operator/ir/ops_backward.yaml b/paddle/fluid/pir/dialect/operator/ir/ops_backward.yaml
@@ -633,6 +633,16 @@
     data_type: out_grad
   optional : sequence_length
 
+- backward_op : row_conv_grad
+  forward: row_conv (Tensor x, Tensor filter) -> Tensor(out)
+  args: (Tensor x, Tensor filter, Tensor out_grad)
+  output: Tensor(x_grad),Tensor(filter_grad)
+  infer_meta :
+    func : RowConvGradInferMeta
+    param : [out_grad, filter]
+  kernel:
+    func : row_conv_grad
+
 - backward_op : rrelu_grad
   forward : rrelu (Tensor x, float lower, float upper, bool is_test) -> Tensor(out), Tensor(noise)
   args : (Tensor x, Tensor noise, Tensor out_grad)
diff --git a/paddle/fluid/pir/dialect/operator/utils/utils.cc b/paddle/fluid/pir/dialect/operator/utils/utils.cc
@@ -52,6 +52,8 @@ const std::unordered_set<std::string> LegacyOpList = {
     ShareDataOp::name(),
     SparseMomentumOp::name(),
     GetTensorFromSelectedRowsOp::name(),
+    RowConvOp::name(),
+    RowConvGradOp::name(),
     SoftReluOp::name(),
     SoftReluGradOp::name()};
 
diff --git a/paddle/phi/api/yaml/op_compat.yaml b/paddle/phi/api/yaml/op_compat.yaml
@@ -2633,6 +2633,13 @@
   extra :
     attrs : [bool use_mkldnn = false, bool use_cudnn = false]
 
+- op : row_conv
+  backward : row_conv_grad
+  inputs :
+    {x : X, filter : Filter}
+  outputs :
+    {out : Out}
+
 - op : rsqrt
   backward : rsqrt_grad, rsqrt_double_grad (rsqrt_grad_grad)
   inputs :
diff --git a/paddle/phi/infermeta/backward.cc b/paddle/phi/infermeta/backward.cc
@@ -979,6 +979,19 @@ void RnnGradInferMeta(const MetaTensor& x,
   }
 }
 
+void RowConvGradInferMeta(const MetaTensor& out_grad,
+                          const MetaTensor& filter,
+                          MetaTensor* x_grad,
+                          MetaTensor* filter_grad) {
+  if (x_grad != nullptr) {
+    x_grad->set_dims(out_grad.dims());
+  }
+
+  if (filter_grad != nullptr) {
+    filter_grad->set_dims(filter.dims());
+  }
+}
+
 void ScatterGradInferMeta(const MetaTensor& index,
                           const MetaTensor& updates,
                           const MetaTensor& out_grad,
diff --git a/paddle/phi/infermeta/backward.h b/paddle/phi/infermeta/backward.h
@@ -400,6 +400,11 @@ void RnnGradInferMeta(const MetaTensor& x,
                       std::vector<MetaTensor*> pre_state_grad,
                       std::vector<MetaTensor*> weight_grad_list);
 
+void RowConvGradInferMeta(const MetaTensor& out_grad,
+                          const MetaTensor& filter,
+                          MetaTensor* x_grad,
+                          MetaTensor* filter_grad);
+
 void ScatterGradInferMeta(const MetaTensor& index,
                           const MetaTensor& updates,
                           const MetaTensor& out_grad,
diff --git a/paddle/phi/infermeta/binary.cc b/paddle/phi/infermeta/binary.cc
@@ -2676,6 +2676,22 @@ void RepeatInterleaveWithTensorIndexInferMeta(const MetaTensor& x,
   out->share_lod(x);
   out->set_dtype(x.dtype());
 }
+
+void RowConvInferMeta(const MetaTensor& x,
+                      const MetaTensor& filter,
+                      MetaTensor* out) {
+  auto filter_dims = filter.dims();
+  PADDLE_ENFORCE_EQ(filter_dims.size(),
+                    2,
+                    phi::errors::InvalidArgument(
+                        "Input(Filter)'s dimensions should be 2. Received: "
+                        "Input(Filter)'s shape: [%s].",
+                        filter_dims));
+  out->set_dims(x.dims());
+  out->share_lod(x);
+  out->set_dtype(x.dtype());
+}
+
 void SearchsortedInferMeta(const MetaTensor& sorted_sequence,
                            const MetaTensor& value,
                            bool out_int32,
diff --git a/paddle/phi/infermeta/binary.h b/paddle/phi/infermeta/binary.h
@@ -403,6 +403,11 @@ void RepeatInterleaveWithTensorIndexInferMeta(const MetaTensor& x,
                                               const MetaTensor& repeats,
                                               int dim,
                                               MetaTensor* out);
+
+void RowConvInferMeta(const MetaTensor& x,
+                      const MetaTensor& filter,
+                      MetaTensor* out);
+
 void PriorBoxInferMeta(const MetaTensor& input,
                        const MetaTensor& image,
                        const std::vector<float>& min_sizes,
diff --git a/test/white_list/pir_op_test_white_list b/test/white_list/pir_op_test_white_list
@@ -255,6 +255,7 @@ test_reverse_op
 test_roi_align_op
 test_roi_pool_op
 test_roll_op
+test_row_conv_op
 test_rrelu_op
 test_scale_mkldnn_op
 test_scale_op
