Move UnsafeTensorFromTH and UnsafeStorageFromTH off Type (#21923)

Roy Li · facebook-github-bot · commit b36a041d6fee · 2019-06-21T01:05:29.000-07:00
Summary: Pull Request resolved: #21923 ghimport-source-id: f015c85 Test Plan: Imported from OSS Differential Revision: D15883390 Pulled By: li-roy fbshipit-source-id: 6a7a7ffbe6000199d41cdca5efb97371f46dd8fe
diff --git a/aten/src/ATen/ATen.h b/aten/src/ATen/ATen.h
@@ -25,3 +25,4 @@
 #include <c10/core/TensorOptions.h>
 #include <c10/util/Exception.h>
 #include <ATen/core/ATenDispatch.h>
+#include <ATen/core/UnsafeFromTH.h>
diff --git a/aten/src/ATen/UndefinedType.cpp b/aten/src/ATen/UndefinedType.cpp
@@ -17,13 +17,6 @@ Device UndefinedType::getDeviceFromPtr(void*) const {
   AT_ERROR("getDeviceFromPtr not defined for UndefinedType");
 }
 
-Storage UndefinedType::unsafeStorageFromTH(void * th_pointer, bool retain) const {
-  AT_ERROR("unsafeStorageFromTH not defined for UndefinedType");
-}
-Tensor UndefinedType::unsafeTensorFromTH(void * th_pointer, bool retain) const {
-  AT_ERROR("unsafeTensorFromTH not defined for UndefinedType");
-}
-
 const char * UndefinedType::toString() const {
   return "UndefinedType";
 }
diff --git a/aten/src/ATen/UndefinedType.h b/aten/src/ATen/UndefinedType.h
@@ -20,8 +20,6 @@ struct UndefinedType final : public TypeDefault {
   virtual Type & toBackend(Backend b) const override;
   virtual Type & toScalarType(ScalarType s) const override;
   virtual TypeID ID() const override;
-  virtual Storage unsafeStorageFromTH(void * th_pointer, bool retain) const override;
-  virtual Tensor unsafeTensorFromTH(void * th_pointer, bool retain) const override;
 };
 
 } // namespace at
diff --git a/aten/src/ATen/core/DeprecatedTypeProperties.cpp b/aten/src/ATen/core/DeprecatedTypeProperties.cpp
@@ -2,15 +2,16 @@
 
 #include <ATen/core/LegacyTypeDispatch.h>
 #include <ATen/core/Tensor.h>
