未验证 提交 95ed78e2 编写于 作者: L littletomatodonkey 提交者: GitHub

Merge pull request #237 from littletomatodonkey/fix_other_typo

fix typo
...@@ -124,14 +124,14 @@ class BottleneckBlock(fluid.dygraph.Layer): ...@@ -124,14 +124,14 @@ class BottleneckBlock(fluid.dygraph.Layer):
return layer_helper.append_activation(y) return layer_helper.append_activation(y)
class BisicBlock(fluid.dygraph.Layer): class BasicBlock(fluid.dygraph.Layer):
def __init__(self, def __init__(self,
num_channels, num_channels,
num_filters, num_filters,
stride, stride,
shortcut=True, shortcut=True,
name=None): name=None):
super(BisicBlock, self).__init__() super(BasicBlock, self).__init__()
self.stride = stride self.stride = stride
self.conv0 = ConvBNLayer( self.conv0 = ConvBNLayer(
num_channels=num_channels, num_channels=num_channels,
...@@ -231,16 +231,16 @@ class ResNet(fluid.dygraph.Layer): ...@@ -231,16 +231,16 @@ class ResNet(fluid.dygraph.Layer):
shortcut = False shortcut = False
for i in range(depth[block]): for i in range(depth[block]):
conv_name = "res" + str(block + 2) + chr(97 + i) conv_name = "res" + str(block + 2) + chr(97 + i)
bisic_block = self.add_sublayer( basic_block = self.add_sublayer(
conv_name, conv_name,
BisicBlock( BasicBlock(
num_channels=num_channels[block] num_channels=num_channels[block]
if i == 0 else num_filters[block], if i == 0 else num_filters[block],
num_filters=num_filters[block], num_filters=num_filters[block],
stride=2 if i == 0 and block != 0 else 1, stride=2 if i == 0 and block != 0 else 1,
shortcut=shortcut, shortcut=shortcut,
name=conv_name)) name=conv_name))
self.block_list.append(bisic_block) self.block_list.append(basic_block)
shortcut = True shortcut = True
self.pool2d_avg = Pool2D( self.pool2d_avg = Pool2D(
......
...@@ -126,14 +126,14 @@ class BottleneckBlock(fluid.dygraph.Layer): ...@@ -126,14 +126,14 @@ class BottleneckBlock(fluid.dygraph.Layer):
return layer_helper.append_activation(y) return layer_helper.append_activation(y)
class BisicBlock(fluid.dygraph.Layer): class BasicBlock(fluid.dygraph.Layer):
def __init__(self, def __init__(self,
num_channels, num_channels,
num_filters, num_filters,
stride, stride,
shortcut=True, shortcut=True,
name=None): name=None):
super(BisicBlock, self).__init__() super(BasicBlock, self).__init__()
self.stride = stride self.stride = stride
self.conv0 = ConvBNLayer( self.conv0 = ConvBNLayer(
num_channels=num_channels, num_channels=num_channels,
...@@ -248,16 +248,16 @@ class ResNet_vc(fluid.dygraph.Layer): ...@@ -248,16 +248,16 @@ class ResNet_vc(fluid.dygraph.Layer):
shortcut = False shortcut = False
for i in range(depth[block]): for i in range(depth[block]):
conv_name = "res" + str(block + 2) + chr(97 + i) conv_name = "res" + str(block + 2) + chr(97 + i)
bisic_block = self.add_sublayer( basic_block = self.add_sublayer(
'bb_%d_%d' % (block, i), 'bb_%d_%d' % (block, i),
BisicBlock( BasicBlock(
num_channels=num_channels[block] num_channels=num_channels[block]
if i == 0 else num_filters[block], if i == 0 else num_filters[block],
num_filters=num_filters[block], num_filters=num_filters[block],
stride=2 if i == 0 and block != 0 else 1, stride=2 if i == 0 and block != 0 else 1,
shortcut=shortcut, shortcut=shortcut,
name=conv_name)) name=conv_name))
self.block_list.append(bisic_block) self.block_list.append(basic_block)
shortcut = True shortcut = True
self.pool2d_avg = Pool2D( self.pool2d_avg = Pool2D(
......
...@@ -45,7 +45,11 @@ class ConvBNLayer(fluid.dygraph.Layer): ...@@ -45,7 +45,11 @@ class ConvBNLayer(fluid.dygraph.Layer):
self.is_vd_mode = is_vd_mode self.is_vd_mode = is_vd_mode
self._pool2d_avg = Pool2D( self._pool2d_avg = Pool2D(
pool_size=2, pool_stride=2, pool_padding=0, pool_type='avg', ceil_mode=True) pool_size=2,
pool_stride=2,
pool_padding=0,
pool_type='avg',
ceil_mode=True)
self._conv = Conv2D( self._conv = Conv2D(
num_channels=num_channels, num_channels=num_channels,
num_filters=num_filters, num_filters=num_filters,
...@@ -139,7 +143,7 @@ class BottleneckBlock(fluid.dygraph.Layer): ...@@ -139,7 +143,7 @@ class BottleneckBlock(fluid.dygraph.Layer):
return layer_helper.append_activation(y) return layer_helper.append_activation(y)
class BisicBlock(fluid.dygraph.Layer): class BasicBlock(fluid.dygraph.Layer):
def __init__(self, def __init__(self,
num_channels, num_channels,
num_filters, num_filters,
...@@ -148,7 +152,7 @@ class BisicBlock(fluid.dygraph.Layer): ...@@ -148,7 +152,7 @@ class BisicBlock(fluid.dygraph.Layer):
if_first=False, if_first=False,
reduction_ratio=16, reduction_ratio=16,
name=None): name=None):
super(BisicBlock, self).__init__() super(BasicBlock, self).__init__()
self.stride = stride self.stride = stride
self.conv0 = ConvBNLayer( self.conv0 = ConvBNLayer(
num_channels=num_channels, num_channels=num_channels,
...@@ -313,9 +317,9 @@ class SE_ResNet_vd(fluid.dygraph.Layer): ...@@ -313,9 +317,9 @@ class SE_ResNet_vd(fluid.dygraph.Layer):
shortcut = False shortcut = False
for i in range(depth[block]): for i in range(depth[block]):
conv_name = "res" + str(block + 2) + chr(97 + i) conv_name = "res" + str(block + 2) + chr(97 + i)
bisic_block = self.add_sublayer( basic_block = self.add_sublayer(
'bb_%d_%d' % (block, i), 'bb_%d_%d' % (block, i),
BisicBlock( BasicBlock(
num_channels=num_channels[block] num_channels=num_channels[block]
if i == 0 else num_filters[block], if i == 0 else num_filters[block],
num_filters=num_filters[block], num_filters=num_filters[block],
...@@ -323,7 +327,7 @@ class SE_ResNet_vd(fluid.dygraph.Layer): ...@@ -323,7 +327,7 @@ class SE_ResNet_vd(fluid.dygraph.Layer):
shortcut=shortcut, shortcut=shortcut,
if_first=block == i == 0, if_first=block == i == 0,
name=conv_name)) name=conv_name))
self.block_list.append(bisic_block) self.block_list.append(basic_block)
shortcut = True shortcut = True
self.pool2d_avg = Pool2D( self.pool2d_avg = Pool2D(
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册