piiswrong commented on a change in pull request #8302: Refactor operators &
MKLDNN
URL: https://github.com/apache/incubator-mxnet/pull/8302#discussion_r161928812
##########
File path: src/ndarray/ndarray.cc
##########
@@ -64,14 +166,55 @@ nnvm::Symbol NDArray::get_autograd_symbol() const {
return ret;
}
+#if MXNET_USE_MKLDNN == 1
+
+struct EmptyMKLDNNDeleter {
+ void operator()(mkldnn::memory *mem) {
+ }
+};
+
+NDArray NDArray::ReshapeMKLDNN(const TShape &shape) const {
+ CHECK(!is_none()) << "NDArray is not initialized";
+ CHECK_GE(shape_.Size(), shape.Size())
+ << "NDArray.Reshape: target shape size is larger current shape";
+ CHECK_EQ(storage_type(), kDefaultStorage);
+ if (!IsMKLDNN()) {
+ NDArray ret = this->Detach();
+ ret.shape_ = shape;
+ return ret;
+ } else {
+ NDArray ret(shape, ctx(), true, dtype());
+ // We shouldn't submit the reorder primitive here because submit will
+ // be called in operators.
+ auto format =
GetDefaultFormat(ptr_->Mkl_mem_->get_primitive_desc().desc());
+ CHECK_NE(format, ptr_->Mkl_mem_->get_primitive_desc().desc().data.format);
+ auto def_pd = GetPrimitiveDesc(ptr_->Mkl_mem_->get_primitive_desc(),
format);
+ auto def_mem = TmpMemMgr::Get()->Alloc(def_pd);
+ MKLDNNStream *stream = MKLDNNStream::Get();
+ stream->RegisterMem(ptr_->Mkl_mem_);
+ stream->RegisterPrim(mkldnn::reorder(*ptr_->Mkl_mem_, *def_mem));
+ // def_mem points to a memory region in the temp space. It's only valid
+ // inside an operator. As such, the returned NDArray can only be valid
+ // inside an operator and the shared point doesn't need to do anything
+ // when it's destroyed.
+ ret.ptr_->Mkl_mem_ = std::shared_ptr<mkldnn::memory>(def_mem,
+ EmptyMKLDNNDeleter());
Review comment:
you can use a lambda here. No need to define a struct
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
