[configuration] remove redundant classmethod (#38812)
* remove redundant classmethod * warning message, add space between words * fix tests * fix copies
This commit is contained in:
committed by
GitHub
parent
02ea23cbde
commit
b56d721397
@@ -408,8 +408,10 @@ class AlignModelTester:
|
||||
return config, input_ids, token_type_ids, input_mask, pixel_values
|
||||
|
||||
def get_config(self):
|
||||
return AlignConfig.from_text_vision_configs(
|
||||
self.text_model_tester.get_config(), self.vision_model_tester.get_config(), projection_dim=64
|
||||
return AlignConfig(
|
||||
text_config=self.text_model_tester.get_config().to_dict(),
|
||||
vision_config=self.vision_model_tester.get_config().to_dict(),
|
||||
projection_dim=64,
|
||||
)
|
||||
|
||||
def create_and_check_model(self, config, input_ids, token_type_ids, attention_mask, pixel_values):
|
||||
|
||||
@@ -376,8 +376,10 @@ class AltCLIPModelTester:
|
||||
return config, input_ids, attention_mask, pixel_values
|
||||
|
||||
def get_config(self):
|
||||
return AltCLIPConfig.from_text_vision_configs(
|
||||
self.text_model_tester.get_config(), self.vision_model_tester.get_config(), projection_dim=64
|
||||
return AltCLIPConfig(
|
||||
text_config=self.text_model_tester.get_config().to_dict(),
|
||||
vision_config=self.vision_model_tester.get_config().to_dict(),
|
||||
projection_dim=64,
|
||||
)
|
||||
|
||||
def create_and_check_model(self, config, input_ids, attention_mask, pixel_values):
|
||||
|
||||
@@ -381,8 +381,10 @@ class BlipModelTester:
|
||||
return config, input_ids, attention_mask, pixel_values
|
||||
|
||||
def get_config(self):
|
||||
return BlipConfig.from_text_vision_configs(
|
||||
self.text_model_tester.get_config(), self.vision_model_tester.get_config(), projection_dim=64
|
||||
return BlipConfig(
|
||||
text_config=self.text_model_tester.get_config().to_dict(),
|
||||
vision_config=self.vision_model_tester.get_config().to_dict(),
|
||||
projection_dim=64,
|
||||
)
|
||||
|
||||
def create_and_check_model(self, config, input_ids, attention_mask, pixel_values):
|
||||
@@ -664,8 +666,10 @@ class BlipTextRetrievalModelTester:
|
||||
return config, input_ids, attention_mask, pixel_values
|
||||
|
||||
def get_config(self):
|
||||
return BlipConfig.from_text_vision_configs(
|
||||
self.text_model_tester.get_config(), self.vision_model_tester.get_config(), projection_dim=64
|
||||
return BlipConfig(
|
||||
text_config=self.text_model_tester.get_config().to_dict(),
|
||||
vision_config=self.vision_model_tester.get_config().to_dict(),
|
||||
projection_dim=64,
|
||||
)
|
||||
|
||||
def create_and_check_model(self, config, input_ids, attention_mask, pixel_values):
|
||||
@@ -713,8 +717,10 @@ class BlipTextImageModelsModelTester:
|
||||
return config, input_ids, attention_mask, pixel_values
|
||||
|
||||
def get_config(self):
|
||||
return BlipConfig.from_text_vision_configs(
|
||||
self.text_model_tester.get_config(), self.vision_model_tester.get_config(), projection_dim=64
|
||||
return BlipConfig(
|
||||
text_config=self.text_model_tester.get_config().to_dict(),
|
||||
vision_config=self.vision_model_tester.get_config().to_dict(),
|
||||
projection_dim=64,
|
||||
)
|
||||
|
||||
def create_and_check_model(self, config, input_ids, attention_mask, pixel_values):
|
||||
@@ -761,8 +767,10 @@ class BlipVQAModelTester:
|
||||
return config, input_ids, attention_mask, pixel_values
|
||||
|
||||
def get_config(self):
|
||||
return BlipConfig.from_text_vision_configs(
|
||||
self.text_model_tester.get_config(), self.vision_model_tester.get_config(), projection_dim=64
|
||||
return BlipConfig(
|
||||
text_config=self.text_model_tester.get_config().to_dict(),
|
||||
vision_config=self.vision_model_tester.get_config().to_dict(),
|
||||
projection_dim=64,
|
||||
)
|
||||
|
||||
def create_and_check_model(self, config, input_ids, attention_mask, pixel_values):
|
||||
|
||||
@@ -203,9 +203,9 @@ class BridgeTowerModelTester:
|
||||
return (config, input_ids, attention_mask, pixel_values, pixel_mask)
|
||||
|
||||
def get_config(self):
|
||||
return BridgeTowerConfig.from_text_vision_configs(
|
||||
text_config=self.text_model_tester.get_config(),
|
||||
vision_config=self.vision_model_tester.get_config(),
|
||||
return BridgeTowerConfig(
|
||||
text_config=self.text_model_tester.get_config().to_dict(),
|
||||
vision_config=self.vision_model_tester.get_config().to_dict(),
|
||||
share_cross_modal_transformer_layers=self.share_cross_modal_transformer_layers,
|
||||
share_link_tower_layers=self.share_link_tower_layers,
|
||||
link_tower_type=self.link_tower_type,
|
||||
|
||||
@@ -515,8 +515,10 @@ class ChineseCLIPModelTester:
|
||||
return config, input_ids, token_type_ids, attention_mask, pixel_values
|
||||
|
||||
def get_config(self):
|
||||
return ChineseCLIPConfig.from_text_vision_configs(
|
||||
self.text_model_tester.get_config(), self.vision_model_tester.get_config(), projection_dim=64
|
||||
return ChineseCLIPConfig(
|
||||
text_config=self.text_model_tester.get_config().to_dict(),
|
||||
vision_config=self.vision_model_tester.get_config().to_dict(),
|
||||
projection_dim=64,
|
||||
)
|
||||
|
||||
def create_and_check_model(self, config, input_ids, token_type_ids, attention_mask, pixel_values):
|
||||
|
||||
@@ -459,8 +459,10 @@ class ClapModelTester:
|
||||
return config, input_ids, attention_mask, input_features
|
||||
|
||||
def get_config(self):
|
||||
return ClapConfig.from_text_audio_configs(
|
||||
self.text_model_tester.get_config(), self.audio_model_tester.get_config(), projection_dim=64
|
||||
return ClapConfig(
|
||||
text_config=self.text_model_tester.get_config().to_dict(),
|
||||
audio_config=self.audio_model_tester.get_config().to_dict(),
|
||||
projection_dim=64,
|
||||
)
|
||||
|
||||
def create_and_check_model(self, config, input_ids, attention_mask, input_features):
|
||||
|
||||
@@ -502,8 +502,10 @@ class CLIPModelTester:
|
||||
return config, input_ids, attention_mask, pixel_values
|
||||
|
||||
def get_config(self):
|
||||
return CLIPConfig.from_text_vision_configs(
|
||||
self.text_model_tester.get_config(), self.vision_model_tester.get_config(), projection_dim=64
|
||||
return CLIPConfig(
|
||||
text_config=self.text_model_tester.get_config().to_dict(),
|
||||
vision_config=self.vision_model_tester.get_config().to_dict(),
|
||||
projection_dim=64,
|
||||
)
|
||||
|
||||
def create_and_check_model(self, config, input_ids, attention_mask, pixel_values):
|
||||
|
||||
@@ -374,9 +374,9 @@ class CLIPSegModelTester:
|
||||
return config, input_ids, attention_mask, pixel_values
|
||||
|
||||
def get_config(self):
|
||||
return CLIPSegConfig.from_text_vision_configs(
|
||||
self.text_model_tester.get_config(),
|
||||
self.vision_model_tester.get_config(),
|
||||
return CLIPSegConfig(
|
||||
text_config=self.text_model_tester.get_config().to_dict(),
|
||||
vision_config=self.vision_model_tester.get_config().to_dict(),
|
||||
projection_dim=64,
|
||||
reduce_dim=32,
|
||||
extract_layers=self.extract_layers,
|
||||
|
||||
@@ -216,7 +216,7 @@ class EfficientLoFTRModelTest(ModelTesterMixin, unittest.TestCase):
|
||||
|
||||
self.assertListEqual(
|
||||
list(hidden_states[0].shape[-2:]),
|
||||
[self.model_tester.image_height // 2, self.model_tester.image_width // 2],
|
||||
[self.model_tester.image_height, self.model_tester.image_width],
|
||||
)
|
||||
|
||||
config, inputs_dict = self.model_tester.prepare_config_and_inputs_for_common()
|
||||
|
||||
@@ -497,8 +497,10 @@ class GroupViTModelTester:
|
||||
return config, input_ids, attention_mask, pixel_values
|
||||
|
||||
def get_config(self):
|
||||
return GroupViTConfig.from_text_vision_configs(
|
||||
self.text_model_tester.get_config(), self.vision_model_tester.get_config(), projection_dim=64
|
||||
return GroupViTConfig(
|
||||
text_config=self.text_model_tester.get_config().to_dict(),
|
||||
vision_config=self.vision_model_tester.get_config().to_dict(),
|
||||
projection_dim=64,
|
||||
)
|
||||
|
||||
def create_and_check_model(self, config, input_ids, attention_mask, pixel_values):
|
||||
|
||||
@@ -375,7 +375,11 @@ class Owlv2ModelTester:
|
||||
return config, input_ids, attention_mask, pixel_values
|
||||
|
||||
def get_config(self):
|
||||
return Owlv2Config.from_text_vision_configs(self.text_config, self.vision_config, projection_dim=64)
|
||||
return Owlv2Config(
|
||||
text_config=self.text_config,
|
||||
vision_config=self.vision_config,
|
||||
projection_dim=64,
|
||||
)
|
||||
|
||||
def create_and_check_model(self, config, input_ids, attention_mask, pixel_values):
|
||||
model = Owlv2Model(config).to(torch_device).eval()
|
||||
@@ -589,7 +593,11 @@ class Owlv2ForObjectDetectionTester:
|
||||
return config, pixel_values, input_ids, attention_mask
|
||||
|
||||
def get_config(self):
|
||||
return Owlv2Config.from_text_vision_configs(self.text_config, self.vision_config, projection_dim=64)
|
||||
return Owlv2Config(
|
||||
text_config=self.text_config,
|
||||
vision_config=self.vision_config,
|
||||
projection_dim=64,
|
||||
)
|
||||
|
||||
def create_and_check_model(self, config, pixel_values, input_ids, attention_mask):
|
||||
model = Owlv2ForObjectDetection(config).to(torch_device).eval()
|
||||
|
||||
@@ -371,7 +371,11 @@ class OwlViTModelTester:
|
||||
return config, input_ids, attention_mask, pixel_values
|
||||
|
||||
def get_config(self):
|
||||
return OwlViTConfig.from_text_vision_configs(self.text_config, self.vision_config, projection_dim=64)
|
||||
return OwlViTConfig(
|
||||
text_config=self.text_config,
|
||||
vision_config=self.vision_config,
|
||||
projection_dim=64,
|
||||
)
|
||||
|
||||
def create_and_check_model(self, config, input_ids, attention_mask, pixel_values):
|
||||
model = OwlViTModel(config).to(torch_device).eval()
|
||||
@@ -583,7 +587,11 @@ class OwlViTForObjectDetectionTester:
|
||||
return config, pixel_values, input_ids, attention_mask
|
||||
|
||||
def get_config(self):
|
||||
return OwlViTConfig.from_text_vision_configs(self.text_config, self.vision_config, projection_dim=64)
|
||||
return OwlViTConfig(
|
||||
text_config=self.text_config,
|
||||
vision_config=self.vision_config,
|
||||
projection_dim=64,
|
||||
)
|
||||
|
||||
def create_and_check_model(self, config, pixel_values, input_ids, attention_mask):
|
||||
model = OwlViTForObjectDetection(config).to(torch_device).eval()
|
||||
|
||||
@@ -383,7 +383,11 @@ class Pix2StructModelTester:
|
||||
return config, input_ids, attention_mask, flattened_patches
|
||||
|
||||
def get_config(self, text_config, vision_config):
|
||||
return Pix2StructConfig.from_text_vision_configs(text_config, vision_config, projection_dim=64)
|
||||
return Pix2StructConfig(
|
||||
text_config=self.text_model_tester.get_config().to_dict(),
|
||||
vision_config=self.vision_model_tester.get_config().to_dict(),
|
||||
projection_dim=64,
|
||||
)
|
||||
|
||||
def prepare_config_and_inputs_for_common(self):
|
||||
config_and_inputs = self.prepare_config_and_inputs()
|
||||
|
||||
@@ -428,9 +428,9 @@ class SiglipModelTester:
|
||||
return config, input_ids, attention_mask, pixel_values
|
||||
|
||||
def get_config(self):
|
||||
return SiglipConfig.from_text_vision_configs(
|
||||
self.text_model_tester.get_config(),
|
||||
self.vision_model_tester.get_config(),
|
||||
return SiglipConfig(
|
||||
text_config=self.text_model_tester.get_config().to_dict(),
|
||||
vision_config=self.vision_model_tester.get_config().to_dict(),
|
||||
)
|
||||
|
||||
def create_and_check_model(self, config, input_ids, attention_mask, pixel_values):
|
||||
|
||||
@@ -514,9 +514,9 @@ class Siglip2ModelTester:
|
||||
return config, input_ids, attention_mask, pixel_values, pixel_attention_mask, spatial_shapes
|
||||
|
||||
def get_config(self):
|
||||
return Siglip2Config.from_text_vision_configs(
|
||||
self.text_model_tester.get_config(),
|
||||
self.vision_model_tester.get_config(),
|
||||
return Siglip2Config(
|
||||
text_config=self.text_model_tester.get_config().to_dict(),
|
||||
vision_config=self.vision_model_tester.get_config().to_dict(),
|
||||
)
|
||||
|
||||
def create_and_check_model(
|
||||
|
||||
@@ -493,9 +493,9 @@ class XCLIPModelTester:
|
||||
return config, input_ids, attention_mask, pixel_values
|
||||
|
||||
def get_config(self):
|
||||
return XCLIPConfig.from_text_vision_configs(
|
||||
self.text_model_tester.get_config(),
|
||||
self.vision_model_tester.get_config(),
|
||||
return XCLIPConfig(
|
||||
text_config=self.text_model_tester.get_config().to_dict(),
|
||||
vision_config=self.vision_model_tester.get_config().to_dict(),
|
||||
projection_dim=self.projection_dim,
|
||||
)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user