Skip to content

Enable npairs loss on windows #1742

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
merged 1 commit into from
Apr 26, 2020
Merged

Enable npairs loss on windows #1742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 0 additions & 12 deletions tensorflow_addons/losses/npairs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,12 @@
# ==============================================================================
"""Implements npairs loss."""

import platform

import tensorflow as tf

from tensorflow_addons.utils.types import TensorLike
from typeguard import typechecked


def check_if_windows(name):
if platform.system() != "Windows":
return
raise NotImplementedError(
"The function {} is not yet available on Windows.".format(name)
)


@tf.keras.utils.register_keras_serializable(package="Addons")
@tf.function
def npairs_loss(y_true: TensorLike, y_pred: TensorLike) -> tf.Tensor:
Expand Down Expand Up @@ -59,7 +49,6 @@ def npairs_loss(y_true: TensorLike, y_pred: TensorLike) -> tf.Tensor:
Returns:
npairs_loss: float scalar.
"""
check_if_windows("npairs_loss")
y_pred = tf.convert_to_tensor(y_pred)
y_true = tf.cast(y_true, y_pred.dtype)

Expand Down Expand Up @@ -119,7 +108,6 @@ def npairs_multilabel_loss(y_true: TensorLike, y_pred: TensorLike) -> tf.Tensor:
Returns:
npairs_multilabel_loss: float scalar.
"""
check_if_windows("npairs_multilabel_loss")
y_pred = tf.convert_to_tensor(y_pred)
y_true = tf.cast(y_true, y_pred.dtype)

Expand Down
10 changes: 0 additions & 10 deletions tensorflow_addons/losses/tests/npairs_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,10 @@
# ==============================================================================
"""Tests for npairs loss."""

import platform

import numpy as np
import pytest
import tensorflow as tf
from tensorflow_addons.losses import npairs

IS_WINDOWS = platform.system() == "Windows"

pytestmark = pytest.mark.skipif(
IS_WINDOWS,
reason="Doesn't work on Windows, see https://github.com/tensorflow/addons/issues/838",
)


def test_config():
nl_obj = npairs.NpairsLoss(name="nl")
Expand Down