Merge pull request #13816 from PaddlePaddle/revert-13368-mgallus/conv-bias-pass

Revert "[MKLDNN] Pass: Fuse Conv + Bias"

Author: luotao1

paddle/fluid/framework/ir/CMakeLists.txt

@@ -30,7 +30,6 @@ pass_library(graph_to_program_pass base)
 pass_library(graph_viz_pass base)
 pass_library(fc_fuse_pass inference)
 if (WITH_MKLDNN)
-    pass_library(conv_bias_mkldnn_fuse_pass inference)
     pass_library(conv_relu_mkldnn_fuse_pass inference)
 endif ()
 pass_library(attention_lstm_fuse_pass inference)
@@ -53,7 +52,6 @@ cc_test(graph_helper_test SRCS graph_helper_test.cc DEPS graph graph_helper op_r
 cc_test(graph_to_program_pass_test SRCS graph_to_program_pass_test.cc DEPS graph_to_program_pass)
 cc_test(test_graph_pattern_detector SRCS graph_pattern_detector_tester.cc DEPS graph_pattern_detector)
 cc_test(test_fc_fuse_pass SRCS fc_fuse_pass_tester.cc DEPS fc_fuse_pass framework_proto)
-if(WITH_MKLDNN)
-    cc_test(test_conv_bias_mkldnn_fuse_pass SRCS conv_bias_mkldnn_fuse_pass_tester.cc DEPS conv_bias_mkldnn_fuse_pass)
+if (WITH_MKLDNN)
     cc_test(test_conv_relu_mkldnn_fuse_pass SRCS conv_relu_mkldnn_fuse_pass_tester.cc DEPS conv_relu_mkldnn_fuse_pass)
-endif()
+endif ()

paddle/fluid/framework/ir/conv_bias_mkldnn_fuse_pass.cc

@@ -964,38 +964,6 @@ PDNode *patterns::ElewiseAddActInplaceGrad::operator()(
   return ele_add_grad;
 }
 
-PDNode *patterns::ConvBias::operator()(
-    paddle::framework::ir::PDNode *conv_input) {
-  // Create Operators
-  conv_input->assert_is_op_input("conv2d", "Input");
-  auto *conv_op = pattern->NewNode(conv_repr())->assert_is_op("conv2d");
-  auto *eltiwse_op =
-      pattern->NewNode(eltwise_repr())->assert_is_op("elementwise_add");
-  // Create variables
-  // Filter
-  auto *conv_weight_var = pattern->NewNode(conv_weight_repr())
-                              ->AsInput()
-                              ->assert_is_persistable_var()
-                              ->assert_is_op_input("conv2d", "Filter");
-  // intermediate variable, will be removed in the IR after fuse.
-  auto *conv_out_var = pattern->NewNode(conv_out_repr())
-                           ->AsIntermediate()
-                           ->assert_is_only_output_of_op("conv2d")
-                           ->assert_is_op_input("elementwise_add");
-  // Bias stored in elementwise_add
-  auto *eltwise_bias_var = pattern->NewNode(eltwise_bias_repr())
-                               ->AsInput()
-                               ->assert_is_op_input("elementwise_add", "Y");
-  // output
-  auto *eltwise_out_var = pattern->NewNode(eltwise_out_repr())
-                              ->AsOutput()
-                              ->assert_is_op_output("elementwise_add");
-  conv_op->LinksFrom({conv_input, conv_weight_var}).LinksTo({conv_out_var});
-  eltiwse_op->LinksFrom({conv_out_var, eltwise_bias_var})
-      .LinksTo({eltwise_out_var});
-  return eltwise_out_var;
-}
-
 }  // namespace ir
 }  // namespace framework
 }  // namespace paddle

paddle/fluid/framework/ir/conv_bias_mkldnn_fuse_pass.h

@@ -578,27 +578,6 @@ struct ElewiseAddActInplaceGrad : public PatternBase {
   PATTERN_DECL_NODE(d_ele_y);
   PATTERN_DECL_NODE(ele_y);
 };
-
-// Conv with Elementwise_add as bias
-// op: conv + elementwise_add
-// named nodes:
-// conv_input, conv_weight,
-// conv_out, conv,
-// eltwise_bias, eltwise_out,
-// elementwise_add
-struct ConvBias : public PatternBase {
-  ConvBias(PDPattern* pattern, const std::string& name_scope)
-      : PatternBase(pattern, name_scope, "conv_bias") {}
-  PDNode* operator()(PDNode* conv_input);
-  // declare operator node's name
-  PATTERN_DECL_NODE(conv);
-  PATTERN_DECL_NODE(eltwise);
-  // declare variable node's name
-  PATTERN_DECL_NODE(conv_weight);
-  PATTERN_DECL_NODE(conv_out);
-  PATTERN_DECL_NODE(eltwise_bias);
-  PATTERN_DECL_NODE(eltwise_out);
-};
 }  // namespace patterns
 
 // Link two ir::Nodes from each other.

paddle/fluid/framework/ir/conv_bias_mkldnn_fuse_pass_tester.cc

@@ -76,7 +76,6 @@ class Analyzer : public OrderedRegistry<PassManager> {
       "conv_bn_fuse_pass",             //
       "conv_eltwiseadd_bn_fuse_pass",  //
 #ifdef PADDLE_WITH_MKLDNN
-      "conv_bias_mkldnn_fuse_pass",  //
       "conv_relu_mkldnn_fuse_pass",  //
 #endif
   }};