aboutsummaryrefslogtreecommitdiffhomepage
path: root/tensorflow/python/ops/logging_ops.py
diff options
context:
space:
mode:
Diffstat (limited to 'tensorflow/python/ops/logging_ops.py')
-rw-r--r--tensorflow/python/ops/logging_ops.py27
1 files changed, 26 insertions, 1 deletions
diff --git a/tensorflow/python/ops/logging_ops.py b/tensorflow/python/ops/logging_ops.py
index 40749b551c..4901057836 100644
--- a/tensorflow/python/ops/logging_ops.py
+++ b/tensorflow/python/ops/logging_ops.py
@@ -26,7 +26,7 @@ from tensorflow.python.ops import gen_logging_ops
# pylint: disable=wildcard-import
from tensorflow.python.ops.gen_logging_ops import *
# pylint: enable=wildcard-import
-
+from tensorflow.python.util.deprecation import deprecated
# The python wrapper for Assert is in control_flow_ops, as the Assert
# call relies on certain conditionals for its dependencies. Use
@@ -70,6 +70,11 @@ def _Collect(val, collections, default_collections):
ops.add_to_collection(key, val)
+@deprecated(
+ "2016-11-30", "Please switch to tf.summary.histogram. Note that "
+ "tf.summary.histogram uses the node name instead of the tag. "
+ "This means that TensorFlow will automatically de-duplicate summary "
+ "names based on their scope.")
def histogram_summary(tag, values, collections=None, name=None):
# pylint: disable=line-too-long
"""Outputs a `Summary` protocol buffer with a histogram.
@@ -104,6 +109,12 @@ def histogram_summary(tag, values, collections=None, name=None):
return val
+@deprecated(
+ "2016-11-30", "Please switch to tf.summary.image. Note that "
+ "tf.summary.histogram uses the node name instead of the tag. "
+ "This means that TensorFlow will automatically de-duplicate summary "
+ "names based on the scope they are created in. Also, the max_images "
+ "argument was renamed to max_outputs.")
def image_summary(tag, tensor, max_images=3, collections=None, name=None):
# pylint: disable=line-too-long
"""Outputs a `Summary` protocol buffer with images.
@@ -159,6 +170,11 @@ def image_summary(tag, tensor, max_images=3, collections=None, name=None):
return val
+@deprecated(
+ "2016-11-30", "Please switch to tf.summary.audio. Note that "
+ "tf.summary.histogram uses the node name instead of the tag. "
+ "This means that TensorFlow will automatically de-duplicate summary "
+ "names based on the scope they are created in.")
def audio_summary(tag,
tensor,
sample_rate,
@@ -213,6 +229,7 @@ def audio_summary(tag,
return val
+@deprecated("2016-11-30", "Please switch to tf.summary.merge.")
def merge_summary(inputs, collections=None, name=None):
# pylint: disable=line-too-long
"""Merges summaries.
@@ -245,6 +262,7 @@ def merge_summary(inputs, collections=None, name=None):
return val
+@deprecated("2016-11-30", "Please switch to tf.summary.merge_all.")
def merge_all_summaries(key=ops.GraphKeys.SUMMARIES):
"""Merges all summaries collected in the default graph.
@@ -291,6 +309,13 @@ def get_summary_op():
return summary_op
+@deprecated(
+ "2016-11-30", "Please switch to tf.summary.scalar. Note that "
+ "tf.summary.scalar uses the node name instead of the tag. "
+ "This means that TensorFlow will automatically de-duplicate summary "
+ "names based on the scope they are created in. Also, passing a "
+ "tensor or list of tags to a scalar summary op is no longer "
+ "supported.")
def scalar_summary(tags, values, collections=None, name=None):
# pylint: disable=line-too-long
"""Outputs a `Summary` protocol buffer with scalar values.