Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update metrics_ops.py #18155

Merged
merged 2 commits into from
Apr 5, 2018
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
37 changes: 21 additions & 16 deletions tensorflow/contrib/metrics/python/ops/metric_ops.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ def _safe_div(numerator, denominator, name):
0,
name=name)


@deprecated(None, 'Please switch to tf.metrics.true_positives. Note that the '
'order of the labels and predictions arguments has been switched.')
def streaming_true_positives(predictions,
labels,
weights=None,
Expand Down Expand Up @@ -106,7 +107,8 @@ def streaming_true_positives(predictions,
updates_collections=updates_collections,
name=name)


@deprecated(None, 'Please switch to tf.metrics.true_negatives. Note that the '
'order of the labels and predictions arguments has been switched.')
def streaming_true_negatives(predictions,
labels,
weights=None,
Expand Down Expand Up @@ -150,7 +152,8 @@ def streaming_true_negatives(predictions,
updates_collections=updates_collections,
name=name)


@deprecated(None, 'Please switch to tf.metrics.false_positives. Note that the '
'order of the labels and predictions arguments has been switched.')
def streaming_false_positives(predictions,
labels,
weights=None,
Expand Down Expand Up @@ -194,7 +197,8 @@ def streaming_false_positives(predictions,
updates_collections=updates_collections,
name=name)


@deprecated(None, 'Please switch to tf.metrics.false_negatives. Note that the '
'order of the labels and predictions arguments has been switched.')
def streaming_false_negatives(predictions,
labels,
weights=None,
Expand Down Expand Up @@ -237,7 +241,7 @@ def streaming_false_negatives(predictions,
updates_collections=updates_collections,
name=name)


@deprecated(None, 'Please switch to tf.metrics.mean')
def streaming_mean(values,
weights=None,
metrics_collections=None,
Expand Down Expand Up @@ -286,7 +290,7 @@ def streaming_mean(values,
updates_collections=updates_collections,
name=name)


@deprecated(None, 'Please switch to tf.metrics.mean_tensor')
def streaming_mean_tensor(values,
weights=None,
metrics_collections=None,
Expand Down Expand Up @@ -340,9 +344,8 @@ def streaming_mean_tensor(values,
name=name)


@deprecated(None,
'Please switch to tf.metrics.accuracy. Note that the order of the '
'labels and predictions arguments has been switched.')
@deprecated(None, 'Please switch to tf.metrics.accuracy. Note that the order '
'of the labels and predictions arguments has been switched.')
def streaming_accuracy(predictions,
labels,
weights=None,
Expand Down Expand Up @@ -399,7 +402,8 @@ def streaming_accuracy(predictions,
updates_collections=updates_collections,
name=name)


@deprecated(None, 'Please switch to tf.metrics.precision. Note that the order '
'of the labels and predictions arguments has been switched.')
def streaming_precision(predictions,
labels,
weights=None,
Expand Down Expand Up @@ -455,7 +459,8 @@ def streaming_precision(predictions,
updates_collections=updates_collections,
name=name)


@deprecated(None, 'Please switch to tf.metrics.recall. Note that the order '
'of the labels and predictions arguments has been switched.')
def streaming_recall(predictions,
labels,
weights=None,
Expand Down Expand Up @@ -975,8 +980,8 @@ def compute_points(tp, fn, tn, fp):
return points, update_op


@deprecated(None, 'Please switch to tf.metrics.auc. Note that the order of the '
'labels and predictions arguments has been switched.')
@deprecated(None, 'Please switch to tf.metrics.auc. Note that the order of '
'the labels and predictions arguments has been switched.')
def streaming_auc(predictions,
labels,
weights=None,
Expand Down Expand Up @@ -1797,9 +1802,9 @@ def streaming_sensitivity_at_specificity(predictions,
name=name)


@deprecated(
None, 'Please switch to tf.metrics.precision_at_thresholds. Note that the '
'order of the labels and predictions arguments has been switched.')
@deprecated(None,
'Please switch to tf.metrics.precision_at_thresholds. Note that '
'the order of the labels and predictions arguments are switched.')
def streaming_precision_at_thresholds(predictions,
labels,
thresholds,
Expand Down