From d850c33bfe3f1d1f0040738718cacb04ee449bdc Mon Sep 17 00:00:00 2001 From: mikey dagitses Date: Wed, 22 Mar 2023 14:40:31 +0000 Subject: [PATCH] remove dead proto_convert library (#97322) remove dead proto_convert library Summary: This has no code, only a collection of headers. Just make sure the only thing that includes it still builds. Test Plan: Rely on CI. Reviewers: sahanp Subscribers: Tasks: Tags: --- Stack created with [Sapling](https://sapling-scm.com). Best reviewed with [ReviewStack](https://reviewstack.dev/pytorch/pytorch/pull/97322). * #97337 * #97336 * #97335 * #97334 * #97325 * #97324 * #97323 * __->__ #97322 Pull Request resolved: https://github.com/pytorch/pytorch/pull/97322 Approved by: https://github.com/malfet --- BUILD.bazel | 1 - caffe2/python/pybind_state.cc | 3 ++- caffe2/utils/CMakeLists.txt | 1 - caffe2/utils/proto_convert.cc | 5 ----- caffe2/utils/proto_convert.h | 11 ----------- 5 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 caffe2/utils/proto_convert.cc delete mode 100644 caffe2/utils/proto_convert.h diff --git a/BUILD.bazel b/BUILD.bazel index b2d2eeb527fe..e4a7cb42e614 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -1038,7 +1038,6 @@ filegroup( "caffe2/utils/math/utils.cc", "caffe2/utils/math_cpu.cc", "caffe2/utils/murmur_hash3.cc", - "caffe2/utils/proto_convert.cc", "caffe2/utils/proto_utils.cc", "caffe2/utils/proto_wrap.cc", "caffe2/utils/signal_handler.cc", diff --git a/caffe2/python/pybind_state.cc b/caffe2/python/pybind_state.cc index 2f601b605482..760bd50ef3fe 100644 --- a/caffe2/python/pybind_state.cc +++ b/caffe2/python/pybind_state.cc @@ -11,6 +11,7 @@ #include "caffe2/core/blob_serialization.h" #include "caffe2/core/blob_stats.h" +#include "caffe2/core/common.h" #include "caffe2/core/db.h" #include "caffe2/core/numa.h" #include "caffe2/core/operator.h" @@ -31,12 +32,12 @@ #include "caffe2/opt/optimize_ideep.h" #include "caffe2/opt/passes.h" #include "caffe2/opt/shape_info.h" +#include "caffe2/proto/caffe2.pb.h" #include "caffe2/predictor/emulator/data_filler.h" #include "caffe2/predictor/predictor.h" #include "caffe2/python/pybind_state_registry.h" #include "caffe2/python/pybind_workspace.h" #include "caffe2/utils/cpuid.h" -#include "caffe2/utils/proto_convert.h" #include "caffe2/utils/string_utils.h" #include "torch/csrc/autograd/variable.h" #include "torch/csrc/jit/python/module_python.h" diff --git a/caffe2/utils/CMakeLists.txt b/caffe2/utils/CMakeLists.txt index a7dfe1181e31..8d7af1a7a459 100644 --- a/caffe2/utils/CMakeLists.txt +++ b/caffe2/utils/CMakeLists.txt @@ -30,7 +30,6 @@ list(APPEND Caffe2_CPU_SRCS utils/math/utils.cc utils/math_cpu.cc utils/murmur_hash3.cc - utils/proto_convert.cc utils/proto_utils.cc utils/proto_wrap.cc utils/threadpool/ThreadPool.cc diff --git a/caffe2/utils/proto_convert.cc b/caffe2/utils/proto_convert.cc deleted file mode 100644 index 1d69c8c80c15..000000000000 --- a/caffe2/utils/proto_convert.cc +++ /dev/null @@ -1,5 +0,0 @@ -#include "caffe2/utils/proto_convert.h" -#include "caffe2/core/logging.h" - -namespace caffe2 { -} // namespace caffe2 diff --git a/caffe2/utils/proto_convert.h b/caffe2/utils/proto_convert.h deleted file mode 100644 index 91bcf1bafa22..000000000000 --- a/caffe2/utils/proto_convert.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef CAFFE2_UTILS_PROTO_CONVERT_H_ -#define CAFFE2_UTILS_PROTO_CONVERT_H_ - -#include "caffe2/core/common.h" -#include "caffe2/proto/caffe2_pb.h" -#include "caffe2/proto/torch_pb.h" - -namespace caffe2 { -} // namespace caffe2 - -#endif // CAFFE2_UTILS_PROTO_CONVERT_H_