未验证 提交 53fd507b 编写于 作者: T Tao Luo 提交者: GitHub

fix merge conflict of 'Remove attribute in Allocator::Allocate' and...

fix merge conflict of 'Remove attribute in Allocator::Allocate' and elementwise_add_mkldnn_op (#17949)

test=develop
上级 3847d9fc
...@@ -70,8 +70,7 @@ class EltwiseAddMKLDNNKernel : public framework::OpKernel<T> { ...@@ -70,8 +70,7 @@ class EltwiseAddMKLDNNKernel : public framework::OpKernel<T> {
auto x_memory_pd = memory::primitive_desc( auto x_memory_pd = memory::primitive_desc(
{{src_x_tz}, memory::data_type::f32, format}, mkldnn_engine); {{src_x_tz}, memory::data_type::f32, format}, mkldnn_engine);
auto size = x_memory_pd.get_size(); auto size = x_memory_pd.get_size();
_x.mutable_data<T>(ctx.GetPlace(), paddle::memory::Allocator::kDefault, _x.mutable_data<T>(ctx.GetPlace(), size);
size);
auto user_x_memory = auto user_x_memory =
memory(user_x_memory_pd, paddle::platform::to_void_cast<T>(x_data)); memory(user_x_memory_pd, paddle::platform::to_void_cast<T>(x_data));
auto x_memory = memory(x_memory_pd, auto x_memory = memory(x_memory_pd,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册