From 9a335e02774164f40895b3f7bce349f835c47246 Mon Sep 17 00:00:00 2001 From: Tomasz Patejko Date: Thu, 27 Sep 2018 10:33:22 +0200 Subject: [PATCH] MKLDNN conv + elementwise_add fusion: changed a name of a formal argument in ElementwiseAdd pattern --- paddle/fluid/framework/ir/graph_pattern_detector.cc | 6 +++--- paddle/fluid/framework/ir/graph_pattern_detector.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/paddle/fluid/framework/ir/graph_pattern_detector.cc b/paddle/fluid/framework/ir/graph_pattern_detector.cc index e9517a20b66..f6c8609fd71 100644 --- a/paddle/fluid/framework/ir/graph_pattern_detector.cc +++ b/paddle/fluid/framework/ir/graph_pattern_detector.cc @@ -1020,20 +1020,20 @@ PDNode *patterns::Conv::operator()() { return output_var; } -PDNode *patterns::ElementwiseAdd::operator()(PDNode *conv_output) { +PDNode *patterns::ElementwiseAdd::operator()(PDNode *y_var) { auto elementwise_add_op = pattern->NewNode(elementwise_add_op_repr()) ->assert_is_op("elementwise_add"); auto x_var = pattern->NewNode(elementwise_add_x_repr()) ->assert_is_op_input("elementwise_add", "X"); - conv_output->assert_is_op_input("elementwise_add", "Y"); + y_var->assert_is_op_input("elementwise_add", "Y"); auto out_var = pattern->NewNode(elementwise_add_out_repr()) ->AsOutput() ->assert_is_op_output("elementwise_add", "Out"); - elementwise_add_op->LinksFrom({x_var, conv_output}); + elementwise_add_op->LinksFrom({x_var, y_var}); elementwise_add_op->LinksTo({out_var}); return out_var; diff --git a/paddle/fluid/framework/ir/graph_pattern_detector.h b/paddle/fluid/framework/ir/graph_pattern_detector.h index e6bd57e95f8..e586b7fe4e8 100644 --- a/paddle/fluid/framework/ir/graph_pattern_detector.h +++ b/paddle/fluid/framework/ir/graph_pattern_detector.h @@ -618,7 +618,7 @@ struct ElementwiseAdd : public PatternBase { ElementwiseAdd(PDPattern* pattern, const std::string& name_scope) : PatternBase(pattern, name_scope, "elementwise_add") {} - PDNode* operator()(PDNode* conv_output); + PDNode* operator()(PDNode* y_var); PATTERN_DECL_NODE(elementwise_add_op); PATTERN_DECL_NODE(elementwise_add_x); -- GitLab