From 3257ac1ff3b5ad7bd383bc67459ccee07a80bc40 Mon Sep 17 00:00:00 2001
From: Sebastian Messmer <messmer@fb.com>
Date: Tue, 27 Nov 2018 12:43:24 -0800
Subject: [PATCH] Fix include paths for TensorTypeId.h and
 TensorTypeIdRegistration.h

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

Reviewed By: ezyang

Differential Revision: D13081610

fbshipit-source-id: 685994a15a2cd15e9e5447cf77671343de5dd278
---
 aten/src/ATen/core/Backend.h                  | 4 ++--
 aten/src/ATen/core/TensorImpl.h               | 8 ++++----
 aten/src/ATen/core/TensorTypeId.h             | 2 --
 aten/src/ATen/core/TensorTypeIdRegistration.h | 2 --
 aten/src/ATen/core/Type.h                     | 2 +-
 aten/src/ATen/templates/Type.h                | 2 +-
 6 files changed, 8 insertions(+), 12 deletions(-)
 delete mode 100644 aten/src/ATen/core/TensorTypeId.h
 delete mode 100644 aten/src/ATen/core/TensorTypeIdRegistration.h

diff --git a/aten/src/ATen/core/Backend.h b/aten/src/ATen/core/Backend.h
index 176a09f..2d2be8d 100644
--- a/aten/src/ATen/core/Backend.h
+++ b/aten/src/ATen/core/Backend.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <c10/DeviceType.h>
-#include <ATen/core/TensorTypeId.h>
-#include <ATen/core/TensorTypeIdRegistration.h>
+#include <c10/core/TensorTypeId.h>
+#include <c10/core/TensorTypeIdRegistration.h>
 #include <c10/util/Exception.h>
 
 #include <stdexcept>
diff --git a/aten/src/ATen/core/TensorImpl.h b/aten/src/ATen/core/TensorImpl.h
index 650c93f..8105eb8 100644
--- a/aten/src/ATen/core/TensorImpl.h
+++ b/aten/src/ATen/core/TensorImpl.h
@@ -7,14 +7,14 @@
 #include <ATen/core/LegacyTypeDispatch.h>
 #include <c10/core/Storage.h>
 #include <ATen/core/TensorOptions.h>
-#include <ATen/core/TensorTypeId.h>
-#include <ATen/core/TensorTypeIdRegistration.h>
+#include <c10/core/TensorTypeId.h>
+#include <c10/core/TensorTypeIdRegistration.h>
 #include <ATen/core/context_base.h>
 
 #include <c10/util/Exception.h>
-#include "c10/util/Optional.h"
+#include <c10/util/Optional.h>
 
-#include "c10/util/Flags.h"
+#include <c10/util/Flags.h>
 
 #include "caffe2/core/allocator.h"
 #include "caffe2/core/common.h"
diff --git a/aten/src/ATen/core/TensorTypeId.h b/aten/src/ATen/core/TensorTypeId.h
deleted file mode 100644
index 549b6d7..0000000
--- a/aten/src/ATen/core/TensorTypeId.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#pragma once
-#include <c10/core/TensorTypeId.h>
diff --git a/aten/src/ATen/core/TensorTypeIdRegistration.h b/aten/src/ATen/core/TensorTypeIdRegistration.h
deleted file mode 100644
index 3d5cfa4..0000000
--- a/aten/src/ATen/core/TensorTypeIdRegistration.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#pragma once
-#include "c10/core/TensorTypeIdRegistration.h"
diff --git a/aten/src/ATen/core/Type.h b/aten/src/ATen/core/Type.h
index 478f003..d1f43c0 100644
--- a/aten/src/ATen/core/Type.h
+++ b/aten/src/ATen/core/Type.h
@@ -10,7 +10,7 @@
 #include "ATen/core/SparseTensorRef.h"
 #include <c10/util/ArrayRef.h>
 #include <c10/Half.h>
-#include "ATen/core/TensorTypeIdRegistration.h"
+#include <c10/core/TensorTypeIdRegistration.h>
 #include "ATen/core/Reduction.h"
 #include "ATen/core/TensorOptions.h"
 
diff --git a/aten/src/ATen/templates/Type.h b/aten/src/ATen/templates/Type.h
index 7011923..0a5b9ff 100644
--- a/aten/src/ATen/templates/Type.h
+++ b/aten/src/ATen/templates/Type.h
@@ -10,7 +10,7 @@
 #include "ATen/core/SparseTensorRef.h"
 #include <c10/util/ArrayRef.h>
 #include <c10/Half.h>
-#include "ATen/core/TensorTypeIdRegistration.h"
+#include <c10/core/TensorTypeIdRegistration.h>
 #include "ATen/core/Reduction.h"
 #include "ATen/core/TensorOptions.h"
 
-- 
2.7.4