提交 7bf00c3a 编写于 作者: J Jacek Czaja

- First draft of reusing of softmax mkldnn primitives

- Added hash function inside of MKLDNN softmax op to be used as handle for primitives stroing in a
context

- Style fixes to softmax mkldnn op

- Fixes after review

- Coding style

- Fix to style

- style fixes

- style fix

- style fixes

- Fix to cody style check

- Rephrasing a comment
上级 aaab92b0
...@@ -53,25 +53,60 @@ class SoftmaxMKLDNNKernel : public paddle::framework::OpKernel<T> { ...@@ -53,25 +53,60 @@ class SoftmaxMKLDNNKernel : public paddle::framework::OpKernel<T> {
"Softmax input and output dimensions should match"); "Softmax input and output dimensions should match");
// Same memory descriptor to be used for input and output // Same memory descriptor to be used for input and output
memory::dims softmax_tz = {src_tz[0], src_tz[1]}; memory::dims softmax_tz = {src_tz[0], src_tz[1]};
// Currently only supports NC data format // Generate keys for storing/retriving primitives for this operator
// TODO(jczaja-intel): support more formats // TODO(jczaja): Each MKLDNN operator may have diffrent hashing function
auto softmax_md = auto gethash = [](memory::dims& operand_dims) {
MKLDNNMemDesc({softmax_tz}, memory::f32, memory::format::nc); return std::string(std::to_string(operand_dims[0]) + "-" +
// Normalization is made after innermost dimension eg. C out of NC std::to_string(operand_dims[1]));
auto softmax_desc = softmax_forward::desc(prop_kind::forward_scoring, };
softmax_md, 1 /*dim: C*/); const std::string key = gethash(softmax_tz);
// create memory primitives const std::string key_softmax_p = key + "@softmax_p";
auto softmax_src_memory = const std::string key_softmax_src_mem_p = key + "@softmax_src_mem_p";
memory({softmax_md, mkldnn_engine}, const std::string key_softmax_dst_mem_p = key + "@softmax_dst_mem_p";
static_cast<void*>(const_cast<T*>(input_data)));
auto softmax_dst_memory = std::shared_ptr<void> softmax_p = dev_ctx.GetBlob(key_softmax_p);
memory({softmax_md, mkldnn_engine}, if (softmax_p == nullptr) {
static_cast<void*>(const_cast<T*>(output_data))); // Currently only NC data format is supported
auto softmax_prim_desc = auto softmax_md =
softmax_forward::primitive_desc(softmax_desc, mkldnn_engine); MKLDNNMemDesc({softmax_tz}, memory::f32, memory::format::nc);
auto softmax = softmax_forward(softmax_prim_desc, softmax_src_memory, // Normalization is made after innermost dimension eg. C out of NC
softmax_dst_memory); auto softmax_desc = softmax_forward::desc(prop_kind::forward_scoring,
std::vector<primitive> pipeline{softmax}; softmax_md, 1 /*dim: C*/);
// create memory primitives
auto softmax_src_memory_p = std::make_shared<memory>(
memory::primitive_desc{softmax_md, mkldnn_engine},
static_cast<void*>(const_cast<T*>(input_data)));
dev_ctx.SetBlob(key_softmax_src_mem_p, softmax_src_memory_p);
auto softmax_dst_memory_p = std::make_shared<memory>(
memory::primitive_desc{softmax_md, mkldnn_engine},
static_cast<void*>(output_data));
dev_ctx.SetBlob(key_softmax_dst_mem_p, softmax_dst_memory_p);
auto softmax_forward_pd =
std::make_shared<softmax_forward::primitive_desc>(softmax_desc,
mkldnn_engine);
softmax_p = std::make_shared<softmax_forward>(
*(softmax_forward_pd.get()),
*(static_cast<memory*>(softmax_src_memory_p.get())),
*(static_cast<memory*>(softmax_dst_memory_p.get())));
dev_ctx.SetBlob(key_softmax_p, softmax_p);
} else {
// Primitives already exist
auto src_memory_p = std::static_pointer_cast<memory>(
dev_ctx.GetBlob(key_softmax_src_mem_p));
PADDLE_ENFORCE(src_memory_p != nullptr,
"Fail to find softmax src mem_p in device context");
auto dst_memory_p = std::static_pointer_cast<memory>(
dev_ctx.GetBlob(key_softmax_dst_mem_p));
PADDLE_ENFORCE(dst_memory_p != nullptr,
"Fail to find softmax dst mem_p in device context");
src_memory_p->set_data_handle(
reinterpret_cast<void*>(const_cast<T*>(input_data)));
dst_memory_p->set_data_handle(output_data);
}
std::vector<primitive> pipeline{
*(static_cast<softmax_forward::primitive*>(softmax_p.get()))};
stream(stream::kind::eager).submit(pipeline).wait(); stream(stream::kind::eager).submit(pipeline).wait();
const bool is_test = ctx.Attr<bool>("is_test"); const bool is_test = ctx.Attr<bool>("is_test");
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册