From 53fd507bae934a69e486c2f8d95d41a879ce7887 Mon Sep 17 00:00:00 2001
From: Tao Luo <luotao02@baidu.com>
Date: Mon, 10 Jun 2019 19:48:26 +0800
Subject: [PATCH] fix merge conflict of 'Remove attribute in
 Allocator::Allocate' and elementwise_add_mkldnn_op (#17949)

test=develop
---
 .../operators/elementwise/mkldnn/elementwise_add_mkldnn_op.cc  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/paddle/fluid/operators/elementwise/mkldnn/elementwise_add_mkldnn_op.cc b/paddle/fluid/operators/elementwise/mkldnn/elementwise_add_mkldnn_op.cc
index 2779f6dd9..88cda1cd6 100644
--- a/paddle/fluid/operators/elementwise/mkldnn/elementwise_add_mkldnn_op.cc
+++ b/paddle/fluid/operators/elementwise/mkldnn/elementwise_add_mkldnn_op.cc
@@ -70,8 +70,7 @@ class EltwiseAddMKLDNNKernel : public framework::OpKernel<T> {
         auto x_memory_pd = memory::primitive_desc(
             {{src_x_tz}, memory::data_type::f32, format}, mkldnn_engine);
         auto size = x_memory_pd.get_size();
-        _x.mutable_data<T>(ctx.GetPlace(), paddle::memory::Allocator::kDefault,
-                           size);
+        _x.mutable_data<T>(ctx.GetPlace(), size);
         auto user_x_memory =
             memory(user_x_memory_pd, paddle::platform::to_void_cast<T>(x_data));
         auto x_memory = memory(x_memory_pd,
-- 
GitLab