Skip to content

Improve deprecation assignment with deprecated_argument_lookup #18605

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.

Sign up for GitHub

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

Merged
martinwicke merged 2 commits into from
Apr 19, 2018
Merged

Improve deprecation assignment with deprecated_argument_lookup #18605

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
388d296
Improve deprecation assignment with deprecated_argument_lookup
imsheridan Apr 17, 2018
430230b
Fix minor pylint issue
imsheridan Apr 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions tensorflow/contrib/losses/python/losses/loss_ops.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
from tensorflow.python.ops import nn_ops
from tensorflow.python.util.deprecation import deprecated
from tensorflow.python.util.deprecation import deprecated_args
from tensorflow.python.util.deprecation import deprecated_argument_lookup

__all__ = [
"absolute_difference", "add_loss", "cosine_distance",
Expand Down Expand Up @@ -651,11 +652,9 @@ def cosine_distance(predictions,
ValueError: If `predictions` shape doesn't match `labels` shape, or
`weights` is `None`.
"""
if dim is not None:
if axis is not None:
raise ValueError("Cannot specify both 'axis' and 'dim'")
axis = dim
if axis is None and dim is None:
axis = deprecated_argument_lookup(
"axis", axis, "dim", dim)
if axis is None:
raise ValueError("You must specify 'axis'.")
with ops.name_scope(scope, "cosine_distance_loss",
[predictions, labels, weights]) as scope:
Expand Down