mirror of
https://github.com/pytorch/pytorch.git
synced 2025-10-20 12:54:11 +08:00
62e566b345
This should prevent regressions like the ones fixed by https://github.com/pytorch/pytorch/pull/131204 - Remove global `-Wno-error=inconsistent-missing-override` - Wrap offending includes (protobuf and asmjit) with `C10_DIAGNOSTIC_PUSH_AND_IGNORE` and `C10_DIAGNOSTIC_POP_AND_IGNORED` - Add `override` keyword to `at::namespace::tunable::StreamTimer` and `LLVMCodeGenImpl` Pull Request resolved: https://github.com/pytorch/pytorch/pull/131524 Approved by: https://github.com/atalman
54 lines
1.8 KiB
C++
54 lines
1.8 KiB
C++
#include "caffe2/utils/proto_wrap.h"
|
|
|
|
C10_DIAGNOSTIC_PUSH_AND_IGNORED_IF_DEFINED("-Winconsistent-missing-override")
|
|
C10_DIAGNOSTIC_PUSH_AND_IGNORED_IF_DEFINED("-Winconsistent-missing-destructor-override")
|
|
C10_DIAGNOSTIC_PUSH_AND_IGNORED_IF_DEFINED("-Wsuggest-override")
|
|
C10_DIAGNOSTIC_PUSH_AND_IGNORED_IF_DEFINED("-Wdeprecated-dynamic-exception-spec")
|
|
#include <google/protobuf/stubs/common.h>
|
|
#include <google/protobuf/generated_message_util.h>
|
|
C10_DIAGNOSTIC_POP()
|
|
C10_DIAGNOSTIC_POP()
|
|
C10_DIAGNOSTIC_POP()
|
|
C10_DIAGNOSTIC_POP()
|
|
|
|
namespace ONNX_NAMESPACE {
|
|
|
|
// ONNX wrapper functions for protobuf's GetEmptyStringAlreadyInited() function
|
|
// used to avoid duplicated global variable in the case when protobuf
|
|
// is built with hidden visibility.
|
|
TORCH_API const ::std::string& GetEmptyStringAlreadyInited() {
|
|
return ::google::protobuf::internal::GetEmptyStringAlreadyInited();
|
|
}
|
|
|
|
} // namespace ONNX_NAMESPACE
|
|
|
|
namespace caffe2 {
|
|
|
|
// Caffe2 wrapper functions for protobuf's GetEmptyStringAlreadyInited() function
|
|
// used to avoid duplicated global variable in the case when protobuf
|
|
// is built with hidden visibility.
|
|
TORCH_API const ::std::string& GetEmptyStringAlreadyInited() {
|
|
return ::google::protobuf::internal::GetEmptyStringAlreadyInited();
|
|
}
|
|
|
|
void ShutdownProtobufLibrary() {
|
|
::google::protobuf::ShutdownProtobufLibrary();
|
|
}
|
|
|
|
} // namespace caffe2
|
|
|
|
namespace torch {
|
|
|
|
// Caffe2 wrapper functions for protobuf's GetEmptyStringAlreadyInited() function
|
|
// used to avoid duplicated global variable in the case when protobuf
|
|
// is built with hidden visibility.
|
|
TORCH_API const ::std::string& GetEmptyStringAlreadyInited() {
|
|
return ::google::protobuf::internal::GetEmptyStringAlreadyInited();
|
|
}
|
|
|
|
void ShutdownProtobufLibrary() {
|
|
::google::protobuf::ShutdownProtobufLibrary();
|
|
}
|
|
|
|
} // namespace torch
|