zheng-da commented on a change in pull request #8302: Refactor operators &
MKLDNN
URL: https://github.com/apache/incubator-mxnet/pull/8302#discussion_r161937980
##########
File path: include/mxnet/ndarray.h
##########
@@ -611,6 +565,64 @@ class NDArray {
<< "CheckAndAllocAuxData is not intended for kDefaultStorage";
ptr_->CheckAndAllocAuxData(i, aux_shape);
}
+
+#if MXNET_USE_MKLDNN == 1
+ bool IsMKLDNN() const {
+ return ptr_->IsMKLDNN();
+ }
+ bool IsDefault() const {
+ return ptr_->IsDefault();
+ }
+ /*
+ * All functions below return a raw pointer to mkldnn memory. Actually there
+ * is a shared pointer that hold the memory either in NDArray or in MKLDNN
+ * stream. As long as we call these functions inside an operator, the return
+ * memory is always valid.
+ */
+
+ /*
+ * This function returns mkldnn::memory with the default primitive_desc.
+ */
+ const mkldnn::memory *GetMKLDNNData() const;
+ /*
+ * This function returns mkldnn::memory with the given primitive_desc
+ * as long as the array size meets the required size in the given
primitive_desc.
+ */
+ const mkldnn::memory *GetMKLDNNData(
+ const mkldnn::memory::primitive_desc &desc) const;
+ /*
+ * This function returns mkldnn::memory with the given primitive_desc.
+ * The returned mkldnn::memory will have the same physical layout as
+ * the given primitive_desc.
+ */
+ const mkldnn::memory *GetMKLDNNDataReorder(
+ const mkldnn::memory::primitive_desc &desc) const;
+
+ void CopyFrom(const mkldnn::memory &mem);
+ mkldnn::memory *CreateMKLDNNData(
+ const mkldnn::memory::primitive_desc &desc);
+
+ /*
+ * Reorder the memory to the specified layout.
+ */
+ void Reorder(const mkldnn::memory::primitive_desc &desc);
+ void Reorder2Default() {
+ CHECK_EQ(storage_type(), kDefaultStorage);
+ ptr_->Reorder2Default();
+ }
+
+ void InvalidateData() {
+ // When we invalidate data, we don't need to care about the MKLDNN format.
+ ptr_->Mkl_mem_ = nullptr;
Review comment:
Maybe I should rename it as ResetMKLDNNData.
Mkl_mem_ always references to the data in shandle and only provides the
information of the data layout and data shape. removing Mkl_mem_ means the
NDArray will store data in the default format.
----------------------------------------------------------------
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
