aboutsummaryrefslogtreecommitdiffhomepage
path: root/tensorflow/core/distributed_runtime
diff options
context:
space:
mode:
authorGravatar Emanuele Ballarin <emanuele@ballarin.cc>2018-06-13 17:07:13 +0200
committerGravatar Shanqing Cai <cais@google.com>2018-06-13 11:07:13 -0400
commit4b5f4a540fad9142288012591799c39fd590242b (patch)
tree2d9f1cc5efcd82f8a2c24794bf5c50affbf9653b /tensorflow/core/distributed_runtime
parent0420d94c4a3fadba3929ba43ed4a4d67c954f210 (diff)
Make implementation of GrpcServer::Init with Collective Ops compatible with calls in contrib/mpi (#19942)
* Allow calling Grpc::Init with 2 arguments Should fix #19924
Diffstat (limited to 'tensorflow/core/distributed_runtime')
-rw-r--r--tensorflow/core/distributed_runtime/rpc/grpc_server_lib.cc8
-rw-r--r--tensorflow/core/distributed_runtime/rpc/grpc_server_lib.h3
2 files changed, 11 insertions, 0 deletions
diff --git a/tensorflow/core/distributed_runtime/rpc/grpc_server_lib.cc b/tensorflow/core/distributed_runtime/rpc/grpc_server_lib.cc
index 43dbe20836..e7914740ae 100644
--- a/tensorflow/core/distributed_runtime/rpc/grpc_server_lib.cc
+++ b/tensorflow/core/distributed_runtime/rpc/grpc_server_lib.cc
@@ -284,6 +284,14 @@ Status GrpcServer::Init(
nullptr);
}
+
+Status GrpcServer::Init(
+ ServiceInitFunction service_func,
+ const RendezvousMgrCreationFunction& rendezvous_mgr_func) {
+ return Init(std::move(service_func), rendezvous_mgr_func, nullptr,
+ nullptr);
+}
+
Status GrpcServer::Init() { return Init(nullptr, nullptr, nullptr, nullptr); }
Status GrpcServer::ParseChannelSpec(const WorkerCacheFactoryOptions& options,
diff --git a/tensorflow/core/distributed_runtime/rpc/grpc_server_lib.h b/tensorflow/core/distributed_runtime/rpc/grpc_server_lib.h
index ca9946cafc..9e53330f85 100644
--- a/tensorflow/core/distributed_runtime/rpc/grpc_server_lib.h
+++ b/tensorflow/core/distributed_runtime/rpc/grpc_server_lib.h
@@ -89,6 +89,9 @@ class GrpcServer : public ServerInterface {
Status Init(ServiceInitFunction service_func,
const RendezvousMgrCreationFunction& rendezvous_mgr_func,
const CollectiveMgrCreationFunction& collective_mgr_func);
+
+ Status Init(ServiceInitFunction service_func,
+ const RendezvousMgrCreationFunction& rendezvous_mgr_func);
Status Init();