Move TensorOptions to ATen/core (pytorch#22020)

Summary: Pull Request resolved: pytorch#22020 ghimport-source-id: 62766d4 Test Plan: Imported from OSS Differential Revision: D15920763 Pulled By: zou3519 fbshipit-source-id: c3429973180a65606da82face5c0ee377035e716
zmmwl · Aug 12, 2019 · bde7386 · bde7386
1 parent a5f6976
commit bde7386
Show file tree

Hide file tree

Showing 26 changed files with 29 additions and 29 deletions.
diff --git a/aten/src/ATen/ATen.h b/aten/src/ATen/ATen.h
@@ -17,13 +17,13 @@
 #include <ATen/Tensor.h>
 #include <ATen/TensorGeometry.h>
 #include <ATen/TensorOperators.h>
+#include <ATen/TensorOptions.h>
 #include <ATen/Version.h>
 #include <ATen/core/ATenGeneral.h>
 #include <ATen/core/Generator.h>
 #include <c10/core/Layout.h>
 #include <ATen/core/Scalar.h>
 #include <c10/core/Storage.h>
-#include <c10/core/TensorOptions.h>
 #include <ATen/core/Reduction.h>
 #include <c10/util/Exception.h>
 #include <ATen/core/ATenDispatch.h>

diff --git a/aten/src/ATen/Context.cpp b/aten/src/ATen/Context.cpp
@@ -2,7 +2,7 @@
 
 #include <ATen/Context.h>
 
-#include <c10/core/TensorOptions.h>
+#include <ATen/core/TensorOptions.h>
 
 #include <thread>
 #include <mutex>

diff --git a/aten/src/ATen/InitialTensorOptions.h b/aten/src/ATen/InitialTensorOptions.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <c10/core/TensorOptions.h>
+#include <ATen/core/TensorOptions.h>
 
 namespace at {
 

diff --git a/aten/src/ATen/TensorOptions.h b/aten/src/ATen/TensorOptions.h
@@ -1,2 +1,2 @@
 #pragma once
-#include <c10/core/TensorOptions.h>
+#include <ATen/core/TensorOptions.h>
diff --git a/aten/src/ATen/core/DeprecatedTypeProperties.h b/aten/src/ATen/core/DeprecatedTypeProperties.h
@@ -3,7 +3,7 @@
 #include <c10/core/Backend.h>
 #include <c10/core/ScalarType.h>
 #include <c10/core/Layout.h>
-#include <c10/core/TensorOptions.h>
+#include <ATen/core/TensorOptions.h>
 #include <c10/core/Storage.h>
 #include <ATen/core/DeprecatedTypePropertiesRegistry.h>
 #include <ATen/core/Generator.h>

diff --git a/aten/src/ATen/core/Tensor.h b/aten/src/ATen/core/Tensor.h
@@ -8,6 +8,7 @@
 #include <c10/core/ScalarType.h>
 #include <c10/core/Storage.h>
 #include <ATen/core/TensorAccessor.h>
+#include <ATen/core/TensorOptions.h>
 #include <c10/core/TensorImpl.h>
 #include <c10/core/UndefinedTensorImpl.h>
 #include <c10/util/Exception.h>
@@ -22,9 +23,6 @@
 namespace caffe2 {
 class Tensor;
 }
-namespace c10{
-struct TensorOptions;
-}
 namespace at {
 struct Generator;
 struct Type;

diff --git a/aten/src/ATen/core/TensorMethods.h b/aten/src/ATen/core/TensorMethods.h
@@ -4,10 +4,10 @@
 #include <c10/core/MemoryFormat.h>
 #include <c10/core/QScheme.h>
 #include <c10/macros/Macros.h>
-#include <c10/core/TensorOptions.h>
 #include <c10/util/intrusive_ptr.h>
 #include <ATen/core/DeprecatedTypeProperties.h>
 #include <ATen/core/ATenDispatch.h>
+#include <ATen/core/TensorOptions.h>
 #ifdef BUILD_NAMEDTENSOR
 #include <ATen/NamedTensor.h>
 #endif

diff --git a/c10/core/TensorOptions.cpp → aten/src/ATen/core/TensorOptions.cpp b/c10/core/TensorOptions.cpp → aten/src/ATen/core/TensorOptions.cpp
@@ -1,4 +1,4 @@
-#include <c10/core/TensorOptions.h>
+#include <ATen/core/TensorOptions.h>
 
 #include <c10/core/Device.h>
 #include <c10/core/Layout.h>

diff --git a/c10/core/TensorOptions.h → aten/src/ATen/core/TensorOptions.h b/c10/core/TensorOptions.h → aten/src/ATen/core/TensorOptions.h
diff --git a/aten/src/ATen/native/TensorFactories.cpp b/aten/src/ATen/native/TensorFactories.cpp
@@ -13,7 +13,7 @@
 #include <c10/util/Deprecated.h>
 #include <ATen/native/Resize.h>
 #include <ATen/native/TensorFactories.h>
-#include <c10/core/TensorOptions.h>
+#include <ATen/core/TensorOptions.h>
 #include <TH/THAllocator.h>
 #include <ATen/detail/CUDAHooksInterface.h>
 #include <c10/util/Exception.h>

diff --git a/aten/src/ATen/native/TensorFactories.h b/aten/src/ATen/native/TensorFactories.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <c10/core/TensorOptions.h>
+#include <ATen/core/TensorOptions.h>
 
 namespace at { namespace native {
 // Different combinations of row, col, and offset can lead to two cases:

diff --git a/aten/src/ATen/native/quantized/TensorFactories.cpp b/aten/src/ATen/native/quantized/TensorFactories.cpp
@@ -1,7 +1,8 @@
 #include <ATen/ATen.h>
+
+#include <ATen/core/TensorOptions.h>
 #include <ATen/quantized/Quantizer.h>
 #include <c10/core/QScheme.h>
-#include <c10/core/TensorOptions.h>
 
 namespace at {
 namespace native {

diff --git a/aten/src/ATen/quantized/Quantizer.h b/aten/src/ATen/quantized/Quantizer.h
@@ -6,7 +6,7 @@
 #include <c10/util/Exception.h>
 #include <c10/util/intrusive_ptr.h>
 #include <c10/core/ScalarType.h>
-#include <c10/core/TensorOptions.h>
+#include <ATen/core/TensorOptions.h>
 
 #include <cmath>
 #include <memory>

diff --git a/aten/src/ATen/templates/Functions.h b/aten/src/ATen/templates/Functions.h
@@ -9,7 +9,7 @@
 #include <c10/util/Deprecated.h>
 #include <ATen/NativeFunctions.h>
 #include <ATen/DeviceGuard.h>
-#include <c10/core/TensorOptions.h>
+#include <ATen/core/TensorOptions.h>
 #include <ATen/core/Reduction.h>
 #include <c10/util/Optional.h>
 #include <ATen/TensorUtils.h>

diff --git a/aten/src/ATen/templates/NativeFunctions.h b/aten/src/ATen/templates/NativeFunctions.h
@@ -4,8 +4,8 @@
 
 #include <ATen/Context.h>
 #include <c10/core/ScalarType.h>
-#include <c10/core/TensorOptions.h>
 #include <ATen/core/Reduction.h>
+#include <ATen/core/TensorOptions.h>
 
 #include <array>
 #include <functional>

diff --git a/aten/src/ATen/templates/Tensor.h b/aten/src/ATen/templates/Tensor.h
@@ -8,6 +8,7 @@
 #include <c10/core/ScalarType.h>
 #include <c10/core/Storage.h>
 #include <ATen/core/TensorAccessor.h>
+#include <ATen/core/TensorOptions.h>
 #include <c10/core/TensorImpl.h>
 #include <c10/core/UndefinedTensorImpl.h>
 #include <c10/util/Exception.h>
@@ -22,9 +23,6 @@
 namespace caffe2 {
 class Tensor;
 }
-namespace c10{
-struct TensorOptions;
-}
 namespace at {
 struct Generator;
 struct Type;

diff --git a/aten/src/ATen/templates/TensorMethods.h b/aten/src/ATen/templates/TensorMethods.h
@@ -4,10 +4,10 @@
 #include <c10/core/MemoryFormat.h>
 #include <c10/core/QScheme.h>
 #include <c10/macros/Macros.h>
-#include <c10/core/TensorOptions.h>
 #include <c10/util/intrusive_ptr.h>
 #include <ATen/core/DeprecatedTypeProperties.h>
 #include <ATen/core/ATenDispatch.h>
+#include <ATen/core/TensorOptions.h>
 #ifdef BUILD_NAMEDTENSOR
 #include <ATen/NamedTensor.h>
 #endif

diff --git a/aten/src/ATen/templates/TypeDefault.cpp b/aten/src/ATen/templates/TypeDefault.cpp
@@ -12,7 +12,7 @@
 #include <c10/core/Scalar.h>
 #include <c10/core/Storage.h>
 #include <ATen/Tensor.h>
-#include <c10/core/TensorOptions.h>
+#include <ATen/core/TensorOptions.h>
 #include <ATen/DeviceGuard.h>
 #include <ATen/SparseTensorUtils.h>
 #include <ATen/core/ATenDispatch.h>

diff --git a/c10/core/TensorImpl.h b/c10/core/TensorImpl.h
@@ -5,9 +5,12 @@
 #include <numeric>
 
 #include <c10/core/Backend.h>
+#include <c10/core/DefaultDtype.h>
+#include <c10/core/Device.h>
+#include <c10/core/Layout.h>
 #include <c10/core/MemoryFormat.h>
+#include <c10/core/ScalarType.h>
 #include <c10/core/Storage.h>
-#include <c10/core/TensorOptions.h>
 #include <c10/core/TensorTypeId.h>
 #include <c10/core/TensorTypeIdRegistration.h>
 #include <c10/core/CopyBytes.h>

diff --git a/caffe2/core/tensor.h b/caffe2/core/tensor.h
@@ -7,7 +7,7 @@
 #include <ATen/core/UndefinedTensorImpl.h>
 #include <c10/util/intrusive_ptr.h>
 #include "ATen/core/Tensor.h"
-#include <c10/core/TensorOptions.h>
+#include <ATen/core/TensorOptions.h>
 
 #include <ATen/core/grad_mode.h>
 

diff --git a/test/cpp/api/tensor_options.cpp b/test/cpp/api/tensor_options.cpp
@@ -4,7 +4,7 @@
 
 #include <ATen/Context.h>
 #include <ATen/Functions.h>
-#include <c10/core/TensorOptions.h>
+#include <ATen/core/TensorOptions.h>
 
 #include <string>
 #include <vector>

diff --git a/test/cpp/api/tensor_options_cuda.cpp b/test/cpp/api/tensor_options_cuda.cpp
@@ -4,7 +4,7 @@
 #include <ATen/DeviceGuard.h>
 #include <ATen/Functions.h>
 #include <c10/core/ScalarType.h>
-#include <c10/core/TensorOptions.h>
+#include <ATen/core/TensorOptions.h>
 
 #include <torch/cuda.h>
 

diff --git a/tools/autograd/templates/Functions.cpp b/tools/autograd/templates/Functions.cpp
@@ -7,7 +7,7 @@
 
 #include "Functions.h"
 #include <ATen/Utils.h>
-#include <c10/core/TensorOptions.h>
+#include <ATen/core/TensorOptions.h>
 #include <ATen/WrapDimUtils.h>
 #include <ATen/WrapDimUtilsMulti.h>
 #include <ATen/SparseTensorUtils.h>

diff --git a/torch/csrc/api/include/torch/nn/cloneable.h b/torch/csrc/api/include/torch/nn/cloneable.h
@@ -4,7 +4,7 @@
 #include <torch/types.h>
 #include <torch/utils.h>
 
-#include <c10/core/TensorOptions.h>
+#include <ATen/core/TensorOptions.h>
 #include <c10/util/Exception.h>
 
 #include <memory>

diff --git a/torch/csrc/api/include/torch/nn/parallel/data_parallel.h b/torch/csrc/api/include/torch/nn/parallel/data_parallel.h
@@ -14,7 +14,7 @@
 
 #include <ATen/Device.h>
 #include <ATen/Parallel.h>
-#include <c10/core/TensorOptions.h>
+#include <ATen/core/TensorOptions.h>
 #include <c10/util/Exception.h>
 
 #include <cstddef>

diff --git a/torch/csrc/autograd/python_variable_indexing.cpp b/torch/csrc/autograd/python_variable_indexing.cpp
@@ -15,7 +15,7 @@
 
 #include <ATen/DeviceGuard.h>
 #include <ATen/ExpandUtils.h>
-#include <c10/core/TensorOptions.h>
+#include <ATen/core/TensorOptions.h>
 #include <ATen/core/LegacyTypeDispatch.h>
 
 #include <vector>