piiswrong closed pull request #10812: Fix a mem error.
URL: https://github.com/apache/incubator-mxnet/pull/10812
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/include/mxnet/ndarray.h b/include/mxnet/ndarray.h
index 6fda8c37b41..e243eb71c47 100644
--- a/include/mxnet/ndarray.h
+++ b/include/mxnet/ndarray.h
@@ -678,10 +678,7 @@ class NDArray {
*/
NDArray Reorder2Default() const;
- void InvalidateMKLDNNData() {
- // Removing mkl_mem_ means the NDArray will store data in the default
format.
- ptr_->mkl_mem_ = nullptr;
- }
+ void InvalidateMKLDNNData();
/*
* This function is used inside operators to reshape an array.
diff --git a/src/ndarray/ndarray.cc b/src/ndarray/ndarray.cc
index 82de0949ccc..a28a907a941 100644
--- a/src/ndarray/ndarray.cc
+++ b/src/ndarray/ndarray.cc
@@ -620,6 +620,12 @@ const mkldnn::memory *NDArray::GetMKLDNNData() const {
}
}
+void NDArray::InvalidateMKLDNNData() {
+ // Removing mkl_mem_ means the NDArray will store data in the default format.
+ if (ptr_->mkl_mem_ && ptr_->mkl_mem_->IsMKLDNN())
+ ptr_->mkl_mem_ = nullptr;
+}
+
void NDArray::CopyFrom(const mkldnn::memory &mem) {
CHECK(ptr_ != nullptr) << "The NDArray hasn't been initialized";
if (ptr_->mkl_mem_ && ptr_->mkl_mem_->GetRaw() == &mem)
----------------------------------------------------------------
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:
[email protected]
With regards,
Apache Git Services
