Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Exposed the pure python implementation of mish and softshrink. #1252

Merged
merged 4 commits into from
Mar 9, 2020
Merged

Exposed the pure python implementation of mish and softshrink. #1252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
66ff68a
Exposed the pure python implementation of mish.
gabrieldemarmiesse Mar 8, 2020
5d6eb7d
Exposed the pure implementation of softshrink publicly.
gabrieldemarmiesse Mar 8, 2020
56cdeb9
Fix name.
gabrieldemarmiesse Mar 8, 2020
aad53b9
The same error is not raise in python and in the custom op.
gabrieldemarmiesse Mar 8, 2020
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
12 changes: 12 additions & 0 deletions tensorflow_addons/activations/mish.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

from tensorflow_addons.utils import types
from tensorflow_addons.utils.resource_loader import LazySO
from tensorflow_addons import options

_activation_so = LazySO("custom_ops/activations/_activation_ops.so")

Expand All @@ -36,6 +37,17 @@ def mish(x: types.TensorLike) -> tf.Tensor:
A `Tensor`. Has the same type as `x`.
"""
x = tf.convert_to_tensor(x)

if not options.TF_ADDONS_PY_OPS:
try:
return _mish_custom_op(x)
except tf.errors.NotFoundError:
options.warn_fallback("mish")

return _mish_custom_op(x)


def _mish_custom_op(x):
return _activation_so.ops.addons_mish(x)


Expand Down
12 changes: 12 additions & 0 deletions tensorflow_addons/activations/softshrink.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

from tensorflow_addons.utils import types
from tensorflow_addons.utils.resource_loader import LazySO
from tensorflow_addons import options

_activation_so = LazySO("custom_ops/activations/_activation_ops.so")

Expand All @@ -40,6 +41,17 @@ def softshrink(
A `Tensor`. Has the same type as `x`.
"""
x = tf.convert_to_tensor(x)

if not options.TF_ADDONS_PY_OPS:
try:
return _softshrink_custom_op(x, lower, upper)
except tf.errors.NotFoundError:
options.warn_fallback("softshrink")

return _softshrink_py(x, lower, upper)


def _softshrink_custom_op(x, lower, upper):
return _activation_so.ops.addons_softshrink(x, lower, upper)


Expand Down
7 changes: 5 additions & 2 deletions tensorflow_addons/activations/softshrink_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,18 @@
import numpy as np
import tensorflow as tf
from tensorflow_addons.activations import softshrink
from tensorflow_addons.activations.softshrink import _softshrink_py
from tensorflow_addons.activations.softshrink import (
_softshrink_py,
_softshrink_custom_op,
)
from tensorflow_addons.utils import test_utils


@test_utils.run_all_in_graph_and_eager_modes
class SoftshrinkTest(tf.test.TestCase, parameterized.TestCase):
def test_invalid(self):
with self.assertRaisesOpError("lower must be less than or equal to upper."):
y = softshrink(tf.ones(shape=(1, 2, 3)), lower=2.0, upper=-2.0)
y = _softshrink_custom_op(tf.ones(shape=(1, 2, 3)), lower=2.0, upper=-2.0)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's preventing this from being configurable so we can test custom and not custom? The regex for error?
Not blocking this PR but something we might want to aim for being able to do.

self.evaluate(y)

@parameterized.named_parameters(
Expand Down