From 26fb34c3651180a35411e35680abcc017b3fbf66 Mon Sep 17 00:00:00 2001 From: Yu Yang Date: Fri, 9 Nov 2018 13:03:48 +0800 Subject: [PATCH] Merge develop tiny fix --- paddle/fluid/operators/conv_mkldnn_op.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/paddle/fluid/operators/conv_mkldnn_op.cc b/paddle/fluid/operators/conv_mkldnn_op.cc index 3a486efbd..10e2ebb2a 100644 --- a/paddle/fluid/operators/conv_mkldnn_op.cc +++ b/paddle/fluid/operators/conv_mkldnn_op.cc @@ -12,11 +12,11 @@ See the License for the specific language governing permissions and limitations under the License. */ +#include "paddle/fluid/framework/data_layout_transform.h" +#include "paddle/fluid/memory/malloc.h" #include "paddle/fluid/operators/conv_op.h" #include "paddle/fluid/platform/mkldnn_helper.h" -#include "paddle/fluid/framework/data_layout_transform.h" - namespace paddle { namespace operators { @@ -426,8 +426,9 @@ class ConvMKLDNNOpKernel : public paddle::framework::OpKernel { "same dimension sizes"); if (residual_param->format() != handler.GetDstFormat()) { - auto output_data = - output->mutable_data(ctx.GetPlace(), handler.GetDstMemorySize()); + auto output_data = output->mutable_data( + ctx.GetPlace(), ::paddle::memory::Allocator::kDefault, + handler.GetDstMemorySize()); auto residual_data_tz = paddle::framework::vectorize2int(residual_param->dims()); auto residual_data_type = -- GitLab