Missed comitting outstanding changes to default_cfg keys and test exc…

…lusions for swin v2
ares89 · Feb 24, 2022 · 1420c11 · 1420c11
1 parent c6e4b78
commit 1420c11
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/tests/test_models.py b/tests/test_models.py
@@ -33,8 +33,9 @@
     EXCLUDE_FILTERS = [
         '*efficientnet_l2*', '*resnext101_32x48d', '*in21k', '*152x4_bitm', '*101x3_bitm', '*50x3_bitm',
         '*nfnet_f3*', '*nfnet_f4*', '*nfnet_f5*', '*nfnet_f6*', '*nfnet_f7*', '*efficientnetv2_xl*',
-        '*resnetrs350*', '*resnetrs420*', 'xcit_large_24_p8*', 'vit_huge*', 'vit_gi*']
-    NON_STD_EXCLUDE_FILTERS = ['vit_huge*', 'vit_gi*']
+        '*resnetrs350*', '*resnetrs420*', 'xcit_large_24_p8*', 'vit_huge*', 'vit_gi*', 'swin*huge*',
+        'swin*giant*']
+    NON_STD_EXCLUDE_FILTERS = ['vit_huge*', 'vit_gi*', 'swin*giant*']
 else:
     EXCLUDE_FILTERS = []
     NON_STD_EXCLUDE_FILTERS = ['vit_gi*']

diff --git a/timm/models/swin_transformer_v2_cr.py b/timm/models/swin_transformer_v2_cr.py
@@ -813,8 +813,7 @@ def swin_v2_cr_small_384(pretrained=False, **kwargs):
         num_heads=(3, 6, 12, 24),
         **kwargs
     )
-    return _create_swin_transformer_v2_cr(
-        'swin_v2_cr_small_384', pretrained=pretrained, **model_kwargs
+    return _create_swin_transformer_v2_cr('swin_v2_cr_small_384', pretrained=pretrained, **model_kwargs
     )
 
 
@@ -863,8 +862,7 @@ def swin_v2_cr_large_384(pretrained=False, **kwargs):
         num_heads=(6, 12, 24, 48),
         **kwargs
     )
-    return _create_swin_transformer_v2_cr(
-        'swin_v2_cr_large_384', pretrained=pretrained, **model_kwargs
+    return _create_swin_transformer_v2_cr('swin_v2_cr_large_384', pretrained=pretrained, **model_kwargs
     )
 
 
@@ -877,7 +875,7 @@ def swin_v2_cr_large_224(pretrained=False, **kwargs):
         num_heads=(6, 12, 24, 48),
         **kwargs
     )
-    return _create_swin_transformer_v2_cr('swin_v2_cr_large_patch4_window7_224', pretrained=pretrained, **model_kwargs)
+    return _create_swin_transformer_v2_cr('swin_v2_cr_large_224', pretrained=pretrained, **model_kwargs)
 
 
 @register_model
@@ -890,7 +888,7 @@ def swin_v2_cr_huge_384(pretrained=False, **kwargs):
         extra_norm_period=6,
         **kwargs
     )
-    return _create_swin_transformer_v2_cr('swin_v2_cr_huge_patch4_window12_384', pretrained=pretrained, **model_kwargs)
+    return _create_swin_transformer_v2_cr('swin_v2_cr_huge_384', pretrained=pretrained, **model_kwargs)
 
 
 @register_model
@@ -903,7 +901,7 @@ def swin_v2_cr_huge_224(pretrained=False, **kwargs):
         extra_norm_period=6,
         **kwargs
     )
-    return _create_swin_transformer_v2_cr('swin_v2_cr_huge_patch4_window7_224', pretrained=pretrained, **model_kwargs)
+    return _create_swin_transformer_v2_cr('swin_v2_cr_huge_224', pretrained=pretrained, **model_kwargs)
 
 
 @register_model
@@ -916,8 +914,7 @@ def swin_v2_cr_giant_384(pretrained=False, **kwargs):
         extra_norm_period=6,
         **kwargs
     )
-    return _create_swin_transformer_v2_cr(
-        'swin_v2_cr_giant_384', pretrained=pretrained, **model_kwargs
+    return _create_swin_transformer_v2_cr('swin_v2_cr_giant_384', pretrained=pretrained, **model_kwargs
     )