Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

[mkldnn-v1.0] Add MKL-DNN slice #16484

Merged
merged 2 commits into from
Oct 15, 2019
Merged

[mkldnn-v1.0] Add MKL-DNN slice #16484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17c7733
change slice to mkldnn v1.0
TaoLv Oct 15, 2019
1d467c3
fix lint
TaoLv Oct 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/operator/nn/mkldnn/mkldnn_slice-inl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#ifndef MXNET_OPERATOR_NN_MKLDNN_MKLDNN_SLICE_INL_H_
#define MXNET_OPERATOR_NN_MKLDNN_MKLDNN_SLICE_INL_H_

#if MXNET_USE_MKLDNN == 1
#if MXNET_USE_MKLDNN == 100

#include <dmlc/logging.h>
#include <dmlc/parameter.h>
Expand All @@ -45,7 +45,7 @@ class MKLDNNSliceFwd {
const NDArray &in,
const NDArray &out);
void SetNewMem(const mkldnn::memory &input, const mkldnn::memory &output);
const mkldnn::reorder &GetPd() const;
void Register();

private:
std::shared_ptr<mkldnn::memory> data_;
Expand All @@ -62,5 +62,5 @@ void MKLDNNSlice(const SliceParam &param, const OpContext& ctx,

} // namespace op
} // namespace mxnet
#endif // MXNET_USE_MKLDNN == 1
#endif // MXNET_USE_MKLDNN == 100
#endif // MXNET_OPERATOR_NN_MKLDNN_MKLDNN_SLICE_INL_H_
31 changes: 17 additions & 14 deletions src/operator/nn/mkldnn/mkldnn_slice.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* \author Zhiyuan Huang
*/

#if MXNET_USE_MKLDNN == 1
#if MXNET_USE_MKLDNN == 100

#include "./mkldnn_ops-inl.h"
#include "./mkldnn_base-inl.h"
Expand All @@ -49,22 +49,25 @@ MKLDNNSliceFwd::MKLDNNSliceFwd(const SliceParam &param,
dims[i] = oshape[i];
offsets[i] = s;
}
auto in_mem_pd = in.GetMKLDNNData()->get_primitive_desc();
auto out_mem_pd = out.GetMKLDNNData()->get_primitive_desc();
auto view_pd = mkldnn::view::primitive_desc(in_mem_pd, dims, offsets);
auto reorder_pd = reorder::primitive_desc(view_pd.dst_primitive_desc(), out_mem_pd);
this->data_ = std::make_shared<mkldnn::memory>(view_pd.dst_primitive_desc(), nullptr);
this->out_ = std::make_shared<mkldnn::memory>(view_pd.dst_primitive_desc(), nullptr);
this->fwd_ = std::make_shared<mkldnn::reorder>(reorder_pd, *this->data_, *this->out_);

auto in_md = in.GetMKLDNNData()->get_desc();
auto out_md = out.GetMKLDNNData()->get_desc();
auto sub_md = in_md.submemory_desc(dims, offsets);

auto engine = CpuEngine::Get()->get_engine();
this->data_ = std::make_shared<mkldnn::memory>(sub_md, engine, nullptr);
this->out_ = std::make_shared<mkldnn::memory>(out_md, engine, nullptr);
this->fwd_ = std::make_shared<mkldnn::reorder>(*this->data_, *this->out_);
}

void MKLDNNSliceFwd::SetNewMem(const mkldnn::memory &input, const mkldnn::memory &output) {
this->data_->set_data_handle(input.get_data_handle());
this->out_->set_data_handle(output.get_data_handle());
}

const mkldnn::reorder &MKLDNNSliceFwd::GetPd() const {
return *fwd_;
void MKLDNNSliceFwd::Register() {
MKLDNNStream::Get()->RegisterPrimArgs(*fwd_,
{{MKLDNN_ARG_FROM, *(this->data_)}, {MKLDNN_ARG_TO, *(this->out_)}});
}

MKLDNNSliceFwd &GetSliceForward(const SliceParam &param, const bool is_train,
Expand All @@ -91,14 +94,14 @@ void MKLDNNSlice(const SliceParam &param, const OpContext& ctx,
const NDArray &in, OpReqType req, const NDArray &out) {
MKLDNNSliceFwd &fwd = GetSliceForward(param, ctx.is_train, in, out);
auto in_mem = in.GetMKLDNNData();
auto out_mem_pd = out.GetMKLDNNData()->get_primitive_desc();
auto out_mem = CreateMKLDNNMem(out, out_mem_pd, req);
auto out_md = out.GetMKLDNNData()->get_desc();
auto out_mem = CreateMKLDNNMem(out, out_md, req);
fwd.SetNewMem(*in_mem, *out_mem.second);
MKLDNNStream::Get()->RegisterPrim(fwd.GetPd());
fwd.Register();
CommitOutput(out, out_mem);
MKLDNNStream::Get()->Submit();
}

} // namespace op
} // namespace mxnet
#endif // MXNET_USE_MKLDNN == 1
#endif // MXNET_USE_MKLDNN == 100