Skip to content

Commit 4b0fc52

Browse files
smessmerfacebook-github-bot
smessmer
authored and
facebook-github-bot
committed
Fix include paths for typeid.h (pytorch#13689)
Summary: Pull Request resolved: pytorch#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
1 parent 72da09b commit 4b0fc52

24 files changed

+23
-30
lines changed

‎aten/src/ATen/core/ScalarType.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#include <c10/util/ArrayRef.h>
44
#include "ATen/core/Half.h"
5-
#include "ATen/core/typeid.h"
5+
#include <c10/util/typeid.h>
66

77
#include <cstdint>
88
#include <iostream>

‎aten/src/ATen/core/blob.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include <vector>
88

99
#include <ATen/core/intrusive_ptr.h>
10-
#include <ATen/core/typeid.h>
10+
#include <c10/util/typeid.h>
1111
#include <c10/macros/Macros.h>
1212

1313
namespace caffe2 {

‎aten/src/ATen/core/context_base.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
#include <ATen/core/ATenGeneral.h>
1010
#include <ATen/core/Allocator.h>
11-
#include <ATen/core/typeid.h>
11+
#include <c10/util/typeid.h>
1212
#include <c10/util/Exception.h>
1313
#include <c10/util/Registry.h>
1414

‎aten/src/THC/generic/THCStorage.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#else
44

55
#include <ATen/core/intrusive_ptr.h>
6-
#include <ATen/core/typeid.h>
6+
#include <c10/util/typeid.h>
77

88
scalar_t* THCStorage_(data)(THCState *state, const THCStorage *self)
99
{

‎caffe2/contrib/gloo/context.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "context.h"
22

3-
#include "caffe2/core/typeid.h"
3+
#include <c10/util/typeid.h>
44

55
#include <gloo/types.h>
66

‎caffe2/core/allocator.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include <ATen/core/Allocator.h>
22
#include "caffe2/core/context.h"
33
#include "caffe2/core/logging.h"
4-
#include "caffe2/core/typeid.h"
4+
#include <c10/util/typeid.h>
55

66
C10_DEFINE_bool(
77
caffe2_report_cpu_memory_usage,

‎caffe2/core/blob.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "caffe2/core/common.h"
1010

1111
#include <ATen/core/blob.h>
12-
#include <ATen/core/typeid.h>
12+
#include <c10/util/typeid.h>
1313
#include "caffe2/core/logging.h"
1414
#include "caffe2/core/tensor.h"
1515

‎caffe2/core/blob_serialization.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "caffe2/core/blob.h"
1010
#include "caffe2/core/blob_serializer_base.h"
1111
#include "caffe2/core/tensor.h"
12-
#include "caffe2/core/typeid.h"
12+
#include <c10/util/typeid.h>
1313
#include "caffe2/core/types.h"
1414
#include "caffe2/utils/simple_queue.h"
1515

‎caffe2/core/blob_stats.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#include "c10/util/Registry.h"
44
#include "caffe2/core/blob.h"
5-
#include "caffe2/core/typeid.h"
5+
#include <c10/util/typeid.h>
66

77
#include <unordered_map>
88

‎caffe2/core/context.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include "caffe2/core/context_base.h"
1111
#include "caffe2/core/event.h"
1212
#include "caffe2/core/logging.h"
13-
#include "caffe2/core/typeid.h"
13+
#include <c10/util/typeid.h>
1414
#include "caffe2/proto/caffe2_pb.h"
1515

1616
#include <ATen/core/ATenCoreTest.h>

‎caffe2/core/dispatch/DispatchKey.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#include "caffe2/core/dispatch/DeviceId.h"
44
#include "caffe2/core/dispatch/LayoutId.h"
5-
#include "caffe2/core/typeid.h"
5+
#include <c10/util/typeid.h>
66

77
#include <vector>
88
#include <functional>

‎caffe2/core/int8_serialization.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include "caffe2/core/common.h"
33
#include "caffe2/core/context.h"
44
#include "caffe2/core/tensor_int8.h"
5-
#include "caffe2/core/typeid.h"
5+
#include <c10/util/typeid.h>
66
#include "caffe2/core/types.h"
77

88
namespace caffe2 {

‎caffe2/core/module.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include <mutex>
1515

1616
#include "caffe2/core/common.h"
17-
#include "caffe2/core/typeid.h"
17+
#include <c10/util/typeid.h>
1818

1919
namespace caffe2 {
2020

‎caffe2/core/qtensor.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include "caffe2/core/common.h"
1010
#include "caffe2/core/context.h"
1111
#include "caffe2/core/tensor.h"
12-
#include "caffe2/core/typeid.h"
12+
#include <c10/util/typeid.h>
1313

1414
namespace caffe2 {
1515

‎caffe2/core/storage.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "caffe2/core/context.h"
1515
#include "caffe2/core/flags.h"
1616
#include "caffe2/core/logging.h"
17-
#include "caffe2/core/typeid.h"
17+
#include <c10/util/typeid.h>
1818

1919
#include <ATen/core/Allocator.h>
2020
#include <c10/Device.h>

‎caffe2/core/tensor_int8.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include "caffe2/core/tensor_int8.h"
2-
#include "caffe2/core/typeid.h"
2+
#include <c10/util/typeid.h>
33

44
namespace caffe2 {
55
CAFFE_KNOWN_TYPE(int8::Int8TensorCPU);

‎caffe2/core/typeid.h

-7
This file was deleted.

‎caffe2/core/types.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include "caffe2/core/types.h"
2-
#include "caffe2/core/typeid.h"
2+
#include <c10/util/typeid.h>
33

44
#include <atomic>
55
#include <memory>

‎caffe2/core/types.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#include "caffe2/core/common.h"
99
#include "caffe2/core/logging.h"
10-
#include "caffe2/core/typeid.h"
10+
#include <c10/util/typeid.h>
1111
#include "caffe2/proto/caffe2_pb.h"
1212
#include <ATen/core/Half.h>
1313

‎caffe2/distributed/store_handler.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#include <memory>
44

5-
#include "caffe2/core/typeid.h"
5+
#include <c10/util/typeid.h>
66

77
namespace caffe2 {
88

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
#include "GLImage.h"
33
#include "arm_neon_support.h"
4-
#include "caffe2/core/typeid.h"
4+
#include <c10/util/typeid.h>
55

66
namespace caffe2 {
77
CAFFE_KNOWN_TYPE(GLImage<float>);

‎caffe2/mpi/mpi_common.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#include <thread>
44

5-
#include "caffe2/core/typeid.h"
5+
#include <c10/util/typeid.h>
66
#include "caffe2/utils/proto_utils.h"
77

88
namespace caffe2 {

‎caffe2/operators/quant_decode_op.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "quant_decode_op.h"
22
#include <stdint.h>
33
#include "caffe2/core/tensor.h"
4-
#include "caffe2/core/typeid.h"
4+
#include <c10/util/typeid.h>
55

66
namespace caffe2 {
77

‎caffe2/operators/quant_decode_op.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include "caffe2/core/context.h"
55
#include "caffe2/core/operator.h"
66
#include "caffe2/core/tensor.h"
7-
#include "caffe2/core/typeid.h"
7+
#include <c10/util/typeid.h>
88

99
namespace caffe2 {
1010

0 commit comments

Comments
 (0)