From ef91a2d135f3fa43c89511f7c11ae3543e260692 Mon Sep 17 00:00:00 2001 From: amyeroberts <22614925+amyeroberts@users.noreply.github.com> Date: Tue, 30 Aug 2022 13:03:28 +0100 Subject: [PATCH] Run tests if skip condition not met (#18764) * Run tests if skip condition not met * Update comment - remove outdated ref to TF 2.8 --- tests/models/convnext/test_modeling_tf_convnext.py | 6 +++--- tests/models/regnet/test_modeling_tf_regnet.py | 4 ++-- tests/models/segformer/test_modeling_tf_segformer.py | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/models/convnext/test_modeling_tf_convnext.py b/tests/models/convnext/test_modeling_tf_convnext.py index bc84cd0a40..9a0d3140e9 100644 --- a/tests/models/convnext/test_modeling_tf_convnext.py +++ b/tests/models/convnext/test_modeling_tf_convnext.py @@ -145,10 +145,10 @@ class TFConvNextModelTest(TFModelTesterMixin, unittest.TestCase): @unittest.skipIf( not is_tf_available() or len(tf.config.list_physical_devices("GPU")) == 0, - reason="TF (<=2.8) does not support backprop for grouped convolutions on CPU.", + reason="TF does not support backprop for grouped convolutions on CPU.", ) def test_keras_fit(self): - pass + super().test_keras_fit() @unittest.skip(reason="ConvNext does not support input and output embeddings") def test_model_common_attributes(self): @@ -176,7 +176,7 @@ class TFConvNextModelTest(TFModelTesterMixin, unittest.TestCase): @unittest.skipIf( not is_tf_available() or len(tf.config.list_physical_devices("GPU")) == 0, - reason="TF (<=2.8) does not support backprop for grouped convolutions on CPU.", + reason="TF does not support backprop for grouped convolutions on CPU.", ) def test_dataset_conversion(self): super().test_dataset_conversion() diff --git a/tests/models/regnet/test_modeling_tf_regnet.py b/tests/models/regnet/test_modeling_tf_regnet.py index c7504c92fa..3b426fcd08 100644 --- a/tests/models/regnet/test_modeling_tf_regnet.py +++ b/tests/models/regnet/test_modeling_tf_regnet.py @@ -138,10 +138,10 @@ class TFRegNetModelTest(TFModelTesterMixin, unittest.TestCase): @unittest.skipIf( not is_tf_available() or len(tf.config.list_physical_devices("GPU")) == 0, - reason="TF (<=2.8) does not support backprop for grouped convolutions on CPU.", + reason="TF does not support backprop for grouped convolutions on CPU.", ) def test_keras_fit(self): - pass + super().test_keras_fit() @unittest.skip(reason="RegNet does not support input and output embeddings") def test_model_common_attributes(self): diff --git a/tests/models/segformer/test_modeling_tf_segformer.py b/tests/models/segformer/test_modeling_tf_segformer.py index d6a73e2219..dfdb24f37b 100644 --- a/tests/models/segformer/test_modeling_tf_segformer.py +++ b/tests/models/segformer/test_modeling_tf_segformer.py @@ -332,7 +332,7 @@ class TFSegformerModelTest(TFModelTesterMixin, unittest.TestCase): @unittest.skipIf( not is_tf_available() or len(tf.config.list_physical_devices("GPU")) == 0, - reason="TF (<=2.8) does not support backprop for grouped convolutions on CPU.", + reason="TF does not support backprop for grouped convolutions on CPU.", ) def test_dataset_conversion(self): super().test_dataset_conversion() @@ -342,7 +342,7 @@ class TFSegformerModelTest(TFModelTesterMixin, unittest.TestCase): @unittest.skipIf( not is_tf_available() or len(tf.config.list_physical_devices("GPU")) == 0, - reason="TF (<=2.8) does not support backprop for grouped convolutions on CPU.", + reason="TF does not support backprop for grouped convolutions on CPU.", ) def test_keras_fit(self): config, _ = self.model_tester.prepare_config_and_inputs_for_common()