Unverified Commit 609e6622 authored by amyeroberts's avatar amyeroberts Committed by GitHub
Browse files

Use self.config_tester.run_common_tests() (#31431)

* First testing updating config tests

* Use run_common_tests
parent 7c71b61d
...@@ -124,15 +124,16 @@ class SuperPointModelTest(ModelTesterMixin, unittest.TestCase): ...@@ -124,15 +124,16 @@ class SuperPointModelTest(ModelTesterMixin, unittest.TestCase):
def setUp(self): def setUp(self):
self.model_tester = SuperPointModelTester(self) self.model_tester = SuperPointModelTester(self)
self.config_tester = ConfigTester(self, config_class=SuperPointConfig, has_text_modality=False, hidden_size=37) self.config_tester = ConfigTester(
self,
config_class=SuperPointConfig,
has_text_modality=False,
hidden_size=37,
common_properties=["encoder_hidden_sizes", "decoder_hidden_size"],
)
def test_config(self): def test_config(self):
self.config_tester.create_and_test_config_to_json_string() self.config_tester.run_common_tests()
self.config_tester.create_and_test_config_to_json_file()
self.config_tester.create_and_test_config_from_and_save_pretrained()
self.config_tester.create_and_test_config_with_num_labels()
self.config_tester.check_config_can_be_init_without_params()
self.config_tester.check_config_arguments_init()
@unittest.skip(reason="SuperPointForKeypointDetection does not use inputs_embeds") @unittest.skip(reason="SuperPointForKeypointDetection does not use inputs_embeds")
def test_inputs_embeds(self): def test_inputs_embeds(self):
......
...@@ -243,15 +243,16 @@ class SwinModelTest(ModelTesterMixin, PipelineTesterMixin, unittest.TestCase): ...@@ -243,15 +243,16 @@ class SwinModelTest(ModelTesterMixin, PipelineTesterMixin, unittest.TestCase):
def setUp(self): def setUp(self):
self.model_tester = SwinModelTester(self) self.model_tester = SwinModelTester(self)
self.config_tester = ConfigTester(self, config_class=SwinConfig, embed_dim=37) self.config_tester = ConfigTester(
self,
config_class=SwinConfig,
embed_dim=37,
has_text_modality=False,
common_properties=["image_size", "patch_size", "num_channels"],
)
def test_config(self): def test_config(self):
self.config_tester.create_and_test_config_to_json_string() self.config_tester.run_common_tests()
self.config_tester.create_and_test_config_to_json_file()
self.config_tester.create_and_test_config_from_and_save_pretrained()
self.config_tester.create_and_test_config_with_num_labels()
self.config_tester.check_config_can_be_init_without_params()
self.config_tester.check_config_arguments_init()
def test_model(self): def test_model(self):
config_and_inputs = self.model_tester.prepare_config_and_inputs() config_and_inputs = self.model_tester.prepare_config_and_inputs()
......
...@@ -175,15 +175,16 @@ class Swin2SRModelTest(ModelTesterMixin, PipelineTesterMixin, unittest.TestCase) ...@@ -175,15 +175,16 @@ class Swin2SRModelTest(ModelTesterMixin, PipelineTesterMixin, unittest.TestCase)
def setUp(self): def setUp(self):
self.model_tester = Swin2SRModelTester(self) self.model_tester = Swin2SRModelTester(self)
self.config_tester = ConfigTester(self, config_class=Swin2SRConfig, embed_dim=37) self.config_tester = ConfigTester(
self,
config_class=Swin2SRConfig,
embed_dim=37,
has_text_modality=False,
common_properties=["image_size", "patch_size", "num_channels"],
)
def test_config(self): def test_config(self):
self.config_tester.create_and_test_config_to_json_string() self.config_tester.run_common_tests()
self.config_tester.create_and_test_config_to_json_file()
self.config_tester.create_and_test_config_from_and_save_pretrained()
self.config_tester.create_and_test_config_with_num_labels()
self.config_tester.check_config_can_be_init_without_params()
self.config_tester.check_config_arguments_init()
def test_model(self): def test_model(self):
config_and_inputs = self.model_tester.prepare_config_and_inputs() config_and_inputs = self.model_tester.prepare_config_and_inputs()
......
...@@ -229,15 +229,16 @@ class Swinv2ModelTest(ModelTesterMixin, PipelineTesterMixin, unittest.TestCase): ...@@ -229,15 +229,16 @@ class Swinv2ModelTest(ModelTesterMixin, PipelineTesterMixin, unittest.TestCase):
def setUp(self): def setUp(self):
self.model_tester = Swinv2ModelTester(self) self.model_tester = Swinv2ModelTester(self)
self.config_tester = ConfigTester(self, config_class=Swinv2Config, embed_dim=37) self.config_tester = ConfigTester(
self,
config_class=Swinv2Config,
embed_dim=37,
has_text_modality=False,
common_properties=["image_size", "patch_size", "num_channels"],
)
def test_config(self): def test_config(self):
self.config_tester.create_and_test_config_to_json_string() self.config_tester.run_common_tests()
self.config_tester.create_and_test_config_to_json_file()
self.config_tester.create_and_test_config_from_and_save_pretrained()
self.config_tester.create_and_test_config_with_num_labels()
self.config_tester.check_config_can_be_init_without_params()
self.config_tester.check_config_arguments_init()
def test_model(self): def test_model(self):
config_and_inputs = self.model_tester.prepare_config_and_inputs() config_and_inputs = self.model_tester.prepare_config_and_inputs()
......
...@@ -18,7 +18,6 @@ import inspect ...@@ -18,7 +18,6 @@ import inspect
import unittest import unittest
from transformers import AutoBackbone from transformers import AutoBackbone
from transformers.configuration_utils import PretrainedConfig
from transformers.testing_utils import require_timm, require_torch, torch_device from transformers.testing_utils import require_timm, require_torch, torch_device
from transformers.utils.import_utils import is_torch_available from transformers.utils.import_utils import is_torch_available
...@@ -106,17 +105,15 @@ class TimmBackboneModelTest(ModelTesterMixin, BackboneTesterMixin, PipelineTeste ...@@ -106,17 +105,15 @@ class TimmBackboneModelTest(ModelTesterMixin, BackboneTesterMixin, PipelineTeste
has_attentions = False has_attentions = False
def setUp(self): def setUp(self):
self.config_class = PretrainedConfig # self.config_class = PretrainedConfig
self.config_class = TimmBackboneConfig
self.model_tester = TimmBackboneModelTester(self) self.model_tester = TimmBackboneModelTester(self)
self.config_tester = ConfigTester(self, config_class=self.config_class, has_text_modality=False) self.config_tester = ConfigTester(
self, config_class=self.config_class, has_text_modality=False, common_properties=["num_channels"]
)
def test_config(self): def test_config(self):
self.config_tester.create_and_test_config_to_json_string() self.config_tester.run_common_tests()
self.config_tester.create_and_test_config_to_json_file()
self.config_tester.create_and_test_config_from_and_save_pretrained()
self.config_tester.create_and_test_config_with_num_labels()
self.config_tester.check_config_can_be_init_without_params()
self.config_tester.check_config_arguments_init()
def test_timm_transformer_backbone_equivalence(self): def test_timm_transformer_backbone_equivalence(self):
timm_checkpoint = "resnet18" timm_checkpoint = "resnet18"
......
...@@ -121,20 +121,16 @@ class UnivNetModelTest(ModelTesterMixin, unittest.TestCase): ...@@ -121,20 +121,16 @@ class UnivNetModelTest(ModelTesterMixin, unittest.TestCase):
def setUp(self): def setUp(self):
self.model_tester = UnivNetModelTester(self) self.model_tester = UnivNetModelTester(self)
self.config_tester = ConfigTester(self, config_class=UnivNetConfig) self.config_tester = ConfigTester(
self, config_class=UnivNetConfig, has_text_modality=False, common_properties=["num_mel_bins"]
)
@unittest.skip(reason="fix this once it gets more usage") @unittest.skip(reason="fix this once it gets more usage")
def test_multi_gpu_data_parallel_forward(self): def test_multi_gpu_data_parallel_forward(self):
super().test_multi_gpu_data_parallel_forward() super().test_multi_gpu_data_parallel_forward()
def test_config(self): def test_config(self):
self.config_tester.create_and_test_config_to_json_string() self.config_tester.run_common_tests()
self.config_tester.create_and_test_config_to_json_file()
self.config_tester.create_and_test_config_from_and_save_pretrained()
self.config_tester.create_and_test_config_from_and_save_pretrained_subfolder()
self.config_tester.create_and_test_config_with_num_labels()
self.config_tester.check_config_can_be_init_without_params()
self.config_tester.check_config_arguments_init()
def test_model(self): def test_model(self):
config_and_inputs = self.model_tester.prepare_config_and_inputs() config_and_inputs = self.model_tester.prepare_config_and_inputs()
......
...@@ -161,15 +161,16 @@ class UperNetModelTest(ModelTesterMixin, PipelineTesterMixin, unittest.TestCase) ...@@ -161,15 +161,16 @@ class UperNetModelTest(ModelTesterMixin, PipelineTesterMixin, unittest.TestCase)
def setUp(self): def setUp(self):
self.model_tester = UperNetModelTester(self) self.model_tester = UperNetModelTester(self)
self.config_tester = ConfigTester(self, config_class=UperNetConfig, has_text_modality=False, hidden_size=37) self.config_tester = ConfigTester(
self,
config_class=UperNetConfig,
has_text_modality=False,
hidden_size=37,
common_properties=["hidden_size"],
)
def test_config(self): def test_config(self):
self.config_tester.create_and_test_config_to_json_string() self.config_tester.run_common_tests()
self.config_tester.create_and_test_config_to_json_file()
self.config_tester.create_and_test_config_from_and_save_pretrained()
self.config_tester.create_and_test_config_with_num_labels()
self.config_tester.check_config_can_be_init_without_params()
self.config_tester.check_config_arguments_init()
def test_for_semantic_segmentation(self): def test_for_semantic_segmentation(self):
config_and_inputs = self.model_tester.prepare_config_and_inputs() config_and_inputs = self.model_tester.prepare_config_and_inputs()
......
...@@ -146,15 +146,16 @@ class VitMatteModelTest(ModelTesterMixin, PipelineTesterMixin, unittest.TestCase ...@@ -146,15 +146,16 @@ class VitMatteModelTest(ModelTesterMixin, PipelineTesterMixin, unittest.TestCase
def setUp(self): def setUp(self):
self.model_tester = VitMatteModelTester(self) self.model_tester = VitMatteModelTester(self)
self.config_tester = ConfigTester(self, config_class=VitMatteConfig, has_text_modality=False, hidden_size=37) self.config_tester = ConfigTester(
self,
config_class=VitMatteConfig,
has_text_modality=False,
hidden_size=37,
common_properties=["hidden_size"],
)
def test_config(self): def test_config(self):
self.config_tester.create_and_test_config_to_json_string() self.config_tester.run_common_tests()
self.config_tester.create_and_test_config_to_json_file()
self.config_tester.create_and_test_config_from_and_save_pretrained()
self.config_tester.create_and_test_config_with_num_labels()
self.config_tester.check_config_can_be_init_without_params()
self.config_tester.check_config_arguments_init()
@unittest.skip(reason="VitMatte does not use inputs_embeds") @unittest.skip(reason="VitMatte does not use inputs_embeds")
def test_inputs_embeds(self): def test_inputs_embeds(self):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment