From cc9a8f789a4d224a3e73737fa6c921676441a6c8 Mon Sep 17 00:00:00 2001 From: "A. Unique TensorFlower" Date: Fri, 13 Apr 2018 21:09:37 -0700 Subject: [PATCH] Upgrade gRPC version used in OSS Tensorflow PiperOrigin-RevId: 192862541 --- tensorflow/contrib/cmake/external/grpc.cmake | 2 +- .../core/distributed_runtime/rpc/grpc_worker_service_impl.h | 2 +- tensorflow/workspace.bzl | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tensorflow/contrib/cmake/external/grpc.cmake b/tensorflow/contrib/cmake/external/grpc.cmake index 35c2a29..693dc7c 100644 --- a/tensorflow/contrib/cmake/external/grpc.cmake +++ b/tensorflow/contrib/cmake/external/grpc.cmake @@ -17,7 +17,7 @@ include (ExternalProject) set(GRPC_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/grpc/src/grpc/include) set(GRPC_URL https://github.com/grpc/grpc.git) set(GRPC_BUILD ${CMAKE_CURRENT_BINARY_DIR}/grpc/src/grpc) -set(GRPC_TAG 09386db3939cae1ac12e5f09b735adfa8958c68e) +set(GRPC_TAG d184fa229d75d336aedea0041bd59cb93e7e267f) if(WIN32) if(${CMAKE_GENERATOR} MATCHES "Visual Studio.*") diff --git a/tensorflow/core/distributed_runtime/rpc/grpc_worker_service_impl.h b/tensorflow/core/distributed_runtime/rpc/grpc_worker_service_impl.h index 62b299d..0abac4f 100644 --- a/tensorflow/core/distributed_runtime/rpc/grpc_worker_service_impl.h +++ b/tensorflow/core/distributed_runtime/rpc/grpc_worker_service_impl.h @@ -35,7 +35,7 @@ class GrpcByteSource : public TensorResponse::Source { explicit GrpcByteSource(::grpc::ByteBuffer* buffer) : buffer_(buffer) {} ~GrpcByteSource() override { DeleteStream(); } - typedef ::grpc::GrpcProtoBufferReader Reader; + typedef ::grpc::ProtoBufferReader Reader; protobuf::io::ZeroCopyInputStream* contents() override { DeleteStream(); diff --git a/tensorflow/workspace.bzl b/tensorflow/workspace.bzl index f775491..79730f5 100644 --- a/tensorflow/workspace.bzl +++ b/tensorflow/workspace.bzl @@ -427,11 +427,11 @@ def tf_workspace(path_prefix="", tf_repo_name=""): tf_http_archive( name = "grpc", urls = [ - "https://mirror.bazel.build/github.com/grpc/grpc/archive/09386db3939cae1ac12e5f09b735adfa8958c68e.tar.gz", - "https://github.com/grpc/grpc/archive/09386db3939cae1ac12e5f09b735adfa8958c68e.tar.gz", + "https://mirror.bazel.build/github.com/grpc/grpc/archive/d184fa229d75d336aedea0041bd59cb93e7e267f.tar.gz", + "https://github.com/grpc/grpc/archive/d184fa229d75d336aedea0041bd59cb93e7e267f.tar.gz", ], - sha256 = "b857969c667c14f37faa507afc07a3f39a47fbf73203be889d55925622e7b317", - strip_prefix = "grpc-09386db3939cae1ac12e5f09b735adfa8958c68e", + sha256 = "895b31310e718a61f7335759a778c068a6edde1c089883598a0830cbb7075673", + strip_prefix = "grpc-d184fa229d75d336aedea0041bd59cb93e7e267f", ) -- 2.7.4