diff options
| author |  Scott Zhu <scottzhu@google.com> | 2018-04-13 09:32:36 -0700 |
|---|---|---|
| committer | Scott Zhu <scottzhu@google.com> | 2018-04-13 09:32:36 -0700 |
| commit | a1945729655191c511dbfea1a38b35bdfc734a09 (patch) | |
| tree | 26a84312a4974d8f27b4f6ebd81b3c19c58388ba /tensorflow/contrib/training | |
| parent | 352142267a1a151b04c6198de83b40b7e979d1d8 (diff) | |
| parent | 554c587c54d0725d6da0ce39557d17b8393c35bc (diff) | |
Merge commit for internal changes
Diffstat (limited to 'tensorflow/contrib/training')
| -rw-r--r-- | tensorflow/contrib/training/python/training/evaluation.py | 3 | ||||
| -rw-r--r-- | tensorflow/contrib/training/python/training/hparam.py | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/tensorflow/contrib/training/python/training/evaluation.py b/tensorflow/contrib/training/python/training/evaluation.py index 4bb53e8678..f7fd66d33f 100644 --- a/tensorflow/contrib/training/python/training/evaluation.py +++ b/tensorflow/contrib/training/python/training/evaluation.py @@ -138,7 +138,6 @@ from __future__ import print_function import time -from tensorflow.contrib.framework.python.ops import variables from tensorflow.python.ops import state_ops from tensorflow.python.platform import tf_logging as logging from tensorflow.python.summary import summary @@ -298,7 +297,7 @@ class SummaryAtEndHook(session_run_hook.SessionRunHook): def begin(self): if self._replace_summary_op: self._summary_op = summary.merge_all() - self._global_step = variables.get_or_create_global_step() + self._global_step = training_util.get_or_create_global_step() def after_create_session(self, session, coord): if self._summary_writer is None and self._log_dir: diff --git a/tensorflow/contrib/training/python/training/hparam.py b/tensorflow/contrib/training/python/training/hparam.py index 185f70a86d..6c59b68053 100644 --- a/tensorflow/contrib/training/python/training/hparam.py +++ b/tensorflow/contrib/training/python/training/hparam.py @@ -315,7 +315,7 @@ class HParams(object): Hyperparameters have type, which is inferred from the type of their value passed at construction type. The currently supported types are: integer, - float, string, and list of integer, float, or string. + float, boolean, string, and list of integer, float, boolean, or string. You can override hyperparameter values by calling the [`parse()`](#HParams.parse) method, passing a string of comma separated |