aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar A. Unique TensorFlower <nobody@tensorflow.org>2016-04-05 18:40:07 -0800
committerGravatar TensorFlower Gardener <gardener@tensorflow.org>2016-04-05 19:41:35 -0700
commit8c44d4d7258b35da0275852a6a0c8afa28d16ea7 (patch)
tree30813c76aedbdec18ce0146cfcc574c7c9adc4be
parent519303409ce0b98a4490e1157ea80d56f02bf3cd (diff)
Fixing bug in wait_for_session in which we were waiting for N ms instead of N secs.
Change: 119119175
-rw-r--r--tensorflow/python/training/session_manager.py2
-rw-r--r--tensorflow/python/training/session_manager_test.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/tensorflow/python/training/session_manager.py b/tensorflow/python/training/session_manager.py
index 720f5ba357..4283159d78 100644
--- a/tensorflow/python/training/session_manager.py
+++ b/tensorflow/python/training/session_manager.py
@@ -258,7 +258,7 @@ class SessionManager(object):
if max_wait_secs is None:
max_wait_secs = float("Inf")
- timer = _CountDownTimer(max_wait_secs)
+ timer = _CountDownTimer(1000 * max_wait_secs)
while True:
sess = session.Session(target, graph=self._graph, config=config)
diff --git a/tensorflow/python/training/session_manager_test.py b/tensorflow/python/training/session_manager_test.py
index 671436c17c..65409c73aa 100644
--- a/tensorflow/python/training/session_manager_test.py
+++ b/tensorflow/python/training/session_manager_test.py
@@ -124,7 +124,7 @@ class SessionManagerTest(tf.test.TestCase):
# Set max_wait_secs to allow us to try a few times.
with self.assertRaises(errors.DeadlineExceededError):
- sm.wait_for_session(master="", max_wait_secs=3000)
+ sm.wait_for_session(master="", max_wait_secs=3)
if __name__ == "__main__":
tf.test.main()