Back out "Fix include paths for TensorOptions, DefaultTensorOptions, OptionsGuard" (#14744)

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

Original commit changeset: d236d5351ecf

Reviewed By: suo

Differential Revision: D13318596

fbshipit-source-id: 55f1e9472d05fb5a9c47dc82c32e9a66b5e4308c
This commit is contained in:
Sebastian Messmer 2018-12-04 08:55:15 -08:00 committed by Facebook Github Bot
parent 7bc489c827
commit ff7deb95d7
22 changed files with 22 additions and 20 deletions

View file

@ -20,5 +20,5 @@
#include "ATen/core/Scalar.h"
#include <c10/core/Storage.h>
#include "ATen/core/TensorMethods.h"
#include "c10/core/TensorOptions.h"
#include "ATen/core/TensorOptions.h"
#include <c10/util/Exception.h>

View file

@ -2,7 +2,7 @@
#include "Context.h"
#include <c10/core/TensorOptions.h>
#include <ATen/core/TensorOptions.h>
#include <thread>
#include <mutex>

View file

@ -1,6 +1,6 @@
#pragma once
#include <c10/core/TensorOptions.h>
#include <ATen/core/TensorOptions.h>
namespace at {

View file

@ -1,2 +1,2 @@
#pragma once
#include <c10/core/TensorOptions.h>
#include <ATen/core/TensorOptions.h>

View file

@ -0,0 +1 @@
#include <c10/core/DefaultTensorOptions.h>

View file

@ -6,7 +6,7 @@
#include <c10/core/Backend.h>
#include <c10/core/Storage.h>
#include <c10/core/TensorOptions.h>
#include <ATen/core/TensorOptions.h>
#include <c10/core/TensorTypeId.h>
#include <c10/core/TensorTypeIdRegistration.h>
#include <ATen/core/context_base.h>

View file

@ -5,7 +5,7 @@
#include <c10/macros/Macros.h>
#include "ATen/core/SparseTensorRef.h"
#include "ATen/core/Type.h"
#include "c10/core/TensorOptions.h"
#include "ATen/core/TensorOptions.h"
namespace at {

View file

@ -0,0 +1 @@
#include <c10/core/TensorOptions.h>

View file

@ -12,7 +12,7 @@
#include <c10/Half.h>
#include <c10/core/TensorTypeIdRegistration.h>
#include "ATen/core/Reduction.h"
#include "c10/core/TensorOptions.h"
#include "ATen/core/TensorOptions.h"
#include <c10/util/Optional.h>

View file

@ -11,7 +11,7 @@
#include "ATen/NativeFunctions.h"
#include <c10/core/ScalarType.h>
#include "ATen/core/Deprecated.h"
#include "c10/core/TensorOptions.h"
#include "ATen/core/TensorOptions.h"
#include <TH/THRandom.h>
#include "TH/THGenerator.hpp"
#include "c10/util/Exception.h"

View file

@ -11,7 +11,7 @@
#include "ATen/core/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"

View file

@ -5,7 +5,7 @@
#include <ATen/Context.h>
#include <c10/core/ScalarType.h>
#include <ATen/core/TensorMethods.h>
#include <c10/core/TensorOptions.h>
#include <ATen/core/TensorOptions.h>
#include <array>
#include <functional>

View file

@ -5,7 +5,7 @@
#include <c10/macros/Macros.h>
#include "ATen/core/SparseTensorRef.h"
#include "ATen/core/Type.h"
#include "c10/core/TensorOptions.h"
#include "ATen/core/TensorOptions.h"
namespace at {

View file

@ -12,7 +12,7 @@
#include <c10/Half.h>
#include <c10/core/TensorTypeIdRegistration.h>
#include "ATen/core/Reduction.h"
#include "c10/core/TensorOptions.h"
#include "ATen/core/TensorOptions.h"
#include <c10/util/Optional.h>

View file

@ -11,7 +11,7 @@
#include "ATen/core/SparseTensorRef.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"

View file

@ -6,7 +6,7 @@
#include <ATen/core/UndefinedTensorImpl.h>
#include <c10/util/intrusive_ptr.h>
#include "c10/core/TensorOptions.h"
#include "ATen/core/TensorOptions.h"
namespace caffe2 {

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -11,7 +11,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>

View file

@ -15,7 +15,7 @@
#include <ATen/DeviceGuard.h>
#include <ATen/ExpandUtils.h>
#include <c10/core/TensorOptions.h>
#include <ATen/core/TensorOptions.h>
#include <vector>
#include <tuple>