diff --git a/paddle/fluid/framework/ir/conv_elementwise_add_mkldnn_fuse_pass.cc b/paddle/fluid/framework/ir/conv_elementwise_add_mkldnn_fuse_pass.cc index ac15e1b3d5f0874a21e63a5daecf51b38f822f5a..9cd3c401b0ecc3ded0c32cdd2f9b10e4fd88464c 100644 --- a/paddle/fluid/framework/ir/conv_elementwise_add_mkldnn_fuse_pass.cc +++ b/paddle/fluid/framework/ir/conv_elementwise_add_mkldnn_fuse_pass.cc @@ -184,7 +184,7 @@ graph_ptr ConvElementwiseAddMKLDNNFusePass::ApplyImpl(graph_ptr graph) const { op_desc.SetInput("Input", {conv_input->Name()}); op_desc.SetInput("Filter", {conv_filter->Name()}); - op_desc.SetInput("EltwiseParameter", {elementwise_add_x->Name()}); + op_desc.SetInput("ResidualData", {elementwise_add_x->Name()}); op_desc.SetOutput("Output", {conv_output->Name()}); op_desc.SetAttr("use_mkldnn", true); diff --git a/paddle/fluid/operators/conv_mkldnn_op.cc b/paddle/fluid/operators/conv_mkldnn_op.cc index c849caf94ffd17835294329479ae938ca0969c70..8c9ea7c409bf98d066ceda73f250bb8c7f07418d 100644 --- a/paddle/fluid/operators/conv_mkldnn_op.cc +++ b/paddle/fluid/operators/conv_mkldnn_op.cc @@ -390,14 +390,14 @@ class ConvMKLDNNOpKernel : public paddle::framework::OpKernel { T* output_data = nullptr; if (fuse_eltwise) { - auto eltwise_param = ctx.Input("EltwiseParameter"); - auto eltwise_param_data = eltwise_param->data(); + auto residual_param = ctx.Input("ResidualData"); + auto residual_param_data = residual_param->data(); - PADDLE_ENFORCE(eltwise_param_data != nullptr, "Provide data if you want MKLDNN conv+elementwise_add fusion"); - PADDLE_ENFORCE_EQ(output->dims(), eltwise_param->dims(), "Output and elementwise parameter need to have the same dimension sizes"); + PADDLE_ENFORCE(residual_param_data != nullptr, "Provide data if you want MKLDNN conv+elementwise_add fusion"); + PADDLE_ENFORCE_EQ(output->dims(), residual_param->dims(), "Output and elementwise parameter need to have the same dimension sizes"); output_data = output->mutable_data(ctx.GetPlace()); - output->ShareDataWith(*eltwise_param); + output->ShareDataWith(*residual_param); } else { output_data = output->mutable_data(ctx.GetPlace(), handler.GetDstMemorySize()); diff --git a/paddle/fluid/operators/conv_op.cc b/paddle/fluid/operators/conv_op.cc index 99c50a52078a4118678863273501e4c935a39ff7..1e913dea1b1fdfdea1bcfc4786b1bcacebb97ed1 100644 --- a/paddle/fluid/operators/conv_op.cc +++ b/paddle/fluid/operators/conv_op.cc @@ -132,8 +132,9 @@ void Conv2DOpMaker::Make() { "(Tensor) The output tensor of convolution operator. " "The format of output tensor is also NCHW.") .Reuse("Input"); - AddInput("EltwiseParameter", - "(Tensor) Tensor to which convolution output will be added." + AddInput("ResidualData", + "(Tensor) Tensor with residual data " + "to which convolution output will be added." "Used on with fuse_eltwise fusion.") .AsDispensable(); AddAttr>("strides",