Replace direct include of caffe2.pb.h with an intermediary header caf…

…fe2_pb.h (pytorch#10946) Summary: Pull Request resolved: pytorch#10946 ``` codemod -d . --extensions cc,cpp,cu,cuh,h caffe2/proto/caffe2.pb.h caffe2/proto/caffe2_pb.h ``` Reviewed By: houseroad Differential Revision: D9539945 fbshipit-source-id: 497d04720e8e7e61c05ffe1b23733d0cb774de7e
PenghuiCheng · Sep 11, 2018 · b9dbe1c · b9dbe1c
1 parent 405c462
commit b9dbe1c
Show file tree

Hide file tree

Showing 98 changed files with 99 additions and 97 deletions.
diff --git a/binaries/convert_caffe_image_db.cc b/binaries/convert_caffe_image_db.cc
@@ -16,7 +16,7 @@
 
 #include "caffe2/core/db.h"
 #include "caffe2/core/init.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/proto/caffe2_legacy.pb.h"
 #include "caffe2/core/logging.h"
 

diff --git a/binaries/convert_db.cc b/binaries/convert_db.cc
@@ -16,7 +16,7 @@
 
 #include "caffe2/core/db.h"
 #include "caffe2/core/init.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/core/logging.h"
 
 CAFFE2_DEFINE_string(input_db, "", "The input db.");

diff --git a/binaries/convert_encoded_to_raw_leveldb.cc b/binaries/convert_encoded_to_raw_leveldb.cc
@@ -30,7 +30,7 @@
 #include <string>
 
 #include "caffe2/core/init.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/core/logging.h"
 #include "leveldb/db.h"
 #include "leveldb/write_batch.h"

diff --git a/binaries/make_cifar_db.cc b/binaries/make_cifar_db.cc
@@ -30,7 +30,7 @@
 #include "caffe2/core/common.h"
 #include "caffe2/core/db.h"
 #include "caffe2/core/init.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/core/logging.h"
 
 CAFFE2_DEFINE_string(input_folder, "", "The input folder name.");

diff --git a/binaries/make_image_db.cc b/binaries/make_image_db.cc
@@ -39,7 +39,7 @@
 #include "caffe2/core/common.h"
 #include "caffe2/core/db.h"
 #include "caffe2/core/init.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/core/logging.h"
 
 CAFFE2_DEFINE_bool(shuffle, false,

diff --git a/binaries/make_mnist_db.cc b/binaries/make_mnist_db.cc
@@ -24,7 +24,7 @@
 #include "caffe2/core/common.h"
 #include "caffe2/core/db.h"
 #include "caffe2/core/init.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/core/logging.h"
 
 CAFFE2_DEFINE_string(image_file, "", "The input image file name.");

diff --git a/binaries/print_core_object_sizes_gpu.cc b/binaries/print_core_object_sizes_gpu.cc
@@ -20,7 +20,7 @@
 #include "caffe2/core/operator.h"
 #include "caffe2/core/context.h"
 #include "caffe2/core/context_gpu.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 #define PRINT_SIZE(cls) \
   std::cout << "Size of " #cls ": " << sizeof(cls) << " bytes." \

diff --git a/binaries/run_plan.cc b/binaries/run_plan.cc
@@ -16,7 +16,7 @@
 
 #include "caffe2/core/init.h"
 #include "caffe2/core/operator.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/utils/proto_utils.h"
 #include "caffe2/core/logging.h"
 

diff --git a/binaries/run_plan_mpi.cc b/binaries/run_plan_mpi.cc
@@ -18,7 +18,7 @@
 
 #include "caffe2/core/init.h"
 #include "caffe2/core/operator.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/utils/proto_utils.h"
 #include "caffe2/core/logging.h"
 

diff --git a/binaries/speed_benchmark.cc b/binaries/speed_benchmark.cc
@@ -22,7 +22,7 @@
 #ifdef CAFFE2_OPTIMIZER
 #include "caffe2/opt/optimizer.h"
 #endif
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/utils/proto_utils.h"
 #include "caffe2/utils/string_utils.h"
 

diff --git a/binaries/split_db.cc b/binaries/split_db.cc
@@ -19,7 +19,7 @@
 
 #include "caffe2/core/db.h"
 #include "caffe2/core/init.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/core/logging.h"
 
 CAFFE2_DEFINE_string(input_db, "", "The input db.");

diff --git a/binaries/tsv_2_proto.cc b/binaries/tsv_2_proto.cc
@@ -21,7 +21,7 @@
 #include "caffe2/core/db.h"
 #include "caffe2/core/init.h"
 #include "caffe2/core/logging.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/utils/proto_utils.h"
 
 CAFFE2_DEFINE_string(f_in, "", "The input data file name.");

diff --git a/caffe2/contrib/tensorrt/tensorrt_tranformer.h b/caffe2/contrib/tensorrt/tensorrt_tranformer.h
@@ -9,7 +9,7 @@
 #include "caffe2/core/operator.h"
 #include "caffe2/core/workspace.h"
 #include "caffe2/onnx/onnx_exporter.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "onnx/onnx_pb.h"
 
 namespace caffe2 {

diff --git a/caffe2/core/blob.h b/caffe2/core/blob.h
@@ -12,7 +12,7 @@
 #include "caffe2/core/logging.h"
 #include "caffe2/core/tensor.h"
 #include "caffe2/core/typeid.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 namespace caffe2 {
 

diff --git a/caffe2/core/blob_gpu_test.cc b/caffe2/core/blob_gpu_test.cc
@@ -3,7 +3,7 @@
 #include "caffe2/core/blob.h"
 #include "caffe2/core/common_gpu.h"
 #include "caffe2/core/context_gpu.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include <gtest/gtest.h>
 
 namespace caffe2 {

diff --git a/caffe2/core/blob_serializer_base.h b/caffe2/core/blob_serializer_base.h
@@ -5,7 +5,7 @@
 
 #include "caffe2/core/common.h"
 #include "caffe2/core/registry.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 namespace caffe2 {
 

diff --git a/caffe2/core/blob_test.cc b/caffe2/core/blob_test.cc
@@ -15,7 +15,7 @@
 #include "caffe2/core/tensor.h"
 #include "caffe2/core/types.h"
 #include "caffe2/core/workspace.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/utils/proto_utils.h"
 
 CAFFE2_DEFINE_int64(caffe2_test_big_tensor_size, 100000000, "");

diff --git a/caffe2/core/common_cudnn.h b/caffe2/core/common_cudnn.h
@@ -10,7 +10,7 @@
 #include "caffe2/core/context.h"
 #include "caffe2/core/logging.h"
 #include "caffe2/core/types.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 #ifndef CAFFE2_USE_CUDNN
 #error("This Caffe2 install is not built with cudnn, so you should not include this file.");

diff --git a/caffe2/core/context.h b/caffe2/core/context.h
@@ -11,7 +11,7 @@
 #include "caffe2/core/event.h"
 #include "caffe2/core/logging.h"
 #include "caffe2/core/typeid.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 #include "ATen/core/ATenCoreTest.h"
 #include "ATen/core/ArrayRef.h"

diff --git a/caffe2/core/context_base.h b/caffe2/core/context_base.h
@@ -9,7 +9,7 @@
 #include "caffe2/core/event.h"
 #include "caffe2/core/logging.h"
 #include "caffe2/core/typeid.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 namespace caffe2 {
 

diff --git a/caffe2/core/context_gpu.h b/caffe2/core/context_gpu.h
@@ -12,7 +12,7 @@
 #include "caffe2/core/numa.h"
 #include "caffe2/core/tensor.h"
 #include "caffe2/core/types.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 // Since we are using the macro CAFFE2_USE_CUDNN, we will need to include this
 // file after common.h is included.

diff --git a/caffe2/core/context_test.cc b/caffe2/core/context_test.cc
@@ -2,7 +2,7 @@
 
 #include <gtest/gtest.h>
 #include "caffe2/core/context.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 namespace caffe2 {
 

diff --git a/caffe2/core/db.h b/caffe2/core/db.h
@@ -5,7 +5,7 @@
 
 #include "caffe2/core/blob_serialization.h"
 #include "caffe2/core/registry.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 namespace caffe2 {
 namespace db {

diff --git a/caffe2/core/dispatch/OpSchema.h b/caffe2/core/dispatch/OpSchema.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "caffe2/core/dispatch/DispatchKey.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/utils/Array.h"
 #include "caffe2/utils/Metaprogramming.h"
 

diff --git a/caffe2/core/event.h b/caffe2/core/event.h
@@ -3,7 +3,7 @@
 
 #include "caffe2/core/common.h"
 #include "caffe2/core/logging.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 namespace caffe2 {
 

diff --git a/caffe2/core/graph.cc b/caffe2/core/graph.cc
@@ -3,7 +3,7 @@
 #include "caffe2/core/common.h"
 #include "caffe2/core/logging.h"
 #include "caffe2/core/net.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 namespace caffe2 {
 

diff --git a/caffe2/core/graph.h b/caffe2/core/graph.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "caffe2/core/common.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/utils/proto_utils.h"
 #include "caffe2/utils/string_utils.h"
 

diff --git a/caffe2/core/hip/common_miopen.h b/caffe2/core/hip/common_miopen.h
@@ -23,7 +23,7 @@
 #include "caffe2/core/context.h"
 #include "caffe2/core/logging.h"
 #include "caffe2/core/types.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 #define MIOPEN_VERSION 1399
 

diff --git a/caffe2/core/hip/context_hip.h b/caffe2/core/hip/context_hip.h
@@ -12,7 +12,7 @@
 #include "caffe2/core/numa.h"
 #include "caffe2/core/tensor.h"
 #include "caffe2/core/types.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 namespace caffe2 {
 

diff --git a/caffe2/core/hip/net_async_dag_hip.cc b/caffe2/core/hip/net_async_dag_hip.cc
@@ -24,7 +24,7 @@
 #include "caffe2/core/operator.h"
 #include "caffe2/core/static_tracepoint.h"
 #include "caffe2/core/timer.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/utils/proto_utils.h"
 
 #include "caffe2/core/hip/context_hip.h"

diff --git a/caffe2/core/logging.h b/caffe2/core/logging.h
@@ -9,7 +9,7 @@
 
 #include <ATen/core/Error.h>
 #include "caffe2/core/flags.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 // CAFFE2_LOG_THRESHOLD is a compile time flag that would allow us to turn off
 // logging at compile time so no logging message below that level is produced

diff --git a/caffe2/core/memonger.h b/caffe2/core/memonger.h
@@ -5,7 +5,7 @@
 
 #include "caffe2/core/common.h"
 #include "caffe2/core/workspace.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 namespace caffe2 {
 namespace memonger {

diff --git a/caffe2/core/net.cc b/caffe2/core/net.cc
@@ -8,7 +8,7 @@
 #include "caffe2/core/init.h"
 #include "caffe2/core/operator.h"
 #include "caffe2/core/timer.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/utils/proto_utils.h"
 #include "caffe2/utils/string_utils.h"
 

diff --git a/caffe2/core/net.h b/caffe2/core/net.h
@@ -17,7 +17,7 @@
 #include "caffe2/core/registry.h"
 #include "caffe2/core/tensor.h"
 #include "caffe2/core/workspace.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/utils/simple_queue.h"
 #include "caffe2/utils/thread_pool.h"
 

diff --git a/caffe2/core/net_async_base.h b/caffe2/core/net_async_base.h
@@ -9,7 +9,7 @@
 #include "caffe2/core/stats.h"
 #include "caffe2/core/timer.h"
 #include "caffe2/core/workspace.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/utils/proto_utils.h"
 #include "caffe2/utils/thread_pool.h"
 

diff --git a/caffe2/core/net_async_dag_gpu.cc b/caffe2/core/net_async_dag_gpu.cc
@@ -8,7 +8,7 @@
 #include "caffe2/core/operator.h"
 #include "caffe2/core/static_tracepoint.h"
 #include "caffe2/core/timer.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/utils/proto_utils.h"
 
 #include "caffe2/core/context_gpu.h"

diff --git a/caffe2/core/net_async_dag_gpu.h b/caffe2/core/net_async_dag_gpu.h
@@ -4,7 +4,7 @@
 #include "caffe2/core/common.h"
 #include "caffe2/core/net_dag.h"
 #include "caffe2/core/workspace.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 namespace caffe2 {
 

diff --git a/caffe2/core/net_dag.cc b/caffe2/core/net_dag.cc
@@ -9,7 +9,7 @@
 #include "caffe2/core/operator.h"
 #include "caffe2/core/static_tracepoint.h"
 #include "caffe2/core/timer.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/utils/proto_utils.h"
 #include "caffe2/utils/thread_name.h"
 

diff --git a/caffe2/core/net_dag.h b/caffe2/core/net_dag.h
@@ -21,7 +21,7 @@
 #include "caffe2/core/tensor.h"
 #include "caffe2/core/timer.h"
 #include "caffe2/core/workspace.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/utils/simple_queue.h"
 
 namespace caffe2 {

diff --git a/caffe2/core/net_dag_utils.cc b/caffe2/core/net_dag_utils.cc
@@ -8,7 +8,7 @@
 #include "caffe2/core/operator.h"
 #include "caffe2/core/static_tracepoint.h"
 #include "caffe2/core/timer.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/utils/proto_utils.h"
 
 namespace caffe2 {

diff --git a/caffe2/core/net_dag_utils.h b/caffe2/core/net_dag_utils.h
@@ -19,7 +19,7 @@
 #include "caffe2/core/registry.h"
 #include "caffe2/core/tensor.h"
 #include "caffe2/core/workspace.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/utils/simple_queue.h"
 
 namespace caffe2 {

diff --git a/caffe2/core/net_simple.cc b/caffe2/core/net_simple.cc
@@ -9,7 +9,7 @@
 #include "caffe2/core/operator.h"
 #include "caffe2/core/static_tracepoint.h"
 #include "caffe2/core/timer.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/utils/proto_utils.h"
 
 CAFFE2_DEFINE_bool(

diff --git a/caffe2/core/net_simple.h b/caffe2/core/net_simple.h
@@ -9,7 +9,7 @@
 #include "caffe2/core/registry.h"
 #include "caffe2/core/tensor.h"
 #include "caffe2/core/workspace.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 
 namespace caffe2 {
 

diff --git a/caffe2/core/net_simple_async.cc b/caffe2/core/net_simple_async.cc
@@ -9,7 +9,7 @@
 #include "caffe2/core/operator.h"
 #include "caffe2/core/static_tracepoint.h"
 #include "caffe2/core/timer.h"
-#include "caffe2/proto/caffe2.pb.h"
+#include "caffe2/proto/caffe2_pb.h"
 #include "caffe2/utils/proto_utils.h"
 
 namespace caffe2 {