Move UniqueVoidPtr to c10

Summary: Pull Request resolved: https://github.com/pytorch/pytorch/pull/14058

Reviewed By: dzhulgakov

Differential Revision: D13081602

fbshipit-source-id: e91ccf9fba9a7a02f99ed90b7a3a0fe7afd56832

diff --git a/aten/src/ATen/core/Allocator.h b/aten/src/ATen/core/Allocator.h
index 09c99ae..05c41ff 100644 (file)
--- a/aten/src/ATen/core/Allocator.h
+++ b/aten/src/ATen/core/Allocator.h
@@ -4,7 +4,7 @@
 #include <memory>
 
 #include <c10/Device.h>
-#include <ATen/core/UniqueVoidPtr.h>
+#include <c10/util/UniqueVoidPtr.h>
 #include <c10/util/Exception.h>
 
 namespace at {
@@ -18,7 +18,7 @@ namespace at {
 //
 class DataPtr {
  private:
-  detail::UniqueVoidPtr ptr_;
+  c10::detail::UniqueVoidPtr ptr_;
   Device device_;
 
  public:

diff --git a/aten/src/ATen/core/UniqueVoidPtr.cpp b/c10/util/UniqueVoidPtr.cpp
similarity index 50%
rename from aten/src/ATen/core/UniqueVoidPtr.cpp
rename to c10/util/UniqueVoidPtr.cpp
index fd08f7e..d4e9e32 100644 (file)
--- a/aten/src/ATen/core/UniqueVoidPtr.cpp
+++ b/c10/util/UniqueVoidPtr.cpp
@@ -1,9 +1,9 @@
-#include <ATen/core/UniqueVoidPtr.h>
+#include <c10/util/UniqueVoidPtr.h>
 
-namespace at {
+namespace c10 {
 namespace detail {
 
 void deleteNothing(void*) {}
 
 } // namespace detail
-} // namespace at
+} // namespace c10

diff --git a/aten/src/ATen/core/UniqueVoidPtr.h b/c10/util/UniqueVoidPtr.h
similarity index 99%
rename from aten/src/ATen/core/UniqueVoidPtr.h
rename to c10/util/UniqueVoidPtr.h
index b4acde8..67b720c 100644 (file)
--- a/aten/src/ATen/core/UniqueVoidPtr.h
+++ b/c10/util/UniqueVoidPtr.h
@@ -3,7 +3,7 @@
 
 #include <c10/macros/Macros.h>
 
-namespace at {
+namespace c10 {
 
 using DeleterFnPtr = void (*)(void*);
 
@@ -113,4 +113,4 @@ inline bool operator!=(std::nullptr_t, const UniqueVoidPtr& sp) noexcept {
 }
 
 } // namespace detail
-} // namespace at
+} // namespace c10