Removed test_utils.run_all_in_graph_and_eager_modes in netvlad_test.py (#1350)

* Use pytest only for netvlad.

* Used pytestmark.

Author: gabrieldemarmiesse

tensorflow_addons/layers/netvlad_test.py

@@ -17,50 +17,47 @@
 import sys
 
 import pytest
-from absl.testing import parameterized
 import numpy as np
-import tensorflow as tf
 from tensorflow_addons.layers.netvlad import NetVLAD
 from tensorflow_addons.utils import test_utils
 
 
-@test_utils.run_all_in_graph_and_eager_modes
-class NetVLADTest(tf.test.TestCase, parameterized.TestCase):
-    """Tests for NetVLAD."""
+pytestmark = pytest.mark.usefixtures("maybe_run_functions_eagerly")
 
-    @parameterized.parameters(
-        {"num_clusters": 1}, {"num_clusters": 4},
+
+@pytest.mark.parametrize("num_clusters", [1, 4])
+def test_simple(num_clusters):
+    test_utils.layer_test(
+        NetVLAD,
+        kwargs={"num_clusters": num_clusters},
+        input_shape=(5, 4, 100),
+        expected_output_shape=(None, num_clusters * 100),
+    )
+
+
+def test_unknown():
+    inputs = np.random.random((5, 4, 100)).astype("float32")
+    test_utils.layer_test(
+        NetVLAD,
+        kwargs={"num_clusters": 3},
+        input_shape=(None, None, 100),
+        input_data=inputs,
+        expected_output_shape=(None, 3 * 100),
     )
-    def test_simple(self, num_clusters):
+
+
+def test_invalid_shape():
+    with pytest.raises(ValueError) as exception_info:
         test_utils.layer_test(
-            NetVLAD,
-            kwargs={"num_clusters": num_clusters},
-            input_shape=(5, 4, 100),
-            expected_output_shape=(None, num_clusters * 100),
+            NetVLAD, kwargs={"num_clusters": 0}, input_shape=(5, 4, 20)
         )
+    assert "`num_clusters` must be greater than 1" in str(exception_info.value)
 
-    def test_unknown(self):
-        inputs = np.random.random((5, 4, 100)).astype("float32")
+    with pytest.raises(ValueError) as exception_info:
         test_utils.layer_test(
-            NetVLAD,
-            kwargs={"num_clusters": 3},
-            input_shape=(None, None, 100),
-            input_data=inputs,
-            expected_output_shape=(None, 3 * 100),
+            NetVLAD, kwargs={"num_clusters": 2}, input_shape=(5, 4, 4, 20)
         )
-
-    def test_invalid_shape(self):
-        with self.assertRaisesRegexp(
-            ValueError, r"`num_clusters` must be greater than 1"
-        ):
-            test_utils.layer_test(
-                NetVLAD, kwargs={"num_clusters": 0}, input_shape=(5, 4, 20)
-            )
-
-        with self.assertRaisesRegexp(ValueError, r"must have rank 3"):
-            test_utils.layer_test(
-                NetVLAD, kwargs={"num_clusters": 2}, input_shape=(5, 4, 4, 20)
-            )
+    assert "must have rank 3" in str(exception_info.value)
 
 
 if __name__ == "__main__":