From 4c3ae89ad3215c3252ebf8ce964795ba8813d810 Mon Sep 17 00:00:00 2001 From: Daniel Stancl <46073029+stancld@users.noreply.github.com> Date: Thu, 28 Jan 2021 16:09:13 +0100 Subject: [PATCH] Remove redundant `test_head_masking = True` flags in test files (#9858) * Remove redundant test_head_masking = True flags * Remove all redundant test_head_masking flags in PyTorch test_modeling_* files * Make test_head_masking = True as a default choice in test_modeling_tf_commong.py * Remove all redundant test_head_masking flags in TensorFlow test_modeling_tf_* files * Put back test_head_masking=False fot TFT5 models --- tests/test_modeling_bart.py | 1 - tests/test_modeling_blenderbot.py | 1 - tests/test_modeling_blenderbot_small.py | 1 - tests/test_modeling_distilbert.py | 1 - tests/test_modeling_lxmert.py | 4 ---- tests/test_modeling_marian.py | 1 - tests/test_modeling_mbart.py | 1 - tests/test_modeling_pegasus.py | 1 - tests/test_modeling_tf_bart.py | 1 - tests/test_modeling_tf_blenderbot.py | 1 - tests/test_modeling_tf_blenderbot_small.py | 1 - tests/test_modeling_tf_common.py | 1 + tests/test_modeling_tf_marian.py | 1 - tests/test_modeling_tf_mbart.py | 1 - tests/test_modeling_tf_pegasus.py | 1 - 15 files changed, 1 insertion(+), 17 deletions(-) diff --git a/tests/test_modeling_bart.py b/tests/test_modeling_bart.py index 363122147d..9e5cb08430 100644 --- a/tests/test_modeling_bart.py +++ b/tests/test_modeling_bart.py @@ -402,7 +402,6 @@ class BartModelTest(ModelTesterMixin, GenerationTesterMixin, unittest.TestCase): all_generative_model_classes = (BartForConditionalGeneration,) if is_torch_available() else () is_encoder_decoder = True test_pruning = False - test_head_masking = True test_missing_keys = False def setUp(self): diff --git a/tests/test_modeling_blenderbot.py b/tests/test_modeling_blenderbot.py index b75e147d9a..974b99f84a 100644 --- a/tests/test_modeling_blenderbot.py +++ b/tests/test_modeling_blenderbot.py @@ -206,7 +206,6 @@ class BlenderbotModelTest(ModelTesterMixin, GenerationTesterMixin, unittest.Test all_generative_model_classes = (BlenderbotForConditionalGeneration,) if is_torch_available() else () is_encoder_decoder = True test_pruning = False - test_head_masking = True test_missing_keys = False def setUp(self): diff --git a/tests/test_modeling_blenderbot_small.py b/tests/test_modeling_blenderbot_small.py index f5cf5b1945..eff4d5b545 100644 --- a/tests/test_modeling_blenderbot_small.py +++ b/tests/test_modeling_blenderbot_small.py @@ -214,7 +214,6 @@ class BlenderbotSmallModelTest(ModelTesterMixin, GenerationTesterMixin, unittest all_generative_model_classes = (BlenderbotSmallForConditionalGeneration,) if is_torch_available() else () is_encoder_decoder = True test_pruning = False - test_head_masking = True test_missing_keys = False def setUp(self): diff --git a/tests/test_modeling_distilbert.py b/tests/test_modeling_distilbert.py index 40bfa77e1e..7a24ad4502 100644 --- a/tests/test_modeling_distilbert.py +++ b/tests/test_modeling_distilbert.py @@ -209,7 +209,6 @@ class DistilBertModelTest(ModelTesterMixin, unittest.TestCase): test_pruning = True test_torchscript = True test_resize_embeddings = True - test_head_masking = True def setUp(self): self.model_tester = DistilBertModelTester(self) diff --git a/tests/test_modeling_lxmert.py b/tests/test_modeling_lxmert.py index 8a0580548e..f05b3c3ee8 100644 --- a/tests/test_modeling_lxmert.py +++ b/tests/test_modeling_lxmert.py @@ -527,10 +527,6 @@ class LxmertModelTest(ModelTesterMixin, unittest.TestCase): test_pruning = False test_torchscript = False - test_head_masking = False - test_pruning = False - test_torchscript = False - # overwrite function because qa models takes different input label shape def _prepare_for_class(self, inputs_dict, model_class, return_labels=False): inputs_dict = copy.deepcopy(inputs_dict) diff --git a/tests/test_modeling_marian.py b/tests/test_modeling_marian.py index e4892f2bb0..621530a4b9 100644 --- a/tests/test_modeling_marian.py +++ b/tests/test_modeling_marian.py @@ -223,7 +223,6 @@ class MarianModelTest(ModelTesterMixin, GenerationTesterMixin, unittest.TestCase all_generative_model_classes = (MarianMTModel,) if is_torch_available() else () is_encoder_decoder = True test_pruning = False - test_head_masking = True test_missing_keys = False def setUp(self): diff --git a/tests/test_modeling_mbart.py b/tests/test_modeling_mbart.py index 44ec71e168..0e88ccb037 100644 --- a/tests/test_modeling_mbart.py +++ b/tests/test_modeling_mbart.py @@ -219,7 +219,6 @@ class MBartModelTest(ModelTesterMixin, GenerationTesterMixin, unittest.TestCase) all_generative_model_classes = (MBartForConditionalGeneration,) if is_torch_available() else () is_encoder_decoder = True test_pruning = False - test_head_masking = True test_missing_keys = False def setUp(self): diff --git a/tests/test_modeling_pegasus.py b/tests/test_modeling_pegasus.py index 1b5f5632fe..51c16726de 100644 --- a/tests/test_modeling_pegasus.py +++ b/tests/test_modeling_pegasus.py @@ -207,7 +207,6 @@ class PegasusModelTest(ModelTesterMixin, GenerationTesterMixin, unittest.TestCas all_generative_model_classes = (PegasusForConditionalGeneration,) if is_torch_available() else () is_encoder_decoder = True test_pruning = False - test_head_masking = True test_missing_keys = False def setUp(self): diff --git a/tests/test_modeling_tf_bart.py b/tests/test_modeling_tf_bart.py index 367b65dfb6..7ab769c4fe 100644 --- a/tests/test_modeling_tf_bart.py +++ b/tests/test_modeling_tf_bart.py @@ -178,7 +178,6 @@ class TFBartModelTest(TFModelTesterMixin, unittest.TestCase): all_generative_model_classes = (TFBartForConditionalGeneration,) if is_tf_available() else () is_encoder_decoder = True test_pruning = False - test_head_masking = True def setUp(self): self.model_tester = TFBartModelTester(self) diff --git a/tests/test_modeling_tf_blenderbot.py b/tests/test_modeling_tf_blenderbot.py index 757f44fb96..ef58fa05ee 100644 --- a/tests/test_modeling_tf_blenderbot.py +++ b/tests/test_modeling_tf_blenderbot.py @@ -177,7 +177,6 @@ class TFBlenderbotModelTest(TFModelTesterMixin, unittest.TestCase): all_generative_model_classes = (TFBlenderbotForConditionalGeneration,) if is_tf_available() else () is_encoder_decoder = True test_pruning = False - test_head_masking = True def setUp(self): self.model_tester = TFBlenderbotModelTester(self) diff --git a/tests/test_modeling_tf_blenderbot_small.py b/tests/test_modeling_tf_blenderbot_small.py index c2454964a0..e136f541d2 100644 --- a/tests/test_modeling_tf_blenderbot_small.py +++ b/tests/test_modeling_tf_blenderbot_small.py @@ -179,7 +179,6 @@ class TFBlenderbotSmallModelTest(TFModelTesterMixin, unittest.TestCase): all_generative_model_classes = (TFBlenderbotSmallForConditionalGeneration,) if is_tf_available() else () is_encoder_decoder = True test_pruning = False - test_head_masking = True def setUp(self): self.model_tester = TFBlenderbotSmallModelTester(self) diff --git a/tests/test_modeling_tf_common.py b/tests/test_modeling_tf_common.py index 74250cee61..4be9b955a9 100644 --- a/tests/test_modeling_tf_common.py +++ b/tests/test_modeling_tf_common.py @@ -75,6 +75,7 @@ class TFModelTesterMixin: all_model_classes = () all_generative_model_classes = () test_resize_embeddings = True + test_head_masking = True is_encoder_decoder = False def _prepare_for_class(self, inputs_dict, model_class, return_labels=False) -> dict: diff --git a/tests/test_modeling_tf_marian.py b/tests/test_modeling_tf_marian.py index 1a58386a70..ce54cd1c63 100644 --- a/tests/test_modeling_tf_marian.py +++ b/tests/test_modeling_tf_marian.py @@ -179,7 +179,6 @@ class TFMarianModelTest(TFModelTesterMixin, unittest.TestCase): all_generative_model_classes = (TFMarianMTModel,) if is_tf_available() else () is_encoder_decoder = True test_pruning = False - test_head_masking = True def setUp(self): self.model_tester = TFMarianModelTester(self) diff --git a/tests/test_modeling_tf_mbart.py b/tests/test_modeling_tf_mbart.py index 766773973e..b22c54d5bf 100644 --- a/tests/test_modeling_tf_mbart.py +++ b/tests/test_modeling_tf_mbart.py @@ -181,7 +181,6 @@ class TFMBartModelTest(TFModelTesterMixin, unittest.TestCase): all_generative_model_classes = (TFMBartForConditionalGeneration,) if is_tf_available() else () is_encoder_decoder = True test_pruning = False - test_head_masking = True def setUp(self): self.model_tester = TFMBartModelTester(self) diff --git a/tests/test_modeling_tf_pegasus.py b/tests/test_modeling_tf_pegasus.py index a7a5b03f95..7473e0e1cf 100644 --- a/tests/test_modeling_tf_pegasus.py +++ b/tests/test_modeling_tf_pegasus.py @@ -177,7 +177,6 @@ class TFPegasusModelTest(TFModelTesterMixin, unittest.TestCase): all_generative_model_classes = (TFPegasusForConditionalGeneration,) if is_tf_available() else () is_encoder_decoder = True test_pruning = False - test_head_masking = True def setUp(self): self.model_tester = TFPegasusModelTester(self)