Attachment 232155 Details for Bug 259620 – patch for protobuf 3.19.4

[patch] patch for protobuf 3.19.4

patch-protobuf (text/plain), 3.83 KB, created by Po-Chuan Hsieh on 2022-02-28 09:38:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Po-Chuan Hsieh

Created: 2022-02-28 09:38:20 UTC

Size: 3.83 KB

patch

obsolete

>Deprecated 2-parameter SetTotalBytesLimit() has be removed since protobuf 3.18.0.
>
>Reference:	https://github.com/protocolbuffers/protobuf/commit/cda795437d00a15f375d3d5e2659adac715459c6
>
>--- tensorflow/core/distributed_runtime/tensor_coding.cc.orig	2020-01-07 16:57:39 UTC
>+++ tensorflow/core/distributed_runtime/tensor_coding.cc
>@@ -82,7 +82,7 @@ void TensorResponse::InitPartial(const RecvTensorRespo
> Status TensorResponse::ParseFrom(Source* source) {
>   if (!on_host_) {
>     protobuf::io::CodedInputStream input(source->contents());
>-    input.SetTotalBytesLimit(INT_MAX, INT_MAX);  // Unlimited
>+    input.SetTotalBytesLimit(INT_MAX);  // Unlimited
> 
>     // Pre-parse into local storage, then delegate to device.
>     if (!meta_.ParseFromCodedStream(&input) || !input.ConsumedEntireMessage()) {
>@@ -218,7 +218,7 @@ bool TensorResponse::ParseTensorSubmessage(
> 
> bool TensorResponse::ParseFast(Source* source) {
>   protobuf::io::CodedInputStream input(source->contents());
>-  input.SetTotalBytesLimit(INT_MAX, INT_MAX);  // Unlimited
>+  input.SetTotalBytesLimit(INT_MAX);  // Unlimited
>   while (true) {
>     auto p = input.ReadTagWithCutoff(127);
>     int tag = GetTagFieldNumber(p.first);
>--- tensorflow/core/platform/env.cc.orig	2020-01-07 16:57:39 UTC
>+++ tensorflow/core/platform/env.cc
>@@ -538,7 +538,7 @@ Status ReadBinaryProto(Env* env, const string& fname,
>   ::tensorflow::protobuf::io::CodedInputStream coded_stream(stream.get());
>   // Total bytes hard limit / warning limit are set to 1GB and 512MB
>   // respectively.
>-  coded_stream.SetTotalBytesLimit(1024LL << 20, 512LL << 20);
>+  coded_stream.SetTotalBytesLimit(1024LL << 20);
> 
>   if (!proto->ParseFromCodedStream(&coded_stream) ||
>       !coded_stream.ConsumedEntireMessage()) {
>--- tensorflow/core/profiler/rpc/client/dump_tpu_profile.cc.orig	2020-01-07 16:57:39 UTC
>+++ tensorflow/core/profiler/rpc/client/dump_tpu_profile.cc
>@@ -102,7 +102,7 @@ Status DumpOpProfileToLogDirectory(StringPiece run_dir
>   if (!status.ok()) {
>     return errors::Internal(
>         "Failed to convert op profile to json. Skipping... ",
>-        string(status.error_message()));
>+        string(status.message()));
>   }
>   TF_RETURN_IF_ERROR(WriteStringToFile(Env::Default(), path, json));
>   if (os) {
>--- tensorflow/examples/ios/benchmark/BenchmarkViewController.mm.orig	2020-01-07 16:57:39 UTC
>+++ tensorflow/examples/ios/benchmark/BenchmarkViewController.mm
>@@ -113,7 +113,7 @@ bool PortableReadFileToProto(const std::string& file_n
>   ::google::protobuf::io::CodedInputStream coded_stream(&stream);
>   // Total bytes hard limit / warning limit are set to 1GB and 512MB
>   // respectively.
>-  coded_stream.SetTotalBytesLimit(1024LL << 20, 512LL << 20);
>+  coded_stream.SetTotalBytesLimit(1024LL << 20);
>   return proto->ParseFromCodedStream(&coded_stream);
> }
> 
>--- tensorflow/examples/ios/camera/tensorflow_utils.mm.orig	2020-01-07 16:57:39 UTC
>+++ tensorflow/examples/ios/camera/tensorflow_utils.mm
>@@ -91,7 +91,7 @@ bool PortableReadFileToProto(const std::string& file_n
>   ::google::protobuf::io::CodedInputStream coded_stream(&stream);
>   // Total bytes hard limit / warning limit are set to 1GB and 512MB
>   // respectively.
>-  coded_stream.SetTotalBytesLimit(1024LL << 20, 512LL << 20);
>+  coded_stream.SetTotalBytesLimit(1024LL << 20);
>   return proto->ParseFromCodedStream(&coded_stream);
> }
> 
>--- tensorflow/examples/ios/simple/RunModelViewController.mm.orig	2020-01-07 16:57:39 UTC
>+++ tensorflow/examples/ios/simple/RunModelViewController.mm
>@@ -112,7 +112,7 @@ bool PortableReadFileToProto(const std::string& file_n
>   ::google::protobuf::io::CodedInputStream coded_stream(&stream);
>   // Total bytes hard limit / warning limit are set to 1GB and 512MB
>   // respectively.
>-  coded_stream.SetTotalBytesLimit(1024LL << 20, 512LL << 20);
>+  coded_stream.SetTotalBytesLimit(1024LL << 20);
>   return proto->ParseFromCodedStream(&coded_stream);
> }
>

Actions: View | Diff

Attachments on bug 259620: 229235 | 232155 | 234250