aboutsummaryrefslogtreecommitdiffhomepage
path: root/tensorflow/contrib/cluster_resolver
diff options
context:
space:
mode:
authorGravatar Michael Case <mikecase@google.com>2018-04-10 18:44:13 -0700
committerGravatar TensorFlower Gardener <gardener@tensorflow.org>2018-04-10 18:46:38 -0700
commit5ad9e4588874f30d0d079acc60e07f2eddc0480f (patch)
treeab800846cc505d867b2961578869aec97eeb81a3 /tensorflow/contrib/cluster_resolver
parentfad74785d12ea7463e5d0474522cd7d754699656 (diff)
Merge changes from github.
PiperOrigin-RevId: 192388250
Diffstat (limited to 'tensorflow/contrib/cluster_resolver')
-rw-r--r--tensorflow/contrib/cluster_resolver/python/training/tpu_cluster_resolver.py2
-rw-r--r--tensorflow/contrib/cluster_resolver/python/training/tpu_cluster_resolver_test.py8
2 files changed, 7 insertions, 3 deletions
diff --git a/tensorflow/contrib/cluster_resolver/python/training/tpu_cluster_resolver.py b/tensorflow/contrib/cluster_resolver/python/training/tpu_cluster_resolver.py
index a520a06bd7..5a2771229d 100644
--- a/tensorflow/contrib/cluster_resolver/python/training/tpu_cluster_resolver.py
+++ b/tensorflow/contrib/cluster_resolver/python/training/tpu_cluster_resolver.py
@@ -75,7 +75,7 @@ class TPUClusterResolver(ClusterResolver):
zone=None,
project=None,
job_name='worker',
- coordinator_name='coordinator',
+ coordinator_name=None,
coordinator_address=None,
credentials='default',
service=None):
diff --git a/tensorflow/contrib/cluster_resolver/python/training/tpu_cluster_resolver_test.py b/tensorflow/contrib/cluster_resolver/python/training/tpu_cluster_resolver_test.py
index cfddca1063..dff7a03b68 100644
--- a/tensorflow/contrib/cluster_resolver/python/training/tpu_cluster_resolver_test.py
+++ b/tensorflow/contrib/cluster_resolver/python/training/tpu_cluster_resolver_test.py
@@ -117,7 +117,8 @@ class TPUClusterResolverTest(test.TestCase):
zone=None,
tpu=['test-tpu-1'],
credentials=None,
- service=self.mock_service_client(tpu_map=tpu_map))
+ service=self.mock_service_client(tpu_map=tpu_map),
+ coordinator_name='coordinator')
actual_cluster_spec = tpu_cluster_resolver.cluster_spec()
expected_proto = """
@@ -170,6 +171,7 @@ class TPUClusterResolverTest(test.TestCase):
project='test-project',
zone='us-central1-c',
tpu=['test-tpu-1'],
+ coordinator_name='coordinator',
coordinator_address='10.128.1.5:10203',
credentials=None,
service=self.mock_service_client(tpu_map=tpu_map))
@@ -196,6 +198,7 @@ class TPUClusterResolverTest(test.TestCase):
project='test-project',
zone='us-central1-c',
tpu='test-tpu-1',
+ coordinator_name='coordinator',
coordinator_address='10.128.1.5:10203',
credentials=None,
service=self.mock_service_client(tpu_map=tpu_map))
@@ -239,7 +242,8 @@ class TPUClusterResolverTest(test.TestCase):
tpu_cluster_resolver = TPUClusterResolver(
tpu='test-tpu-1',
credentials=None,
- service=self.mock_service_client(tpu_map=tpu_map))
+ service=self.mock_service_client(tpu_map=tpu_map),
+ coordinator_name='coordinator')
actual_cluster_spec = tpu_cluster_resolver.cluster_spec()
expected_proto = """