+#include <ATen/core/UnsafeFromTH.h>
 
 namespace at {
 
 Tensor DeprecatedTypeProperties::unsafeTensorFromTH(void * th_pointer, bool retain) const {
-  return getDispatchType().unsafeTensorFromTH(th_pointer, retain);
+  return at::unsafeTensorFromTH(th_pointer, retain);
 }
 
 Storage DeprecatedTypeProperties::unsafeStorageFromTH(void * th_pointer, bool retain) const {
-  return getDispatchType().unsafeStorageFromTH(th_pointer, retain);
+  return at::unsafeStorageFromTH(th_pointer, retain);
 }
 
 Tensor DeprecatedTypeProperties::copy(const Tensor & src, bool non_blocking, c10::optional<Device> to_device) const {
diff --git a/aten/src/ATen/core/Type.h b/aten/src/ATen/core/Type.h
@@ -81,8 +81,6 @@ struct CAFFE2_API Type {
   bool is_undefined() const noexcept { return is_undefined_; }
   virtual Allocator * allocator() const = 0;
   virtual Device getDeviceFromPtr(void * data) const = 0;
-  virtual Tensor unsafeTensorFromTH(void * th_pointer, bool retain) const = 0;
-  virtual Storage unsafeStorageFromTH(void * th_pointer, bool retain) const = 0;
   virtual const char * toString() const = 0;
   virtual Type & toBackend(Backend b) const = 0;
   virtual Type & toScalarType(ScalarType s) const = 0;
diff --git a/aten/src/ATen/core/UnsafeFromTH.h b/aten/src/ATen/core/UnsafeFromTH.h
@@ -0,0 +1,20 @@
+#include <ATen/core/Tensor.h>
+
+namespace at {
+
+inline Tensor unsafeTensorFromTH(void * th_pointer, bool retain) {
+  auto tensor_impl = c10::intrusive_ptr<TensorImpl, UndefinedTensorImpl>::reclaim(static_cast<TensorImpl*>(th_pointer));
+  if (retain && tensor_impl.get() != UndefinedTensorImpl::singleton()) {
+    c10::raw::intrusive_ptr::incref(tensor_impl.get());
+  }
+  return Tensor(std::move(tensor_impl));
+}
+
+inline Storage unsafeStorageFromTH(void * th_pointer, bool retain) {
+  if (retain && th_pointer) {
+    c10::raw::intrusive_ptr::incref(static_cast<StorageImpl*>(th_pointer));
+  }
+  return Storage(c10::intrusive_ptr<StorageImpl>::reclaim(static_cast<StorageImpl*>(th_pointer)));
+}
+
+}
diff --git a/aten/src/ATen/templates/Type.h b/aten/src/ATen/templates/Type.h
@@ -74,8 +74,6 @@ struct CAFFE2_API Type {
   bool is_undefined() const noexcept { return is_undefined_; }
   virtual Allocator * allocator() const = 0;
   virtual Device getDeviceFromPtr(void * data) const = 0;
-  virtual Tensor unsafeTensorFromTH(void * th_pointer, bool retain) const = 0;
-  virtual Storage unsafeStorageFromTH(void * th_pointer, bool retain) const = 0;
   virtual const char * toString() const = 0;
   virtual Type & toBackend(Backend b) const = 0;
   virtual Type & toScalarType(ScalarType s) const = 0;
diff --git a/aten/src/ATen/templates/TypeDefault.cpp b/aten/src/ATen/templates/TypeDefault.cpp
@@ -38,20 +38,6 @@ Type & TypeDefault::toScalarType(ScalarType s) const {
   return at::globalContext().getNonVariableType(backend(),s);
 }
 
-Tensor TypeDefault::unsafeTensorFromTH(void * th_pointer, bool retain) const {
-  auto tensor_impl = c10::intrusive_ptr<TensorImpl, UndefinedTensorImpl>::reclaim(static_cast<TensorImpl*>(th_pointer));
-  if (retain && tensor_impl.get() != UndefinedTensorImpl::singleton()) {
-    c10::raw::intrusive_ptr::incref(tensor_impl.get());
-  }
-  return Tensor(std::move(tensor_impl));
-}
-Storage TypeDefault::unsafeStorageFromTH(void * th_pointer, bool retain) const {
-  if (retain && th_pointer) {
-    c10::raw::intrusive_ptr::incref(static_cast<StorageImpl*>(th_pointer));
-  }
-  return Storage(c10::intrusive_ptr<StorageImpl>::reclaim(static_cast<StorageImpl*>(th_pointer)));
-}
-
 ${type_method_definitions}
 
 static auto& registerer = globalATenDispatch()
diff --git a/aten/src/ATen/templates/TypeDefault.h b/aten/src/ATen/templates/TypeDefault.h
@@ -38,9 +38,6 @@ struct CAFFE2_API TypeDefault : public TypeExtendedInterface {
       bool create_graph) const override;
   void set_data(Tensor & self, Tensor new_data) const override;
 
-  Storage unsafeStorageFromTH(void * th_pointer, bool retain) const override;
-  Tensor unsafeTensorFromTH(void * th_pointer, bool retain) const override;
-
   // example
   // virtual Tensor * add(Tensor & a, Tensor & b) = 0;
   ${type_method_declarations}
diff --git a/aten/src/ATen/test/basic.cpp b/aten/src/ATen/test/basic.cpp
@@ -207,7 +207,7 @@ void TestTensorFromTH() {
   int a = 4;
   THFloatTensor* t = THFloatTensor_newWithSize2d(a, a);
   THFloatTensor_fill(t, a);
-  ASSERT_NO_THROW(CPU(kFloat).unsafeTensorFromTH(t, false));
+  ASSERT_NO_THROW(at::unsafeTensorFromTH(t, false));
 }
 
 void TestToCFloat() {
diff --git a/tools/autograd/templates/VariableType.h b/tools/autograd/templates/VariableType.h
@@ -55,8 +55,6 @@ struct TORCH_API VariableType final : public at::TypeDefault {
   at::TypeID ID() const override;
   at::Type & toBackend(at::Backend b) const override;
   at::Type & toScalarType(at::ScalarType s) const override;
-  Storage unsafeStorageFromTH(void * th_pointer, bool retain) const override;
-  at::Tensor unsafeTensorFromTH(void * th_pointer, bool retain) const override;
 
   static at::TypeExtendedInterface* getVariableTypeFromBaseType(const at::Type& baseType);
   static bool isVariableType(const at::Type& type);
diff --git a/torch/csrc/autograd/VariableTypeManual.cpp b/torch/csrc/autograd/VariableTypeManual.cpp
@@ -25,12 +25,6 @@ Allocator* VariableType::allocator() const {
 Device VariableType::getDeviceFromPtr(void * data) const {
   return baseType->getDeviceFromPtr(data);
 }
-Storage VariableType::unsafeStorageFromTH(void * th_pointer, bool retain) const {
-  return baseType->unsafeStorageFromTH(th_pointer, retain);
-}
-Tensor VariableType::unsafeTensorFromTH(void * th_pointer, bool retain) const {
-  return make_variable(baseType->unsafeTensorFromTH(th_pointer, retain), /*requires_grad=*/false);
-}
 
 const char * VariableType::toString() const {
   return str.c_str();
diff --git a/torch/csrc/utils/tensor_new.cpp b/torch/csrc/utils/tensor_new.cpp
@@ -296,7 +296,7 @@ Tensor legacy_sparse_tensor_ctor(const Type& type, ScalarType scalar_type, PyObj
     return at::empty({0}, type.options(scalar_type, r.deviceOptional(0)));
   } else if (r.idx == 1) {
     auto cdata = reinterpret_cast<void*>(r.toInt64(0));
-    return type.unsafeTensorFromTH(cdata, true);
+    return autograd::make_variable(at::unsafeTensorFromTH(cdata, true));
   } else if (r.idx == 2) {
     auto deviceOptional = r.deviceOptional(2);
     check_legacy_ctor_device(type, deviceOptional);
@@ -338,7 +338,7 @@ Tensor legacy_sparse_tensor_new(const Type& type, ScalarType scalar_type, PyObje
     return at::empty({0}, type.options(scalar_type));
   } else if (r.idx == 1) {
     auto cdata = reinterpret_cast<void*>(r.toInt64(0));
-    return type.unsafeTensorFromTH(cdata, true);
+    return autograd::make_variable(at::unsafeTensorFromTH(cdata, true));
   } else if (r.idx == 2) {
     // Note: this signature doesn't have a dtype, even though it has a device; it probably shouldn't
     // have a device (we should infer it).
@@ -401,7 +401,7 @@ Tensor legacy_tensor_ctor(const Type& type, ScalarType scalar_type, PyObject* ar
     return new_with_storage(type, scalar_type, r.storage(0));
   } else if (r.idx == 2) {
     auto cdata = reinterpret_cast<void*>(r.toInt64(0));
-    return type.unsafeTensorFromTH(cdata, true);
+    return autograd::make_variable(at::unsafeTensorFromTH(cdata, true));
   } else if (r.idx == 3) {
     return new_with_tensor(type, scalar_type, r.tensor(0));
   } else if (r.idx == 4) {
@@ -447,7 +447,7 @@ Tensor legacy_tensor_new(const Type& type, ScalarType scalar_type, PyObject* arg
     return new_with_storage(type, scalar_type, r.storage(0));
   } else if (r.idx == 2) {
     auto cdata = reinterpret_cast<void*>(r.toInt64(0));
-    return type.unsafeTensorFromTH(cdata, true);
+    return autograd::make_variable(at::unsafeTensorFromTH(cdata, true));
   } else if (r.idx == 3) {
     return new_with_tensor(type, scalar_type, r.tensor(0));
   } else if (r.idx == 4) {

Original file line number	Diff line number	Diff line change
`@@ -17,13 +17,6 @@ Device UndefinedType::getDeviceFromPtr(void*) const {`
`17`	`17`	`AT_ERROR("getDeviceFromPtr not defined for UndefinedType");`
`18`	`18`	`}`
`19`	`19`
`20`		`-Storage UndefinedType::unsafeStorageFromTH(void * th_pointer, bool retain) const {`
`21`		`- AT_ERROR("unsafeStorageFromTH not defined for UndefinedType");`
`22`		`-}`
`23`		`-Tensor UndefinedType::unsafeTensorFromTH(void * th_pointer, bool retain) const {`
`24`		`- AT_ERROR("unsafeTensorFromTH not defined for UndefinedType");`
`25`		`-}`
`26`		`-`
`27`	`20`	`const char * UndefinedType::toString() const {`
`28`	`21`	`return "UndefinedType";`
`29`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,15 +2,16 @@`
`2`	`2`
`3`	`3`	`#include <ATen/core/LegacyTypeDispatch.h>`
`4`	`4`	`#include <ATen/core/Tensor.h>`
	`5`	`+#include <ATen/core/UnsafeFromTH.h>`
`5`	`6`
`6`	`7`	`namespace at {`
`7`	`8`
`8`	`9`	`Tensor DeprecatedTypeProperties::unsafeTensorFromTH(void * th_pointer, bool retain) const {`
`9`		`- return getDispatchType().unsafeTensorFromTH(th_pointer, retain);`
	`10`	`+ return at::unsafeTensorFromTH(th_pointer, retain);`
`10`	`11`	`}`
`11`	`12`
`12`	`13`	`Storage DeprecatedTypeProperties::unsafeStorageFromTH(void * th_pointer, bool retain) const {`
`13`		`- return getDispatchType().unsafeStorageFromTH(th_pointer, retain);`
	`14`	`+ return at::unsafeStorageFromTH(th_pointer, retain);`
`14`	`15`	`}`
`15`	`16`
`16`	`17`	`Tensor DeprecatedTypeProperties::copy(const Tensor & src, bool non_blocking, c10::optional<Device> to_device) const {`
Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,7 @@ void TestTensorFromTH() {`
`207`	`207`	`int a = 4;`
`208`	`208`	`THFloatTensor* t = THFloatTensor_newWithSize2d(a, a);`
`209`	`209`	`THFloatTensor_fill(t, a);`
`210`		`- ASSERT_NO_THROW(CPU(kFloat).unsafeTensorFromTH(t, false));`
	`210`	`+ ASSERT_NO_THROW(at::unsafeTensorFromTH(t, false));`
`211`	`211`	`}`
`212`	`212`
`213`	`213`	`void TestToCFloat() {`