mirrors
/
mmsegmentation
mirror of https://github.com/open-mmlab/mmsegmentation.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

_make_layer parameters renamed.

pull/58/head
johnzja 2020-08-13 09:42:26 +08:00
parent 661ef92a35
commit 12d00908ec
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mmseg/models/backbones/fast_scnn.py
View File

@ -113,13 +113,13 @@ class GlobalFeatureExtractor(nn.Module):
self.act_cfg = act_cfg self.act_cfg = act_cfg
assert len(block_channels) == len(num_blocks) == 3 assert len(block_channels) == len(num_blocks) == 3
self.bottleneck1 = self._make_layer(in_channels, block_channels[0], self.bottleneck1 = self._make_layer(in_channels, block_channels[0],
num_blocks[0], expand_ratio, 2) num_blocks[0], 2, expand_ratio)
self.bottleneck2 = self._make_layer(block_channels[0], self.bottleneck2 = self._make_layer(block_channels[0],
block_channels[1], num_blocks[1], block_channels[1], num_blocks[1],
expand_ratio, 2) 2, expand_ratio)
self.bottleneck3 = self._make_layer(block_channels[1], self.bottleneck3 = self._make_layer(block_channels[1],
block_channels[2], num_blocks[2], block_channels[2], num_blocks[2],
expand_ratio, 1) 1, expand_ratio)
self.ppm = PPM( self.ppm = PPM(
pool_scales, pool_scales,
block_channels[2], block_channels[2],
@ -136,15 +136,15 @@ class GlobalFeatureExtractor(nn.Module):
norm_cfg=self.norm_cfg, norm_cfg=self.norm_cfg,
act_cfg=self.act_cfg) act_cfg=self.act_cfg)
def _make_layer(self, inplanes, planes, blocks, expand_ratio=6, stride=1): def _make_layer(self, in_channels, out_channels, blocks, stride=1, expand_ratio=6):
layers = [ layers = [
InvertedResidual( InvertedResidual(
inplanes, planes, stride, expand_ratio, norm_cfg=self.norm_cfg) in_channels, out_channels, stride, expand_ratio, norm_cfg=self.norm_cfg)
] ]
for i in range(1, blocks): for i in range(1, blocks):
layers.append( layers.append(
InvertedResidual( InvertedResidual(
planes, planes, 1, expand_ratio, norm_cfg=self.norm_cfg)) out_channels, out_channels, 1, expand_ratio, norm_cfg=self.norm_cfg))
return nn.Sequential(*layers) return nn.Sequential(*layers)
def forward(self, x): def forward(self, x):