Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "Update external protobuf codebase version for Windows cmake b… #17543

Merged
merged 2 commits into from
Mar 8, 2018
Merged

Revert "Update external protobuf codebase version for Windows cmake b… #17543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5fa816d
Revert "Update external protobuf codebase version for Windows cmake b…
gunan Mar 8, 2018
b315950
Also reverting ccedcb
yifeif Mar 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion tensorflow/contrib/cmake/external/protobuf.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ include (ExternalProject)

set(PROTOBUF_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/protobuf/src/protobuf/src)
set(PROTOBUF_URL https://github.com/google/protobuf.git)
set(PROTOBUF_TAG 396336eb961b75f03b25824fe86cf6490fb75e3a)
set(PROTOBUF_TAG b04e5cba356212e4e8c66c61bbe0c3a20537c5b9)

if(WIN32)
if(${CMAKE_GENERATOR} MATCHES "Visual Studio.*")
Expand Down
4 changes: 2 additions & 2 deletions tensorflow/core/distributed_runtime/tensor_coding.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ void TensorResponse::InitPartial(const RecvTensorResponse& response) {
Status TensorResponse::ParseFrom(Source* source) {
if (!on_host_) {
protobuf::io::CodedInputStream input(source->contents());
input.SetTotalBytesLimit(INT_MAX); // Unlimited
input.SetTotalBytesLimit(INT_MAX, INT_MAX); // Unlimited

// Pre-parse into local storage, then delegate to device.
if (!meta_.ParseFromCodedStream(&input) || !input.ConsumedEntireMessage()) {
Expand Down Expand Up @@ -217,7 +217,7 @@ bool TensorResponse::ParseTensorSubmessage(

bool TensorResponse::ParseFast(Source* source) {
protobuf::io::CodedInputStream input(source->contents());
input.SetTotalBytesLimit(INT_MAX); // Unlimited
input.SetTotalBytesLimit(INT_MAX, INT_MAX); // Unlimited
while (true) {
auto p = input.ReadTagWithCutoff(127);
int tag = GetTagFieldNumber(p.first);
Expand Down