frozenleaves/pytorch
1
0
Fork 0
mirror of https://github.com/pytorch/pytorch.git synced 2025-10-21 05:34:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "remove dead proto_convert library (#97322)"

Browse Source 
This reverts commit d850c33bfe3f1d1f0040738718cacb04ee449bdc.

Reverted https://github.com/pytorch/pytorch/pull/97322 on behalf of https://github.com/osalpekar due to This broke a large number of internal builds due to not being able to find proto_convert.h. See here: [D44319486](https://www.internalfb.com/diff/D44319486)
This commit is contained in:
PyTorch MergeBot
2023-03-23 21:38:01 +00:00
parent 95e8d0c39e
commit 13fbf93238
5 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
BUILD.bazel
View File

@ -1024,6 +1024,7 @@ 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",

3
caffe2/python/pybind_state.cc
View File

@ -11,7 +11,6 @@
#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"
@ -32,12 +31,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"

1
caffe2/utils/CMakeLists.txt
View File

@ -30,6 +30,7 @@ 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

5
caffe2/utils/proto_convert.cc Normal file
View File

@ -0,0 +1,5 @@
#include "caffe2/utils/proto_convert.h"
#include "caffe2/core/logging.h"
namespace caffe2 {
} // namespace caffe2

11
caffe2/utils/proto_convert.h Normal file
View File

@ -0,0 +1,11 @@
#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_