Fix include paths for TensorOptions

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

Reviewed By: ezyang

Differential Revision: D13318645

fbshipit-source-id: f5ba77a93f6019fbf5faffb47a2837c95fad474d

diff --git a/aten/src/ATen/ATen.h b/aten/src/ATen/ATen.h
index 7157b83..3ecdd1b 100644 (file)
--- a/aten/src/ATen/ATen.h
+++ b/aten/src/ATen/ATen.h
@@ -20,5 +20,5 @@
 #include "ATen/core/Scalar.h"
 #include <c10/core/Storage.h>
 #include "ATen/core/TensorMethods.h"
-#include "ATen/core/TensorOptions.h"
+#include "c10/core/TensorOptions.h"
 #include <c10/util/Exception.h>

diff --git a/aten/src/ATen/Context.cpp b/aten/src/ATen/Context.cpp
index 1d5be47..b85aca0 100644 (file)
--- a/aten/src/ATen/Context.cpp
+++ b/aten/src/ATen/Context.cpp
@@ -2,7 +2,7 @@
 
 #include "Context.h"
 
-#include <ATen/core/TensorOptions.h>
+#include <c10/core/TensorOptions.h>
 
 #include <thread>
 #include <mutex>

diff --git a/aten/src/ATen/InitialTensorOptions.h b/aten/src/ATen/InitialTensorOptions.h
index 7e7d1cb..d77ef2b 100644 (file)
--- a/aten/src/ATen/InitialTensorOptions.h
+++ b/aten/src/ATen/InitialTensorOptions.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <ATen/core/TensorOptions.h>
+#include <c10/core/TensorOptions.h>
 
 namespace at {
 

diff --git a/aten/src/ATen/TensorOptions.h b/aten/src/ATen/TensorOptions.h
index f5c3d73..b3edba8 100644 (file)
--- a/aten/src/ATen/TensorOptions.h
+++ b/aten/src/ATen/TensorOptions.h
@@ -1,2 +1,2 @@
 #pragma once
-#include <ATen/core/TensorOptions.h>
+#include <c10/core/TensorOptions.h>

diff --git a/aten/src/ATen/core/TensorImpl.h b/aten/src/ATen/core/TensorImpl.h
index 4ea5767..7642354 100644 (file)
--- a/aten/src/ATen/core/TensorImpl.h
+++ b/aten/src/ATen/core/TensorImpl.h
@@ -6,7 +6,7 @@
 
 #include <c10/core/Backend.h>
 #include <c10/core/Storage.h>
-#include <ATen/core/TensorOptions.h>
+#include <c10/core/TensorOptions.h>
 #include <c10/core/TensorTypeId.h>
 #include <c10/core/TensorTypeIdRegistration.h>
 #include <ATen/core/context_base.h>

diff --git a/aten/src/ATen/core/TensorMethods.h b/aten/src/ATen/core/TensorMethods.h
index 7901d6e..440950c 100644 (file)
--- a/aten/src/ATen/core/TensorMethods.h
+++ b/aten/src/ATen/core/TensorMethods.h
@@ -5,7 +5,7 @@
 #include <c10/macros/Macros.h>
 #include "ATen/core/SparseTensorRef.h"
 #include "ATen/core/Type.h"
-#include "ATen/core/TensorOptions.h"
+#include "c10/core/TensorOptions.h"
 
 namespace at {
 

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

diff --git a/aten/src/ATen/core/Type.h b/aten/src/ATen/core/Type.h
index 296c5c4..e9a5411 100644 (file)
--- a/aten/src/ATen/core/Type.h
+++ b/aten/src/ATen/core/Type.h
@@ -12,7 +12,7 @@
 #include <c10/Half.h>
 #include <c10/core/TensorTypeIdRegistration.h>
 #include "ATen/core/Reduction.h"
-#include "ATen/core/TensorOptions.h"
+#include "c10/core/TensorOptions.h"
 
 #include <c10/util/Optional.h>
 

diff --git a/aten/src/ATen/native/TensorFactories.cpp b/aten/src/ATen/native/TensorFactories.cpp
index 9da3543..58a9faa 100644 (file)
--- a/aten/src/ATen/native/TensorFactories.cpp
+++ b/aten/src/ATen/native/TensorFactories.cpp
@@ -11,7 +11,7 @@
 #include "ATen/NativeFunctions.h"
 #include <c10/core/ScalarType.h>
 #include "ATen/core/Deprecated.h"
-#include "ATen/core/TensorOptions.h"
+#include "c10/core/TensorOptions.h"
 #include <TH/THRandom.h>
 #include "TH/THGenerator.hpp"
 #include "c10/util/Exception.h"

diff --git a/aten/src/ATen/templates/Functions.h b/aten/src/ATen/templates/Functions.h
index 2932248..3973fbe 100644 (file)
--- a/aten/src/ATen/templates/Functions.h
+++ b/aten/src/ATen/templates/Functions.h
@@ -11,7 +11,7 @@
 #include "ATen/core/Deprecated.h"
 #include "ATen/NativeFunctions.h"
 #include "ATen/DeviceGuard.h"
-#include "ATen/core/TensorOptions.h"
+#include "c10/core/TensorOptions.h"
 #include "ATen/core/Reduction.h"
 #include "c10/util/Optional.h"
 

diff --git a/aten/src/ATen/templates/NativeFunctions.h b/aten/src/ATen/templates/NativeFunctions.h
index da59000..675df28 100644 (file)
--- a/aten/src/ATen/templates/NativeFunctions.h
+++ b/aten/src/ATen/templates/NativeFunctions.h
@@ -5,7 +5,7 @@
 #include <ATen/Context.h>
 #include <c10/core/ScalarType.h>
 #include <ATen/core/TensorMethods.h>
-#include <ATen/core/TensorOptions.h>
+#include <c10/core/TensorOptions.h>
 
 #include <array>
 #include <functional>

diff --git a/aten/src/ATen/templates/TensorMethods.h b/aten/src/ATen/templates/TensorMethods.h
index 962afba..cdea8b0 100644 (file)
--- a/aten/src/ATen/templates/TensorMethods.h
+++ b/aten/src/ATen/templates/TensorMethods.h
@@ -5,7 +5,7 @@
 #include <c10/macros/Macros.h>
 #include "ATen/core/SparseTensorRef.h"
 #include "ATen/core/Type.h"
-#include "ATen/core/TensorOptions.h"
+#include "c10/core/TensorOptions.h"
 
 namespace at {
 

diff --git a/aten/src/ATen/templates/Type.h b/aten/src/ATen/templates/Type.h
index 3f6f72c..48dc24b 100644 (file)
--- a/aten/src/ATen/templates/Type.h
+++ b/aten/src/ATen/templates/Type.h
@@ -12,7 +12,7 @@
 #include <c10/Half.h>
 #include <c10/core/TensorTypeIdRegistration.h>
 #include "ATen/core/Reduction.h"
-#include "ATen/core/TensorOptions.h"
+#include "c10/core/TensorOptions.h"
 
 #include <c10/util/Optional.h>
 

diff --git a/aten/src/ATen/templates/TypeDefault.cpp b/aten/src/ATen/templates/TypeDefault.cpp
index 96174db..6c61652 100644 (file)
--- a/aten/src/ATen/templates/TypeDefault.cpp
+++ b/aten/src/ATen/templates/TypeDefault.cpp
@@ -11,7 +11,7 @@
 #include "ATen/core/SparseTensorRef.h"
 #include "c10/core/Storage.h"
 #include "ATen/Tensor.h"
-#include "ATen/core/TensorOptions.h"
+#include "c10/core/TensorOptions.h"
 #include "ATen/DeviceGuard.h"
 #include "ATen/SparseTensorUtils.h"
 

diff --git a/caffe2/core/tensor.h b/caffe2/core/tensor.h
index 2759a1d..a3c0267 100644 (file)
--- 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 "ATen/core/TensorOptions.h"
+#include <c10/core/TensorOptions.h>
 
 namespace caffe2 {
 

diff --git a/test/cpp/api/tensor_options.cpp b/test/cpp/api/tensor_options.cpp
index bc8d571..a594f80 100644 (file)
--- 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 <ATen/core/TensorOptions.h>
+#include <c10/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
index 5c1c3bb..7df1037 100644 (file)
--- 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 <ATen/core/TensorOptions.h>
+#include <c10/core/TensorOptions.h>
 
 #include <torch/cuda.h>
 

diff --git a/tools/autograd/templates/Functions.cpp b/tools/autograd/templates/Functions.cpp
index 7998900..8cc45d9 100644 (file)
--- a/tools/autograd/templates/Functions.cpp
+++ b/tools/autograd/templates/Functions.cpp
@@ -7,7 +7,7 @@
 
 #include "Functions.h"
 #include <ATen/Utils.h>
-#include <ATen/core/TensorOptions.h>
+#include <c10/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
index 34b28a8..1f4f1ba 100644 (file)
--- 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 <ATen/core/TensorOptions.h>
+#include <c10/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
index e618391..ea23398 100644 (file)
--- a/torch/csrc/api/include/torch/nn/parallel/data_parallel.h
+++ b/torch/csrc/api/include/torch/nn/parallel/data_parallel.h
@@ -11,7 +11,7 @@
 
 #include <ATen/Device.h>
 #include <ATen/Parallel.h>
-#include <ATen/core/TensorOptions.h>
+#include <c10/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
index c747a96..e4b6e84 100644 (file)
--- a/torch/csrc/autograd/python_variable_indexing.cpp
+++ b/torch/csrc/autograd/python_variable_indexing.cpp
@@ -14,7 +14,7 @@
 
 #include <ATen/DeviceGuard.h>
 #include <ATen/ExpandUtils.h>
-#include <ATen/core/TensorOptions.h>
+#include <c10/core/TensorOptions.h>
 
 #include <vector>
 #include <tuple>