Fix include paths for TensorImpl.h

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

Reviewed By: ezyang

Differential Revision: D13348040

fbshipit-source-id: a7204d89c2dd277d13093b0ed862f40b53dee82f

diff --git a/aten/src/ATen/SparseTensorImpl.h b/aten/src/ATen/SparseTensorImpl.h
index e42b34e..7d8baf5 100644 (file)
--- a/aten/src/ATen/SparseTensorImpl.h
+++ b/aten/src/ATen/SparseTensorImpl.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <ATen/Tensor.h>
-#include <ATen/core/TensorImpl.h>
+#include <c10/core/TensorImpl.h>
 #include <c10/util/Exception.h>
 
 namespace at {

diff --git a/aten/src/ATen/WrapDimUtils.h b/aten/src/ATen/WrapDimUtils.h
index 590dc77..e3fe0ec 100644 (file)
--- a/aten/src/ATen/WrapDimUtils.h
+++ b/aten/src/ATen/WrapDimUtils.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <c10/core/WrapDimMinimal.h>
-#include <ATen/core/TensorImpl.h>
+#include <c10/core/TensorImpl.h>
 
 namespace at {
 

diff --git a/aten/src/ATen/WrapDimUtilsMulti.h b/aten/src/ATen/WrapDimUtilsMulti.h
index 1ba1f0b..0772279 100644 (file)
--- a/aten/src/ATen/WrapDimUtilsMulti.h
+++ b/aten/src/ATen/WrapDimUtilsMulti.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <ATen/core/TensorImpl.h>
+#include <c10/core/TensorImpl.h>
 #include <ATen/WrapDimUtils.h>
 #include <sstream>
 #include <bitset>

diff --git a/aten/src/ATen/core/LegacyTypeDispatch.h b/aten/src/ATen/core/LegacyTypeDispatch.h
index 2b88cb7..0234b96 100644 (file)
--- a/aten/src/ATen/core/LegacyTypeDispatch.h
+++ b/aten/src/ATen/core/LegacyTypeDispatch.h
@@ -28,7 +28,7 @@
 #include <ATen/core/VariableHooksInterface.h>
 #include <c10/util/Exception.h>
 #include <ATen/core/LegacyDeviceTypeInit.h>
-#include <ATen/core/TensorImpl.h>
+#include <c10/core/TensorImpl.h>
 
 namespace at {
 

diff --git a/aten/src/ATen/core/Tensor.h b/aten/src/ATen/core/Tensor.h
index 122e957..17da63a 100644 (file)
--- a/aten/src/ATen/core/Tensor.h
+++ b/aten/src/ATen/core/Tensor.h
@@ -7,7 +7,7 @@
 #include <ATen/core/SparseTensorRef.h>
 #include <c10/core/Storage.h>
 #include <ATen/core/TensorAccessor.h>
-#include <ATen/core/TensorImpl.h>
+#include <c10/core/TensorImpl.h>
 #include <ATen/core/UndefinedTensorImpl.h>
 #include <c10/util/Exception.h>
 #include <c10/util/Optional.h>

diff --git a/aten/src/ATen/core/TensorImpl.h b/aten/src/ATen/core/TensorImpl.h
deleted file mode 100644 (file)
index 6e6be50..0000000
--- a/aten/src/ATen/core/TensorImpl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <c10/core/TensorImpl.h>

diff --git a/aten/src/ATen/core/UndefinedTensorImpl.h b/aten/src/ATen/core/UndefinedTensorImpl.h
index db92cf5..fcfdffa 100644 (file)
--- a/aten/src/ATen/core/UndefinedTensorImpl.h
+++ b/aten/src/ATen/core/UndefinedTensorImpl.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <ATen/core/TensorImpl.h>
+#include <c10/core/TensorImpl.h>
 
 namespace at {
 

diff --git a/aten/src/ATen/core/ivalue.h b/aten/src/ATen/core/ivalue.h
index 1c76d61..3d1d4c1 100644 (file)
--- a/aten/src/ATen/core/ivalue.h
+++ b/aten/src/ATen/core/ivalue.h
@@ -2,7 +2,7 @@
 
 #include <ATen/core/Scalar.h>
 #include <ATen/core/Tensor.h>
-#include <ATen/core/TensorImpl.h>
+#include <c10/core/TensorImpl.h>
 #include <ATen/core/UndefinedTensorImpl.h>
 #include <ATen/core/blob.h>
 #include <c10/util/intrusive_ptr.h>

diff --git a/aten/src/ATen/gen.py b/aten/src/ATen/gen.py
index 9a60112..0a627ea 100644 (file)
--- a/aten/src/ATen/gen.py
+++ b/aten/src/ATen/gen.py
@@ -255,7 +255,7 @@ def generate_storage_type_and_tensor(backend, density, scalar_type, declarations
     env['DenseBackend'] = backend
     env['storage_tensor_headers'] = []
     if density != 'Sparse':
-        env['storage_tensor_headers'] = ['#include "ATen/core/TensorImpl.h"']
+        env['storage_tensor_headers'] = ['#include <c10/core/TensorImpl.h>']
 
     # used for generating switch logic for external functions
     tag = density_tag + backend + scalar_name

diff --git a/aten/src/ATen/templates/Tensor.h b/aten/src/ATen/templates/Tensor.h
index 887bdbc..19b549e 100644 (file)
--- a/aten/src/ATen/templates/Tensor.h
+++ b/aten/src/ATen/templates/Tensor.h
@@ -7,7 +7,7 @@
 #include <ATen/core/SparseTensorRef.h>
 #include <c10/core/Storage.h>
 #include <ATen/core/TensorAccessor.h>
-#include <ATen/core/TensorImpl.h>
+#include <c10/core/TensorImpl.h>
 #include <ATen/core/UndefinedTensorImpl.h>
 #include <c10/util/Exception.h>
 #include <c10/util/Optional.h>

diff --git a/aten/src/ATen/templates/TypeDerived.cpp b/aten/src/ATen/templates/TypeDerived.cpp
index 027da8f..504c869 100644 (file)
--- a/aten/src/ATen/templates/TypeDerived.cpp
+++ b/aten/src/ATen/templates/TypeDerived.cpp
@@ -16,7 +16,7 @@ $storage_tensor_headers
 #include <ATen/Utils.h>
 #include <ATen/WrapDimUtils.h>
 #include <ATen/core/Half.h>
-#include <ATen/core/TensorImpl.h>
+#include <c10/core/TensorImpl.h>
 #include <ATen/core/UndefinedTensorImpl.h>
 #include <c10/util/Optional.h>
 

diff --git a/aten/src/TH/generic/THTensor.h b/aten/src/TH/generic/THTensor.h
index 9632752..4e7a58e 100644 (file)
--- a/aten/src/TH/generic/THTensor.h
+++ b/aten/src/TH/generic/THTensor.h
@@ -5,7 +5,7 @@
 /* a la lua? dim, storageoffset, ...  et les methodes ? */
 
 #ifdef __cplusplus
-#include <ATen/core/TensorImpl.h>
+#include <c10/core/TensorImpl.h>
 #endif
 
 #ifdef __cplusplus

diff --git a/caffe2/core/tensor_impl.h b/caffe2/core/tensor_impl.h
index 17d3b22..64f6db3 100644 (file)
--- a/caffe2/core/tensor_impl.h
+++ b/caffe2/core/tensor_impl.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <ATen/core/DimVector.h>
-#include <ATen/core/TensorImpl.h>
+#include <c10/core/TensorImpl.h>
 #include <ATen/core/context_base.h>
 #include <ATen/core/context_base.h>
 

diff --git a/test/cpp_extensions/complex_registration_extension.cpp b/test/cpp_extensions/complex_registration_extension.cpp
index 7a05c66..b73fec8 100644 (file)
--- a/test/cpp_extensions/complex_registration_extension.cpp
+++ b/test/cpp_extensions/complex_registration_extension.cpp
@@ -12,7 +12,7 @@
 #include "ATen/Utils.h"
 #include "ATen/WrapDimUtils.h"
 #include "ATen/core/Half.h"
-#include "ATen/core/TensorImpl.h"
+#include "c10/core/TensorImpl.h"
 #include "ATen/core/UndefinedTensorImpl.h"
 #include "c10/util/Optional.h"