Fix include paths for typeid.h (#13689)

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

Now that typeid.h lives in c10/util, the include paths should reflect that.

Reviewed By: ezyang

Differential Revision: D12912237

fbshipit-source-id: e54225f049f690de77cb6d5f417994b211a6e1fb

aten/src/ATen/core/ScalarType.h

@@ -2,7 +2,7 @@
 
 #include <c10/util/ArrayRef.h>
 #include "ATen/core/Half.h"
-#include "ATen/core/typeid.h"
+#include <c10/util/typeid.h>
 
 #include <cstdint>
 #include <iostream>

aten/src/ATen/core/blob.h

@@ -7,7 +7,7 @@
 #include <vector>
 
 #include <ATen/core/intrusive_ptr.h>
-#include <ATen/core/typeid.h>
+#include <c10/util/typeid.h>
 #include <c10/macros/Macros.h>
 
 namespace caffe2 {

aten/src/ATen/core/context_base.h

@@ -8,7 +8,7 @@
 
 #include <ATen/core/ATenGeneral.h>
 #include <ATen/core/Allocator.h>
-#include <ATen/core/typeid.h>
+#include <c10/util/typeid.h>
 #include <c10/util/Exception.h>
 #include <c10/util/Registry.h>
 

aten/src/THC/generic/THCStorage.cpp

@@ -3,7 +3,7 @@
 #else
 
 #include <ATen/core/intrusive_ptr.h>
-#include <ATen/core/typeid.h>
+#include <c10/util/typeid.h>
 
 scalar_t* THCStorage_(data)(THCState *state, const THCStorage *self)
 {

caffe2/contrib/gloo/context.cc

@@ -1,6 +1,6 @@
 #include "context.h"
 
-#include "caffe2/core/typeid.h"
+#include <c10/util/typeid.h>
 
 #include <gloo/types.h>
 

caffe2/core/allocator.cc

@@ -1,7 +1,7 @@
 #include <ATen/core/Allocator.h>
 #include "caffe2/core/context.h"
 #include "caffe2/core/logging.h"
-#include "caffe2/core/typeid.h"
+#include <c10/util/typeid.h>
 
 C10_DEFINE_bool(
     caffe2_report_cpu_memory_usage,

caffe2/core/blob.h

@@ -9,7 +9,7 @@
 #include "caffe2/core/common.h"
 
 #include <ATen/core/blob.h>
-#include <ATen/core/typeid.h>
+#include <c10/util/typeid.h>
 #include "caffe2/core/logging.h"
 #include "caffe2/core/tensor.h"
 

caffe2/core/blob_serialization.h

@@ -9,7 +9,7 @@
 #include "caffe2/core/blob.h"
 #include "caffe2/core/blob_serializer_base.h"
 #include "caffe2/core/tensor.h"
-#include "caffe2/core/typeid.h"
+#include <c10/util/typeid.h>
 #include "caffe2/core/types.h"
 #include "caffe2/utils/simple_queue.h"
 

caffe2/core/blob_stats.h

@@ -2,7 +2,7 @@
 
 #include "c10/util/Registry.h"
 #include "caffe2/core/blob.h"
-#include "caffe2/core/typeid.h"
+#include <c10/util/typeid.h>
 
 #include <unordered_map>
 

caffe2/core/context.h

@@ -10,7 +10,7 @@
 #include "caffe2/core/context_base.h"
 #include "caffe2/core/event.h"
 #include "caffe2/core/logging.h"
-#include "caffe2/core/typeid.h"
+#include <c10/util/typeid.h>
 #include "caffe2/proto/caffe2_pb.h"
 
 #include <ATen/core/ATenCoreTest.h>

caffe2/core/dispatch/DispatchKey.h

@@ -2,7 +2,7 @@
 
 #include "caffe2/core/dispatch/DeviceId.h"
 #include "caffe2/core/dispatch/LayoutId.h"
-#include "caffe2/core/typeid.h"
+#include <c10/util/typeid.h>
 
 #include <vector>
 #include <functional>

caffe2/core/int8_serialization.cc

@@ -2,7 +2,7 @@
 #include "caffe2/core/common.h"
 #include "caffe2/core/context.h"
 #include "caffe2/core/tensor_int8.h"
-#include "caffe2/core/typeid.h"
+#include <c10/util/typeid.h>
 #include "caffe2/core/types.h"
 
 namespace caffe2 {

caffe2/core/module.h

@@ -14,7 +14,7 @@
 #include <mutex>
 
 #include "caffe2/core/common.h"
-#include "caffe2/core/typeid.h"
+#include <c10/util/typeid.h>
 
 namespace caffe2 {
 

caffe2/core/qtensor.h

@@ -9,7 +9,7 @@
 #include "caffe2/core/common.h"
 #include "caffe2/core/context.h"
 #include "caffe2/core/tensor.h"
-#include "caffe2/core/typeid.h"
+#include <c10/util/typeid.h>
 
 namespace caffe2 {
 

caffe2/core/storage.h

@@ -14,7 +14,7 @@
 #include "caffe2/core/context.h"
 #include "caffe2/core/flags.h"
 #include "caffe2/core/logging.h"
-#include "caffe2/core/typeid.h"
+#include <c10/util/typeid.h>
 
 #include <ATen/core/Allocator.h>
 #include <c10/Device.h>

caffe2/core/tensor_int8.cc

@@ -1,5 +1,5 @@
 #include "caffe2/core/tensor_int8.h"
-#include "caffe2/core/typeid.h"
+#include <c10/util/typeid.h>
 
 namespace caffe2 {
 CAFFE_KNOWN_TYPE(int8::Int8TensorCPU);

caffe2/core/typeid.h

@@ -1,7 +0,0 @@
-#pragma once
-
-// If I omit this header, the Windows build fails.  The error message
-// was sufficiently bad that I couldn't figure out which downstream file
-// was missing the include of common.h.  So keep it here for BC.
-#include <caffe2/core/common.h>
-#include <c10/util/typeid.h>

caffe2/core/types.cc

@@ -1,5 +1,5 @@
 #include "caffe2/core/types.h"
-#include "caffe2/core/typeid.h"
+#include <c10/util/typeid.h>
 
 #include <atomic>
 #include <memory>

caffe2/core/types.h

@@ -7,7 +7,7 @@
 
 #include "caffe2/core/common.h"
 #include "caffe2/core/logging.h"
-#include "caffe2/core/typeid.h"
+#include <c10/util/typeid.h>
 #include "caffe2/proto/caffe2_pb.h"
 #include <ATen/core/Half.h>
 

caffe2/distributed/store_handler.cc

@@ -2,7 +2,7 @@
 
 #include <memory>
 
-#include "caffe2/core/typeid.h"
+#include <c10/util/typeid.h>
 
 namespace caffe2 {
 

caffe2/mobile/contrib/opengl/core/GLImage.cc

@@ -1,7 +1,7 @@
 
 #include "GLImage.h"
 #include "arm_neon_support.h"
-#include "caffe2/core/typeid.h"
+#include <c10/util/typeid.h>
 
 namespace caffe2 {
 CAFFE_KNOWN_TYPE(GLImage<float>);

caffe2/mpi/mpi_common.cc

@@ -2,7 +2,7 @@
 
 #include <thread>
 
-#include "caffe2/core/typeid.h"
+#include <c10/util/typeid.h>
 #include "caffe2/utils/proto_utils.h"
 
 namespace caffe2 {

caffe2/operators/quant_decode_op.cc

@@ -1,7 +1,7 @@
 #include "quant_decode_op.h"
 #include <stdint.h>
 #include "caffe2/core/tensor.h"
-#include "caffe2/core/typeid.h"
+#include <c10/util/typeid.h>
 
 namespace caffe2 {
 

caffe2/operators/quant_decode_op.h

@@ -4,7 +4,7 @@
 #include "caffe2/core/context.h"
 #include "caffe2/core/operator.h"
 #include "caffe2/core/tensor.h"
-#include "caffe2/core/typeid.h"
+#include <c10/util/typeid.h>
 
 namespace caffe2 {