Update tests under keras.utils to use combinations.

Change all test_util.run_all_in_graph_and_eager_modes to combination.

PiperOrigin-RevId: 301393990
Change-Id: I7084404a9a256a11804bd474d1383f9c36de7305

tensorflow/python/keras/tests/BUILD

@@ -102,6 +102,7 @@ tf_py_test(
         ":model_subclassing_test_util",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python/keras",
+        "//tensorflow/python/keras:combinations",
         "//third_party/py/numpy",
         "@absl_py//absl/testing:parameterized",
     ],

tensorflow/python/keras/tests/model_subclassing_test.py

@@ -21,6 +21,7 @@ from __future__ import print_function
 import copy
 import os
 
+from absl.testing import parameterized
 import numpy as np
 
 from tensorflow.python import keras
@@ -29,6 +30,7 @@ from tensorflow.python.eager import context
 from tensorflow.python.framework import ops
 from tensorflow.python.framework import tensor_shape
 from tensorflow.python.framework import test_util
+from tensorflow.python.keras import combinations
 from tensorflow.python.keras import keras_parameterized
 from tensorflow.python.keras import testing_utils
 from tensorflow.python.keras.tests import model_subclassing_test_util as model_util
@@ -606,8 +608,8 @@ class GraphSpecificModelSubclassingTests(test.TestCase):
       _ = model.evaluate([x1, x2], [y1, y2], verbose=0)
 
 
-@test_util.run_all_in_graph_and_eager_modes
+@combinations.generate(combinations.combine(mode=['graph', 'eager']))
-class CustomCallSignatureTests(test.TestCase):
+class CustomCallSignatureTests(test.TestCase, parameterized.TestCase):
 
   def test_no_inputs_in_signature(self):
     model = model_util.CustomCallModel()
@@ -669,7 +671,7 @@ class CustomCallSignatureTests(test.TestCase):
     arg = array_ops.ones([1])
     model(arg, a=3)
     if not context.executing_eagerly():
-      self.assertEqual(len(model.inputs), 1)
+      self.assertLen(model.inputs, 1)
 
   @test_util.assert_no_new_tensors
   @test_util.assert_no_garbage_created

tensorflow/python/keras/utils/BUILD

@@ -244,6 +244,7 @@ tf_py_test(
         ":tf_utils",
         "//tensorflow/python:client_testlib",
         "//tensorflow/python/keras",
+        "//tensorflow/python/keras:combinations",
     ],
 )
 
@@ -370,6 +371,7 @@ tf_py_test(
         "//tensorflow/python:platform_test",
         "//tensorflow/python/eager:context",
         "//tensorflow/python/keras",
+        "//tensorflow/python/keras:combinations",
         "//tensorflow/python/ops/ragged:ragged_factory_ops",
         "//tensorflow/python/ops/ragged:ragged_tensor",
         "@absl_py//absl/testing:parameterized",

tensorflow/python/keras/utils/metrics_utils_test.py

@@ -23,6 +23,7 @@ from absl.testing import parameterized
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import test_util
+from tensorflow.python.keras import combinations
 from tensorflow.python.keras.utils import metrics_utils
 from tensorflow.python.ops import script_ops
 from tensorflow.python.ops.ragged import ragged_factory_ops
@@ -30,7 +31,7 @@ from tensorflow.python.ops.ragged import ragged_tensor
 from tensorflow.python.platform import googletest
 
 
-@test_util.run_all_in_graph_and_eager_modes
+@combinations.generate(combinations.combine(mode=['graph', 'eager']))
 class RaggedSizeOpTest(test_util.TensorFlowTestCase, parameterized.TestCase):
 
   @parameterized.parameters([
@@ -249,8 +250,8 @@ class RaggedSizeOpTest(test_util.TensorFlowTestCase, parameterized.TestCase):
           metrics_utils.ragged_assert_compatible_and_get_flat_values([x, y])
 
 
-@test_util.run_all_in_graph_and_eager_modes
+@combinations.generate(combinations.combine(mode=['graph', 'eager']))
-class FilterTopKTest(test_util.TensorFlowTestCase):
+class FilterTopKTest(test_util.TensorFlowTestCase, parameterized.TestCase):
 
   def test_one_dimensional(self):
     x = constant_op.constant([.3, .1, .2, -.5, 42.])

tensorflow/python/keras/utils/tf_utils_test.py

@@ -18,18 +18,20 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
+from absl.testing import parameterized
+
 from tensorflow.python import keras
 from tensorflow.python.eager import context
 from tensorflow.python.framework import ops
 from tensorflow.python.framework import sparse_tensor
-from tensorflow.python.framework import test_util
+from tensorflow.python.keras import combinations
 from tensorflow.python.keras.utils import tf_utils
 from tensorflow.python.ops import variables
 from tensorflow.python.platform import test
 
 
-@test_util.run_all_in_graph_and_eager_modes
+@combinations.generate(combinations.combine(mode=['graph', 'eager']))
-class TestIsSymbolicTensor(test.TestCase):
+class TestIsSymbolicTensor(test.TestCase, parameterized.TestCase):
 
   def test_default_behavior(self):
     if context.executing_eagerly():