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.

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

Jump to bottom

modernize Python in losses.py and its tests #47873

Merged
merged 10 commits into from
Mar 30, 2021
Merged

modernize Python in losses.py and its tests #47873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5a3bb77
do not explicitly inherit from object
zenogantner Mar 13, 2021
3333dd1
super calls
zenogantner Mar 13, 2021
98dd2fb
remove __future__ imports
zenogantner Mar 14, 2021
f314cff
remove six
zenogantner Mar 14, 2021
aaa7cd2
simplify structure of if ... return chain
zenogantner Mar 14, 2021
389e5b0
use f-string
zenogantner Mar 14, 2021
8d43ce4
remove __future__ imports
zenogantner Mar 14, 2021
4c13335
modernize super() call
zenogantner Mar 14, 2021
cc639c6
Merge remote-tracking branch 'upstream/master' into keras-losses-python3
zenogantner Mar 17, 2021
0062afb
Merge remote-tracking branch 'upstream/master' into keras-losses-python3
zenogantner Mar 25, 2021
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
47 changes: 20 additions & 27 deletions tensorflow/python/keras/losses.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ def __init__(self,
name: (Optional) name for the loss.
**kwargs: The keyword arguments that are passed on to `fn`.
"""
super(LossFunctionWrapper, self).__init__(reduction=reduction, name=name)
super().__init__(reduction=reduction, name=name)
self.fn = fn
self._fn_kwargs = kwargs

Expand All @@ -262,7 +262,7 @@ def get_config(self):
config = {}
for k, v in self._fn_kwargs.items():
config[k] = backend.eval(v) if tf_utils.is_tensor_or_variable(v) else v
base_config = super(LossFunctionWrapper, self).get_config()
base_config = super().get_config()
return dict(list(base_config.items()) + list(config.items()))


Expand Down Expand Up @@ -321,8 +321,7 @@ def __init__(self,
more details.
name: Optional name for the op. Defaults to 'mean_squared_error'.
"""
super(MeanSquaredError, self).__init__(
mean_squared_error, name=name, reduction=reduction)
super().__init__(mean_squared_error, name=name, reduction=reduction)


@keras_export('keras.losses.MeanAbsoluteError')
Expand Down Expand Up @@ -380,8 +379,7 @@ def __init__(self,
more details.
name: Optional name for the op. Defaults to 'mean_absolute_error'.
"""
super(MeanAbsoluteError, self).__init__(
mean_absolute_error, name=name, reduction=reduction)
super().__init__(mean_absolute_error, name=name, reduction=reduction)


@keras_export('keras.losses.MeanAbsolutePercentageError')
Expand Down Expand Up @@ -441,7 +439,7 @@ def __init__(self,
name: Optional name for the op. Defaults to
'mean_absolute_percentage_error'.
"""
super(MeanAbsolutePercentageError, self).__init__(
super().__init__(
mean_absolute_percentage_error, name=name, reduction=reduction)


Expand Down Expand Up @@ -502,7 +500,7 @@ def __init__(self,
name: Optional name for the op. Defaults to
'mean_squared_logarithmic_error'.
"""
super(MeanSquaredLogarithmicError, self).__init__(
super().__init__(
mean_squared_logarithmic_error, name=name, reduction=reduction)


Expand Down Expand Up @@ -596,7 +594,7 @@ def __init__(self,
more details.
name: (Optional) Name for the op. Defaults to 'binary_crossentropy'.
"""
super(BinaryCrossentropy, self).__init__(
super().__init__(
binary_crossentropy,
name=name,
reduction=reduction,
Expand Down Expand Up @@ -675,7 +673,7 @@ def __init__(self,
more details.
name: Optional name for the op. Defaults to 'categorical_crossentropy'.
"""
super(CategoricalCrossentropy, self).__init__(
super().__init__(
categorical_crossentropy,
name=name,
reduction=reduction,
Expand Down Expand Up @@ -752,7 +750,7 @@ def __init__(self,
name: Optional name for the op. Defaults to
'sparse_categorical_crossentropy'.
"""
super(SparseCategoricalCrossentropy, self).__init__(
super().__init__(
sparse_categorical_crossentropy,
name=name,
reduction=reduction,
Expand Down Expand Up @@ -815,7 +813,7 @@ def __init__(self, reduction=losses_utils.ReductionV2.AUTO, name='hinge'):
more details.
name: Optional name for the op. Defaults to 'hinge'.
"""
super(Hinge, self).__init__(hinge, name=name, reduction=reduction)
super().__init__(hinge, name=name, reduction=reduction)


@keras_export('keras.losses.SquaredHinge')
Expand Down Expand Up @@ -876,8 +874,7 @@ def __init__(self,
more details.
name: Optional name for the op. Defaults to 'squared_hinge'.
"""
super(SquaredHinge, self).__init__(
squared_hinge, name=name, reduction=reduction)
super().__init__(squared_hinge, name=name, reduction=reduction)


@keras_export('keras.losses.CategoricalHinge')
Expand Down Expand Up @@ -936,8 +933,7 @@ def __init__(self,
more details.
name: Optional name for the op. Defaults to 'categorical_hinge'.
"""
super(CategoricalHinge, self).__init__(
categorical_hinge, name=name, reduction=reduction)
super().__init__(categorical_hinge, name=name, reduction=reduction)


@keras_export('keras.losses.Poisson')
Expand Down Expand Up @@ -993,7 +989,7 @@ def __init__(self, reduction=losses_utils.ReductionV2.AUTO, name='poisson'):
more details.
name: Optional name for the op. Defaults to 'poisson'.
"""
super(Poisson, self).__init__(poisson, name=name, reduction=reduction)
super().__init__(poisson, name=name, reduction=reduction)


@keras_export('keras.losses.LogCosh')
Expand Down Expand Up @@ -1050,7 +1046,7 @@ def __init__(self, reduction=losses_utils.ReductionV2.AUTO, name='log_cosh'):
more details.
name: Optional name for the op. Defaults to 'log_cosh'.
"""
super(LogCosh, self).__init__(log_cosh, name=name, reduction=reduction)
super().__init__(log_cosh, name=name, reduction=reduction)


@keras_export('keras.losses.KLDivergence')
Expand Down Expand Up @@ -1110,8 +1106,7 @@ def __init__(self,
more details.
name: Optional name for the op. Defaults to 'kl_divergence'.
"""
super(KLDivergence, self).__init__(
kl_divergence, name=name, reduction=reduction)
super().__init__(kl_divergence, name=name, reduction=reduction)


@keras_export('keras.losses.Huber')
Expand Down Expand Up @@ -1178,8 +1173,7 @@ def __init__(self,
more details.
name: Optional name for the op. Defaults to 'huber_loss'.
"""
super(Huber, self).__init__(
huber, name=name, reduction=reduction, delta=delta)
super().__init__(huber, name=name, reduction=reduction, delta=delta)


@keras_export('keras.metrics.mean_squared_error', 'keras.metrics.mse',
Expand Down Expand Up @@ -1979,7 +1973,7 @@ def __init__(self,
axis=-1,
reduction=losses_utils.ReductionV2.AUTO,
name='cosine_similarity'):
super(CosineSimilarity, self).__init__(
super().__init__(
cosine_similarity, reduction=reduction, name=name, axis=axis)


Expand Down Expand Up @@ -2078,11 +2072,10 @@ def get(identifier):
return deserialize(identifier)
if isinstance(identifier, dict):
return deserialize(identifier)
elif callable(identifier):
if callable(identifier):
return identifier
else:
raise ValueError(
'Could not interpret loss function identifier: {}'.format(identifier))
raise ValueError(
f'Could not interpret loss function identifier: {identifier}')


LABEL_DTYPES_FOR_LOSSES = {
Expand Down
2 changes: 1 addition & 1 deletion tensorflow/python/keras/losses_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1783,7 +1783,7 @@ def test_loss_with_non_default_dtype(self):
class BinaryTruePositivesViaControlFlow(losses.Loss):

def __init__(self, reduction=losses_utils.ReductionV2.AUTO):
super(BinaryTruePositivesViaControlFlow, self).__init__(reduction=reduction)
super().__init__(reduction=reduction)

def call(self, y_true, y_pred):
y_true = math_ops.cast(y_true, dtypes.bool)
Expand Down