Skip to content

Commit dfb8658

Browse files
committed
Fix a few missed model deprecations and one missed pretrained cfg
1 parent 057fdb5 commit dfb8658

File tree

2 files changed

+6
-35
lines changed

2 files changed

+6
-35
lines changed

timm/models/efficientnet.py

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1441,12 +1441,6 @@ def mnasnet_100(pretrained=False, **kwargs) -> EfficientNet:
14411441
return model
14421442

14431443

1444-
@register_model
1445-
def mnasnet_b1(pretrained=False, **kwargs) -> EfficientNet:
1446-
""" MNASNet B1, depth multiplier of 1.0. """
1447-
return mnasnet_100(pretrained, **kwargs)
1448-
1449-
14501444
@register_model
14511445
def mnasnet_140(pretrained=False, **kwargs) -> EfficientNet:
14521446
""" MNASNet B1, depth multiplier of 1.4 """
@@ -1475,12 +1469,6 @@ def semnasnet_100(pretrained=False, **kwargs) -> EfficientNet:
14751469
return model
14761470

14771471

1478-
@register_model
1479-
def mnasnet_a1(pretrained=False, **kwargs) -> EfficientNet:
1480-
""" MNASNet A1 (w/ SE), depth multiplier of 1.0. """
1481-
return semnasnet_100(pretrained, **kwargs)
1482-
1483-
14841472
@register_model
14851473
def semnasnet_140(pretrained=False, **kwargs) -> EfficientNet:
14861474
""" MNASNet A1 (w/ SE), depth multiplier of 1.4. """
@@ -1590,13 +1578,6 @@ def efficientnet_b2(pretrained=False, **kwargs) -> EfficientNet:
15901578
return model
15911579

15921580

1593-
@register_model
1594-
def efficientnet_b2a(pretrained=False, **kwargs) -> EfficientNet:
1595-
""" EfficientNet-B2 @ 288x288 w/ 1.0 test crop"""
1596-
# WARN this model def is deprecated, different train/test res + test crop handled by default_cfg now
1597-
return efficientnet_b2(pretrained=pretrained, **kwargs)
1598-
1599-
16001581
@register_model
16011582
def efficientnet_b3(pretrained=False, **kwargs) -> EfficientNet:
16021583
""" EfficientNet-B3 """
@@ -1606,13 +1587,6 @@ def efficientnet_b3(pretrained=False, **kwargs) -> EfficientNet:
16061587
return model
16071588

16081589

1609-
@register_model
1610-
def efficientnet_b3a(pretrained=False, **kwargs) -> EfficientNet:
1611-
""" EfficientNet-B3 @ 320x320 w/ 1.0 test crop-pct """
1612-
# WARN this model def is deprecated, different train/test res + test crop handled by default_cfg now
1613-
return efficientnet_b3(pretrained=pretrained, **kwargs)
1614-
1615-
16161590
@register_model
16171591
def efficientnet_b4(pretrained=False, **kwargs) -> EfficientNet:
16181592
""" EfficientNet-B4 """
@@ -2361,4 +2335,8 @@ def tinynet_e(pretrained=False, **kwargs) -> EfficientNet:
23612335
'tf_efficientnetv2_m_in21k': 'tf_efficientnetv2_m.in21k',
23622336
'tf_efficientnetv2_l_in21k': 'tf_efficientnetv2_l.in21k',
23632337
'tf_efficientnetv2_xl_in21k': 'tf_efficientnetv2_xl.in21k',
2338+
'efficientnet_b2a': 'efficientnet_b2',
2339+
'efficientnet_b3a': 'efficientnet_b3',
2340+
'mnasnet_a1': 'semnasnet_100',
2341+
'mnasnet_b1': 'mnasnet_100',
23642342
})

timm/models/resnet.py

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1116,6 +1116,7 @@ def _gcfg(url='', **kwargs):
11161116
url='https://github.com/rwightman/pytorch-image-models/releases/download/v0.1-weights/resnetblur50-84f4748f.pth'),
11171117
'resnetblur50d.untrained': _ttcfg(first_conv='conv1.0'),
11181118
'resnetblur101d.untrained': _ttcfg(first_conv='conv1.0'),
1119+
'resnetaa34d.untrained': _ttcfg(first_conv='conv1.0'),
11191120
'resnetaa50.a1h_in1k': _rcfg(
11201121
hf_hub_id='timm/',
11211122
url='https://github.com/rwightman/pytorch-image-models/releases/download/v0.1-rsb-weights/resnetaa50_a1h-4cf422b3.pth'),
@@ -1730,15 +1731,6 @@ def seresnext26t_32x4d(pretrained: bool = False, **kwargs) -> ResNet:
17301731
return _create_resnet('seresnext26t_32x4d', pretrained, **dict(model_args, **kwargs))
17311732

17321733

1733-
@register_model
1734-
def seresnext26tn_32x4d(pretrained: bool = False, **kwargs) -> ResNet:
1735-
"""Constructs a SE-ResNeXt-26-T model.
1736-
NOTE I deprecated previous 't' model defs and replaced 't' with 'tn', this was the only tn model of note
1737-
so keeping this def for backwards compat with any uses out there. Old 't' model is lost.
1738-
"""
1739-
return seresnext26t_32x4d(pretrained=pretrained, **kwargs)
1740-
1741-
17421734
@register_model
17431735
def seresnext50_32x4d(pretrained: bool = False, **kwargs) -> ResNet:
17441736
model_args = dict(
@@ -2028,4 +2020,5 @@ def resnetrs420(pretrained: bool = False, **kwargs) -> ResNet:
20282020
'gluon_seresnext101_32x4d': 'seresnext101_32x4d.gluon_in1k',
20292021
'gluon_seresnext101_64x4d': 'seresnext101_64x4d.gluon_in1k',
20302022
'gluon_senet154': 'senet154.gluon_in1k',
2023+
'seresnext26tn_32x4d': 'seresnext26t_32x4d',
20312024
})

0 commit comments

Comments
 (0)