fix the bug for mkldnn clone (#20943)

XiaobingSuper · facebook-github-bot · commit ebc8d7170e35 · 2019-05-27T12:09:52.000-07:00
Summary: This PR is to solve the bug for clone a MKLDNN tensor, please see the issue #20895. Pull Request resolved: #20943 Differential Revision: D15511516 Pulled By: mrshenli fbshipit-source-id: 05b41d6c7eaf8703521f4c768b8f26ec8501dc5e
diff --git a/aten/src/ATen/native/mkldnn/TensorShape.cpp b/aten/src/ATen/native/mkldnn/TensorShape.cpp
@@ -46,7 +46,8 @@ Tensor mkldnn_reshape(const Tensor& self, IntArrayRef size) {
 
 Tensor mkldnn_clone(const Tensor& self) {
   ideep::tensor& src = itensor_from_mkldnn(self);
-  ideep::tensor dst{src};
+  ideep::tensor dst;
+  ideep::direct_copy::compute<AllocForMKLDNN>(src, dst);
   return new_with_itensor_mkldnn(std::move(dst), self.options());
 }
 
diff --git a/test/test_mkldnn.py b/test/test_mkldnn.py
@@ -232,6 +232,13 @@ def test_clone(self):
             x.clone(),
             x.to_mkldnn().clone().to_dense(),
         )
+        # test whether share same memory
+        y = x.to_mkldnn()
+        z = y.clone().add_(y)
+        self.assertNotEqual(
+            y.to_dense(),
+            z.to_dense(),
+        )
 
     def test_linear(self):
         in_features = torch.randint(3, 10, (1,)).item()

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,8 @@ Tensor mkldnn_reshape(const Tensor& self, IntArrayRef size) {`
`46`	`46`
`47`	`47`	`Tensor mkldnn_clone(const Tensor& self) {`
`48`	`48`	`ideep::tensor& src = itensor_from_mkldnn(self);`
`49`		`- ideep::tensor dst{src};`
	`49`	`+ ideep::tensor dst;`
	`50`	`+ ideep::direct_copy::compute<AllocForMKLDNN>(src, dst);`
`50`	`51`	`return new_with_itensor_mkldnn(std::move(dst), self.options());`
`51`	`52`	`}`
`52`	`53`