Skip to content

Allow users passing master argument to avoid instantiating a TPUClusterResolver #3845

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

Merged
merged 2 commits into from
Apr 3, 2018
Merged

Allow users passing master argument to avoid instantiating a TPUClusterResolver #3845

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77868cb
Fix MNIST to allow master=local to work again.
dlibenzi Apr 3, 2018
127eebb
Update mnist_tpu.py
dlibenzi Apr 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 20 additions & 3 deletions official/mnist/mnist_tpu.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@
"metadata.")

# Model specific parameters
tf.flags.DEFINE_string(
"master", default=None,
help="GRPC URL of the master (e.g. grpc://ip.address.of.tpu:8470). You "
"must specify either this flag or --tpu.")
tf.flags.DEFINE_string("data_dir", "",
"Path to directory containing the MNIST dataset")
tf.flags.DEFINE_string("model_dir", None, "Estimator model_dir")
Expand Down Expand Up @@ -132,11 +136,24 @@ def main(argv):
del argv # Unused.
tf.logging.set_verbosity(tf.logging.INFO)

tpu_cluster_resolver = tf.contrib.cluster_resolver.TPUClusterResolver(
FLAGS.tpu, zone=FLAGS.tpu_zone, project=FLAGS.gcp_project)
if FLAGS.master is None and FLAGS.tpu is None:
raise RuntimeError('You must specify either --master or --tpu.')
if FLAGS.master is not None:
if FLAGS.tpu is not None:
tf.logging.warn('Both --master and --tpu are set. Ignoring '
'--tpu and using --master.')
tpu_grpc_url = FLAGS.master
else:
tpu_cluster_resolver = (
tf.contrib.cluster_resolver.TPUClusterResolver(
FLAGS.tpu,
zone=FLAGS.tpu_zone,
project=FLAGS.gcp_project))
tpu_grpc_url = tpu_cluster_resolver.get_master()

run_config = tf.contrib.tpu.RunConfig(
cluster=tpu_cluster_resolver,
master=tpu_grpc_url,
evaluation_master=tpu_grpc_url,
model_dir=FLAGS.model_dir,
session_config=tf.ConfigProto(
allow_soft_placement=True, log_device_placement=True),
Expand Down