diff options
| author |  Raghuraman Krishnamoorthi <raghuramank@google.com> | 2018-01-03 19:06:54 -0800 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2018-01-03 19:10:47 -0800 |
| commit | 71896cc7e5bd3d1b8b5bb615eac7bebf86fa998c (patch) | |
| tree | 4450e1c17cf66618048fb17eee320d9741543b3a /tensorflow/contrib/slim | |
| parent | 2eef71c3f9a486c42e4876adfef312f817f7cb32 (diff) | |
Merge changes from github.
PiperOrigin-RevId: 180746153
Diffstat (limited to 'tensorflow/contrib/slim')
| -rw-r--r-- | tensorflow/contrib/slim/README.md | 2 | ||||
| -rw-r--r-- | tensorflow/contrib/slim/python/slim/learning.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tensorflow/contrib/slim/README.md b/tensorflow/contrib/slim/README.md index dc92ae0c85..c7a54cb9a2 100644 --- a/tensorflow/contrib/slim/README.md +++ b/tensorflow/contrib/slim/README.md @@ -676,7 +676,7 @@ file were implicitly obtained from each provided variable's `var.op.name`. This works well when the variable names in the checkpoint file match those in the graph. However, sometimes, we want to restore a model from a checkpoint -whose variables have different names those in the current graph. In this case, +whose variables have different names to those in the current graph. In this case, we must provide the `Saver` a dictionary that maps from each checkpoint variable name to each graph variable. Consider the following example where the checkpoint variables names are obtained via a simple function: diff --git a/tensorflow/contrib/slim/python/slim/learning.py b/tensorflow/contrib/slim/python/slim/learning.py index def00b7618..54362c87b5 100644 --- a/tensorflow/contrib/slim/python/slim/learning.py +++ b/tensorflow/contrib/slim/python/slim/learning.py @@ -753,9 +753,10 @@ def train(train_op, if logdir: sv.start_standard_services(sess) elif startup_delay_steps > 0: + # (use sys.maxsize because sys.maxint doesn't exist in Python 3) _wait_for_step(sess, global_step, min(startup_delay_steps, number_of_steps or - sys.maxint)) + sys.maxsize)) threads = sv.start_queue_runners(sess) logging.info('Starting Queues.') if is_chief and sync_optimizer is not None: |