Fix include paths for TensorImpl.h

smessmer · facebook-github-bot · commit 2dfdbef91df0 · 2018-12-11T21:01:40.000-08:00
Summary: Pull Request resolved: pytorch#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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -16,7 +16,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>
 
diff --git 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
@@ -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
@@ -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"
 
