【Hackathon 6th Fundable Projects 3 No.335】Remove fluid operator sequence_conv

paddle/fluid/framework/ir/CMakeLists.txt

@@ -81,7 +81,6 @@ pass_library(seq_concat_fc_fuse_pass inference)
 pass_library(multi_batch_merge_pass base)
 pass_library(map_op_to_another_pass inference)
 pass_library(conv_bn_fuse_pass inference)
-pass_library(seqconv_eltadd_relu_fuse_pass inference)
 pass_library(seqpool_concat_fuse_pass inference)
 pass_library(seqpool_cvm_concat_fuse_pass inference)
 pass_library(repeated_fc_relu_fuse_pass inference)

paddle/fluid/framework/ir/graph_pattern_detector.cc

@@ -1057,52 +1057,6 @@ PDNode *patterns::OperatorReshape2::operator()(const std::string &operator_type,
   return reshape2_out;
 }
 
-PDNode *patterns::SeqConvEltAddRelu::operator()(
-    paddle::framework::ir::PDNode *seqconv_input) {
-  // Create Operators
-  seqconv_input->assert_is_op_input("sequence_conv", "X");
-  auto *seqconv_op = pattern->NewNode(seqconv_repr())
-                         ->assert_is_op("sequence_conv")
-                         ->assert_has_n_inputs(2)
-                         ->assert_op_attr<bool>("paddingTrainable", false)
-                         ->assert_op_attr<int>("contextStride", 1);
-
-  auto *eltadd_op =
-      pattern->NewNode(eltadd_repr())->assert_is_op("elementwise_add");
-  auto *relu_op = pattern->NewNode(relu_repr())->assert_is_op("relu");
-  // Create variables
-  // Filter
-  auto *seqconv_weight_var =
-      pattern->NewNode(seqconv_weight_repr())
-          ->AsInput()
-          ->assert_is_persistable_var()
-          ->assert_is_op_input("sequence_conv", "Filter");
-  // Bias
-  auto *eltadd_bias_var = pattern->NewNode(eltadd_bias_repr())
-                              ->AsInput()
-                              ->assert_is_op_input("elementwise_add");
-  // intermediate variable, will be removed in the IR after fuse.
-  auto *seqconv_out_var = pattern->NewNode(seqconv_out_repr())
-                              ->AsIntermediate()
-                              ->assert_is_only_output_of_op("sequence_conv")
-                              ->assert_is_op_input("elementwise_add");
-  auto *eltadd_out_var = pattern->NewNode(eltadd_out_repr())
-                             ->AsIntermediate()
-                             ->assert_is_only_output_of_op("elementwise_add")
-                             ->assert_is_only_input_of_op("relu");
-  // output
-  auto *relu_out_var = pattern->NewNode(relu_out_repr())
-                           ->AsOutput()
-                           ->assert_is_op_output("relu");
-
-  seqconv_op->LinksFrom({seqconv_input, seqconv_weight_var})
-      .LinksTo({seqconv_out_var});
-  eltadd_op->LinksFrom({seqconv_out_var, eltadd_bias_var})
-      .LinksTo({eltadd_out_var});
-  relu_op->LinksFrom({eltadd_out_var}).LinksTo({relu_out_var});
-  return relu_out_var;
-}
-
 PDNode *patterns::FC::operator()(paddle::framework::ir::PDNode *x,
                                  bool with_bias,
                                  bool with_relu) {

paddle/fluid/framework/ir/graph_pattern_detector.h

@@ -600,31 +600,6 @@ struct OperatorReshape2 : public PatternBase {
   PATTERN_DECL_NODE(reshape2_out);
 };
 
-// SEQCONV with Elementwise_Add ReLU
-// op: seqconv + elementwise_add + relu
-// named nodes:
-// seqconv_input, seqconv_weight,
-// seqconv_out, seqconv,
-// elementwise_add_bias, elementwise_add_out, elementwise_add
-// relu_out, relu
-struct SeqConvEltAddRelu : public PatternBase {
-  SeqConvEltAddRelu(PDPattern* pattern, const std::string& name_scope)
-      : PatternBase(pattern, name_scope, "seqconv_eltadd_relu") {}
-
-  PDNode* operator()(PDNode* seqconv_input);
-
-  // declare operator node's name
-  PATTERN_DECL_NODE(seqconv);
-  PATTERN_DECL_NODE(eltadd);
-  PATTERN_DECL_NODE(relu);
-  // declare variable node's name
-  PATTERN_DECL_NODE(seqconv_weight);
-  PATTERN_DECL_NODE(seqconv_out);
-  PATTERN_DECL_NODE(eltadd_bias);
-  PATTERN_DECL_NODE(eltadd_out);
-  PATTERN_DECL_NODE(relu_out);
-};
-
 // FC with bias
 // op: mul + elementwise_add
 // named nodes:

paddle/fluid/inference/api/paddle_pass_builder.cc

@@ -234,8 +234,7 @@ const std::vector<std::string> kCINNCompilerPasses{
 const std::vector<std::string> CpuBasicPasses{
     "simplify_with_basic_ops_pass",  //
     "layer_norm_fuse_pass",
-    "attention_lstm_fuse_pass",       //
-    "seqconv_eltadd_relu_fuse_pass",  //
+    "attention_lstm_fuse_pass",  //
     // "seqpool_concat_fuse_pass",    //
     "seqpool_cvm_concat_fuse_pass",  //
     // "embedding_fc_lstm_fuse_pass", //
@@ -443,7 +442,6 @@ void CpuPassStrategy::EnableMkldnnInt8() {
     passes_.emplace_back("squeeze2_transpose2_onednn_fuse_pass");
     passes_.emplace_back("layer_norm_fuse_pass");
     passes_.emplace_back("attention_lstm_fuse_pass");
-    passes_.emplace_back("seqconv_eltadd_relu_fuse_pass");
     passes_.emplace_back("fc_lstm_fuse_pass");
     passes_.emplace_back("mul_lstm_fuse_pass");
     passes_.emplace_back("fc_gru_fuse_pass");