diff options
| author |  Jianwei Xie <xiejw@google.com> | 2018-01-24 10:02:35 -0800 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2018-01-24 10:06:06 -0800 |
| commit | d9f93c42a50b1f1401d9c186eac0ae8dc9093c3b (patch) | |
| tree | 178d1a692f56580c266139642b5a1d0d155c477e /tensorflow/python/summary | |
| parent | 7b62a71e2d46c148df7d5704972f4592bc5e0f1b (diff) | |
Merge changes from github.
PiperOrigin-RevId: 183100142
Diffstat (limited to 'tensorflow/python/summary')
| -rw-r--r-- | tensorflow/python/summary/summary.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tensorflow/python/summary/summary.py b/tensorflow/python/summary/summary.py index 355593eca5..92c1fcadd2 100644 --- a/tensorflow/python/summary/summary.py +++ b/tensorflow/python/summary/summary.py @@ -286,12 +286,13 @@ def merge(inputs, collections=None, name=None): return val -def merge_all(key=_ops.GraphKeys.SUMMARIES): +def merge_all(key=_ops.GraphKeys.SUMMARIES, scope=None): """Merges all summaries collected in the default graph. Args: key: `GraphKey` used to collect the summaries. Defaults to `GraphKeys.SUMMARIES`. + scope: Optional scope used to filter the summary ops, using `re.match` Returns: If no summaries were collected, returns None. Otherwise returns a scalar @@ -310,7 +311,7 @@ def merge_all(key=_ops.GraphKeys.SUMMARIES): raise RuntimeError( 'Merging tf.summary.* ops is not compatible with eager execution. ' 'Use tf.contrib.summary instead.') - summary_ops = _ops.get_collection(key) + summary_ops = _ops.get_collection(key, scope=scope) if not summary_ops: return None else: |