Migrations
/
pytorch-image-models
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Run PyCharm autoformat on selecsls and change mix cap variables and model names to all lower

Browse Source
pull/66/head
Ross Wightman 5 years ago
parent fb3a0f4bb8
commit d59a756c16
1 changed files with 143 additions and 139 deletions
Show Stats Download Patch File Download Diff File

60
timm/models/selecsls.py
Unescape View File

@ -20,7 +20,6 @@ from .helpers import load_pretrained
from .adaptive_avgmax_pool import SelectAdaptivePool2d
from timm.data import IMAGENET_DEFAULT_MEAN, IMAGENET_DEFAULT_STD
__all__ = ['SelecSLS'] # model_registry will add each entrypoint fn to this
@ -39,13 +38,13 @@ default_cfgs = {
'selecsls42': _cfg(
url='',
interpolation='bicubic'),
'selecsls42_B': _cfg(
'selecsls42b': _cfg(
url='http://gvv.mpi-inf.mpg.de/projects/XNect/assets/models/SelecSLS42_B.pth',
interpolation='bicubic'),
'selecsls60': _cfg(
url='',
interpolation='bicubic'),
'selecsls60_B': _cfg(
'selecsls60b': _cfg(
url='http://gvv.mpi-inf.mpg.de/projects/XNect/assets/models/SelecSLS60_B.pth',
interpolation='bicubic'),
'selecsls84': _cfg(
@ -69,11 +68,12 @@ def conv_1x1_bn(inp, oup):
nn.ReLU(inplace=True)
)
class SelecSLSBlock(nn.Module):
def __init__(self, inp, skip, k, oup, isFirst, stride):
def __init__(self, inp, skip, k, oup, is_first, stride):
super(SelecSLSBlock, self).__init__()
self.stride = stride
self.isFirst = isFirst
self.is_first = is_first
assert stride in [1, 2]
# Process input with 4 conv blocks with the same number of input and output channels
@ -103,7 +103,7 @@ class SelecSLSBlock(nn.Module):
nn.ReLU(inplace=True)
)
self.conv6 = nn.Sequential(
nn.Conv2d(2*k + (0 if isFirst else skip), oup, 1, 1, 0,groups= 1, bias=False, dilation=1),
nn.Conv2d(2 * k + (0 if is_first else skip), oup, 1, 1, 0, groups=1, bias=False, dilation=1),
nn.BatchNorm2d(oup),
nn.ReLU(inplace=True)
)
@ -115,12 +115,13 @@ class SelecSLSBlock(nn.Module):
d1 = self.conv1(x[0])
d2 = self.conv3(self.conv2(d1))
d3 = self.conv5(self.conv4(d2))
if self.isFirst:
if self.is_first:
out = self.conv6(torch.cat([d1, d2, d3], 1))
return [out, out]
else:
return [self.conv6(torch.cat([d1, d2, d3, x[1]], 1)), x[1]]
class SelecSLS(nn.Module):
"""SelecSLS42 / SelecSLS60 / SelecSLS84
@ -137,6 +138,7 @@ class SelecSLS(nn.Module):
global_pool : str, default 'avg'
Global pooling type. One of 'avg', 'max', 'avgmax', 'catavgmax'
"""
def __init__(self, cfg='selecsls60', num_classes=1000, in_chans=3,
drop_rate=0.0, global_pool='avg'):
self.num_classes = num_classes
@ -149,8 +151,8 @@ class SelecSLS(nn.Module):
if cfg == 'selecsls42':
self.block = SelecSLSBlock
# Define configuration of the network after the initial neck
self.selecSLS_config = [
#inp,skip, k, oup, isFirst, stride
self.selecsls_config = [
# inp,skip, k, oup, is_first, stride
[32, 0, 64, 64, True, 2],
[64, 64, 64, 128, False, 1],
[128, 0, 144, 144, True, 2],
@ -166,11 +168,11 @@ class SelecSLS(nn.Module):
conv_1x1_bn(1024, 1280),
)
self.num_features = 1280
elif cfg=='selecsls42_B':
elif cfg == 'selecsls42b':
self.block = SelecSLSBlock
# Define configuration of the network after the initial neck
self.selecSLS_config = [
#inp,skip, k, oup, isFirst, stride
self.selecsls_config = [
# inp,skip, k, oup, is_first, stride
[32, 0, 64, 64, True, 2],
[64, 64, 64, 128, False, 1],
[128, 0, 144, 144, True, 2],
@ -189,8 +191,8 @@ class SelecSLS(nn.Module):
elif cfg == 'selecsls60':
self.block = SelecSLSBlock
# Define configuration of the network after the initial neck
self.selecSLS_config = [
#inp,skip, k, oup, isFirst, stride
self.selecsls_config = [
# inp,skip, k, oup, is_first, stride
[32, 0, 64, 64, True, 2],
[64, 64, 64, 128, False, 1],
[128, 0, 128, 128, True, 2],
@ -209,11 +211,11 @@ class SelecSLS(nn.Module):
conv_1x1_bn(1024, 1280),
)
self.num_features = 1280
elif cfg=='selecsls60_B':
elif cfg == 'selecsls60b':
self.block = SelecSLSBlock
# Define configuration of the network after the initial neck
self.selecSLS_config = [
#inp,skip, k, oup, isFirst, stride
self.selecsls_config = [
# inp,skip, k, oup, is_first, stride
[32, 0, 64, 64, True, 2],
[64, 64, 64, 128, False, 1],
[128, 0, 128, 128, True, 2],
@ -235,8 +237,8 @@ class SelecSLS(nn.Module):
elif cfg == 'selecsls84':
self.block = SelecSLSBlock
# Define configuration of the network after the initial neck
self.selecSLS_config = [
#inp,skip, k, oup, isFirst, stride
self.selecsls_config = [
# inp,skip, k, oup, is_first, stride
[32, 0, 64, 64, True, 2],
[64, 64, 64, 144, False, 1],
[144, 0, 144, 144, True, 2],
@ -262,8 +264,8 @@ class SelecSLS(nn.Module):
else:
raise ValueError('Invalid net configuration ' + cfg + ' !!!')
for inp, skip, k, oup, isFirst, stride in self.selecSLS_config:
self.features.append(self.block(inp, skip, k, oup, isFirst, stride))
for inp, skip, k, oup, is_first, stride in self.selecsls_config:
self.features.append(self.block(inp, skip, k, oup, is_first, stride))
self.features = nn.Sequential(*self.features)
self.global_pool = SelectAdaptivePool2d(pool_type=global_pool)
self.fc = nn.Linear(self.num_features * self.global_pool.feat_mult(), num_classes)
@ -317,18 +319,20 @@ def selecsls42(pretrained=False, num_classes=1000, in_chans=3, **kwargs):
load_pretrained(model, default_cfg, num_classes, in_chans)
return model
@register_model
def selecsls42_B(pretrained=False, num_classes=1000, in_chans=3, **kwargs):
def selecsls42b(pretrained=False, num_classes=1000, in_chans=3, **kwargs):
"""Constructs a SelecSLS42_B model.
"""
default_cfg = default_cfgs['selecsls42_B']
default_cfg = default_cfgs['selecsls42b']
model = SelecSLS(
cfg='selecsls42_B', num_classes=1000, in_chans=3,**kwargs)
cfg='selecsls42b', num_classes=1000, in_chans=3, **kwargs)
model.default_cfg = default_cfg
if pretrained:
load_pretrained(model, default_cfg, num_classes, in_chans)
return model
@register_model
def selecsls60(pretrained=False, num_classes=1000, in_chans=3, **kwargs):
"""Constructs a SelecSLS60 model.
@ -343,17 +347,18 @@ def selecsls60(pretrained=False, num_classes=1000, in_chans=3, **kwargs):
@register_model
def selecsls60_B(pretrained=False, num_classes=1000, in_chans=3, **kwargs):
def selecsls60b(pretrained=False, num_classes=1000, in_chans=3, **kwargs):
"""Constructs a SelecSLS60_B model.
"""
default_cfg = default_cfgs['selecsls60_B']
default_cfg = default_cfgs['selecsls60b']
model = SelecSLS(
cfg='selecsls60_B', num_classes=1000, in_chans=3,**kwargs)
cfg='selecsls60b', num_classes=1000, in_chans=3, **kwargs)
model.default_cfg = default_cfg
if pretrained:
load_pretrained(model, default_cfg, num_classes, in_chans)
return model
@register_model
def selecsls84(pretrained=False, num_classes=1000, in_chans=3, **kwargs):
"""Constructs a SelecSLS84 model.
@ -365,4 +370,3 @@ def selecsls84(pretrained=False, num_classes=1000, in_chans=3, **kwargs):
if pretrained:
load_pretrained(model, default_cfg, num_classes, in_chans)
return model

Write Preview
Loading…
Cancel
Save