From 46f27bf7c8dfe7b5ed4dd76a5af203330ba36d6b Mon Sep 17 00:00:00 2001 From: Tzu-Wei Sung Date: Thu, 14 Nov 2019 23:18:20 -0800 Subject: [PATCH 1/4] fix keras model compile --- tensorflow_addons/losses/lifted.py | 1 - tensorflow_addons/losses/lifted_test.py | 9 +++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/tensorflow_addons/losses/lifted.py b/tensorflow_addons/losses/lifted.py index de2fb07de3..ef69f5cab7 100644 --- a/tensorflow_addons/losses/lifted.py +++ b/tensorflow_addons/losses/lifted.py @@ -39,7 +39,6 @@ def lifted_struct_loss(labels, embeddings, margin=1.0): """ # Reshape [batch_size] label tensor to a [batch_size, 1] label tensor. lshape = tf.shape(labels) - assert lshape.shape == 1 labels = tf.reshape(labels, [lshape[0], 1]) # Build pairwise squared distance matrix. diff --git a/tensorflow_addons/losses/lifted_test.py b/tensorflow_addons/losses/lifted_test.py index 0f2b9fda88..a08a581d6d 100644 --- a/tensorflow_addons/losses/lifted_test.py +++ b/tensorflow_addons/losses/lifted_test.py @@ -67,7 +67,9 @@ def testLiftedStruct(self): labels_reshaped = np.reshape(labels, (labels.shape[0], 1)) # Compute the loss in NP + # pylint: disable=E1111 adjacency = np.equal(labels_reshaped, labels_reshaped.T) + # pylint: enable=E1111 pdist_matrix = pairwise_distance_np(embedding) loss_np = 0.0 num_constraints = 0.0 @@ -102,6 +104,13 @@ def testLiftedStruct(self): loss = cce_obj(y_true, y_pred) self.assertAlmostEqual(self.evaluate(loss), loss_np, 3) + def test_keras_model_compile(self): + model = tf.keras.models.Sequential([ + tf.keras.layers.Input(shape=(784,)), + tf.keras.layers.Dense(10), + ]) + model.compile(loss="Addons>lifted_struct_loss", optimizer="adam") + if __name__ == '__main__': tf.test.main() From 797614aa4d54fbb1a7abc517866514640303e09f Mon Sep 17 00:00:00 2001 From: Tzu-Wei Sung Date: Thu, 14 Nov 2019 23:22:54 -0800 Subject: [PATCH 2/4] checkout pylint change --- tensorflow_addons/losses/lifted_test.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/tensorflow_addons/losses/lifted_test.py b/tensorflow_addons/losses/lifted_test.py index a08a581d6d..4575bf22cd 100644 --- a/tensorflow_addons/losses/lifted_test.py +++ b/tensorflow_addons/losses/lifted_test.py @@ -67,9 +67,7 @@ def testLiftedStruct(self): labels_reshaped = np.reshape(labels, (labels.shape[0], 1)) # Compute the loss in NP - # pylint: disable=E1111 adjacency = np.equal(labels_reshaped, labels_reshaped.T) - # pylint: enable=E1111 pdist_matrix = pairwise_distance_np(embedding) loss_np = 0.0 num_constraints = 0.0 From ca84867c6627fd5760af2c93b20a4ef92dc987d7 Mon Sep 17 00:00:00 2001 From: Tzu-Wei Sung Date: Thu, 14 Nov 2019 23:39:13 -0800 Subject: [PATCH 3/4] disable pylint --- tensorflow_addons/losses/lifted_test.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tensorflow_addons/losses/lifted_test.py b/tensorflow_addons/losses/lifted_test.py index 4575bf22cd..a08a581d6d 100644 --- a/tensorflow_addons/losses/lifted_test.py +++ b/tensorflow_addons/losses/lifted_test.py @@ -67,7 +67,9 @@ def testLiftedStruct(self): labels_reshaped = np.reshape(labels, (labels.shape[0], 1)) # Compute the loss in NP + # pylint: disable=E1111 adjacency = np.equal(labels_reshaped, labels_reshaped.T) + # pylint: enable=E1111 pdist_matrix = pairwise_distance_np(embedding) loss_np = 0.0 num_constraints = 0.0 From 035385a82595390c2bc5ae347b9ba25870b922cd Mon Sep 17 00:00:00 2001 From: Tzu-Wei Sung Date: Fri, 15 Nov 2019 00:06:25 -0800 Subject: [PATCH 4/4] make linter happy --- tensorflow_addons/losses/lifted_test.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tensorflow_addons/losses/lifted_test.py b/tensorflow_addons/losses/lifted_test.py index a08a581d6d..2191639eea 100644 --- a/tensorflow_addons/losses/lifted_test.py +++ b/tensorflow_addons/losses/lifted_test.py @@ -64,7 +64,9 @@ def testLiftedStruct(self): labels = np.random.randint( 0, num_classes, size=(num_data)).astype(np.float32) # Reshape labels to compute adjacency matrix. + # pylint: disable=E1136 labels_reshaped = np.reshape(labels, (labels.shape[0], 1)) + # pylint: enable=E1136 # Compute the loss in NP # pylint: disable=E1111