Fix include paths for Layout.h

smessmer · facebook-github-bot · commit 1098500e9b2c · 2018-12-03T21:53:22.000-08:00
Summary: Pull Request resolved: pytorch#14645 Reviewed By: ezyang Differential Revision: D13283496 fbshipit-source-id: d70881e957c886a6c2befe3ef1d2c5a3fac18e7f
diff --git a/aten/src/ATen/ATen.h b/aten/src/ATen/ATen.h
@@ -16,9 +16,9 @@
 #include "ATen/Type.h"
 #include "ATen/core/ATenGeneral.h"
 #include "ATen/core/Generator.h"
-#include "ATen/core/Layout.h"
+#include <c10/core/Layout.h>
 #include "ATen/core/Scalar.h"
-#include "c10/core/Storage.h"
+#include <c10/core/Storage.h>
 #include "ATen/core/TensorMethods.h"
 #include "ATen/core/TensorOptions.h"
-#include "c10/util/Exception.h"
+#include <c10/util/Exception.h>
diff --git a/aten/src/ATen/Layout.h b/aten/src/ATen/Layout.h
@@ -1,2 +1,2 @@
 #pragma once
-#include <ATen/core/Layout.h>
+#include <c10/core/Layout.h>
diff --git a/aten/src/ATen/core/DefaultTensorOptions.h b/aten/src/ATen/core/DefaultTensorOptions.h
@@ -2,7 +2,7 @@
 
 #include <c10/core/Backend.h>
 #include <c10/Device.h>
-#include <ATen/core/Layout.h>
+#include <c10/core/Layout.h>
 #include <c10/core/ScalarType.h>
 
 namespace at {
diff --git a/aten/src/ATen/core/Layout.h b/aten/src/ATen/core/Layout.h
diff --git a/aten/src/ATen/core/Tensor.h b/aten/src/ATen/core/Tensor.h
@@ -1,11 +1,11 @@
 #pragma once
 
 #include <c10/Device.h>
-#include "ATen/core/Layout.h"
+#include <c10/core/Layout.h>
 #include <c10/core/Scalar.h>
 #include <c10/core/ScalarType.h>
 #include "ATen/core/SparseTensorRef.h"
-#include "c10/core/Storage.h"
+#include <c10/core/Storage.h>
 #include "ATen/core/TensorAccessor.h"
 #include "ATen/core/TensorImpl.h"
 #include "ATen/core/UndefinedTensorImpl.h"
diff --git a/aten/src/ATen/core/TensorOptions.cpp b/aten/src/ATen/core/TensorOptions.cpp
@@ -1,7 +1,7 @@
 #include <ATen/core/TensorOptions.h>
 
 #include <c10/Device.h>
-#include <ATen/core/Layout.h>
+#include <c10/core/Layout.h>
 #include <c10/core/ScalarType.h>
 #include <c10/util/Optional.h>
 
diff --git a/aten/src/ATen/core/TensorOptions.h b/aten/src/ATen/core/TensorOptions.h
@@ -3,7 +3,7 @@
 #include <c10/core/Backend.h>
 #include <ATen/core/DefaultTensorOptions.h>
 #include <c10/Device.h>
-#include <ATen/core/Layout.h>
+#include <c10/core/Layout.h>
 #include <c10/core/ScalarType.h>
 #include <c10/core/ScalarTypeUtils.h>
 
diff --git a/aten/src/ATen/core/Type.h b/aten/src/ATen/core/Type.h
@@ -4,7 +4,7 @@
 #include <c10/core/Allocator.h>
 #include "ATen/core/Deprecated.h"
 #include "ATen/core/Generator.h"
-#include "ATen/core/Layout.h"
+#include <c10/core/Layout.h>
 #include <c10/core/Scalar.h>
 #include <c10/core/ScalarType.h>
 #include "ATen/core/SparseTensorRef.h"
diff --git a/aten/src/ATen/native/GridSampler.cpp b/aten/src/ATen/native/GridSampler.cpp
@@ -2,7 +2,7 @@
 #include "ATen/ATen.h"
 #include "ATen/Device.h"
 #include "ATen/NativeFunctions.h"
-#include "ATen/core/Layout.h"
+#include <c10/core/Layout.h>
 #include "ATen/cpu/vml.h"
 #include "ATen/native/cpu/GridSamplerKernel.h"
 #include "c10/util/Exception.h"
diff --git a/aten/src/ATen/templates/Tensor.h b/aten/src/ATen/templates/Tensor.h
@@ -1,11 +1,11 @@
 #pragma once
 
 #include <c10/Device.h>
-#include "ATen/core/Layout.h"
+#include <c10/core/Layout.h>
 #include <c10/core/Scalar.h>
 #include <c10/core/ScalarType.h>
 #include "ATen/core/SparseTensorRef.h"
-#include "c10/core/Storage.h"
+#include <c10/core/Storage.h>
 #include "ATen/core/TensorAccessor.h"
 #include "ATen/core/TensorImpl.h"
 #include "ATen/core/UndefinedTensorImpl.h"
diff --git a/aten/src/ATen/templates/Type.h b/aten/src/ATen/templates/Type.h
@@ -4,7 +4,7 @@
 #include <c10/core/Allocator.h>
 #include "ATen/core/Deprecated.h"
 #include "ATen/core/Generator.h"
-#include "ATen/core/Layout.h"
+#include <c10/core/Layout.h>
 #include <c10/core/Scalar.h>
 #include <c10/core/ScalarType.h>
 #include "ATen/core/SparseTensorRef.h"

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`#pragma once`
`2`		`-#include <ATen/core/Layout.h>`
	`2`	`+#include <c10/core/Layout.h>`