提交 652b8347 编写于 作者: L luotao1 提交者: qingqing01

remove deprecated start input in img_pool_layer (#237)

上级 3dd8c9be
...@@ -1630,7 +1630,7 @@ def img_conv_layer(input, filter_size, num_filters, ...@@ -1630,7 +1630,7 @@ def img_conv_layer(input, filter_size, num_filters,
@layer_support() @layer_support()
def img_pool_layer(input, pool_size, name=None, def img_pool_layer(input, pool_size, name=None,
num_channels=None, pool_type=None, num_channels=None, pool_type=None,
stride=1, start=None, padding=0, layer_attr=None, stride=1, padding=0, layer_attr=None,
pool_size_y=None, stride_y=None, padding_y=None, pool_size_y=None, stride_y=None, padding_y=None,
img_width=None): img_width=None):
""" """
...@@ -1661,8 +1661,6 @@ def img_pool_layer(input, pool_size, name=None, ...@@ -1661,8 +1661,6 @@ def img_pool_layer(input, pool_size, name=None,
:type stride: int :type stride: int
:param stride_y: stride height of pooling. It is equal to stride by default. :param stride_y: stride height of pooling. It is equal to stride by default.
:type stride_y: int|None :type stride_y: int|None
:param start: start position of pooling operation. Note it is deprecated now.
:type start: int|None
:param layer_attr: Extra Layer attribute. :param layer_attr: Extra Layer attribute.
:type layer_attr: ExtraLayerAttribute :type layer_attr: ExtraLayerAttribute
:param img_width: the width of input feature map. If it is None, the input feature :param img_width: the width of input feature map. If it is None, the input feature
...@@ -1696,7 +1694,7 @@ def img_pool_layer(input, pool_size, name=None, ...@@ -1696,7 +1694,7 @@ def img_pool_layer(input, pool_size, name=None,
pool_type=type_name, pool_type=type_name,
channels=num_channels, channels=num_channels,
size_x=pool_size, size_x=pool_size,
start=start, start=None,
stride=stride, stride=stride,
padding=padding, padding=padding,
size_y=pool_size_y, size_y=pool_size_y,
......
...@@ -133,7 +133,7 @@ def simple_img_conv_pool(input, filter_size, num_filters, pool_size, name=None, ...@@ -133,7 +133,7 @@ def simple_img_conv_pool(input, filter_size, num_filters, pool_size, name=None,
pool_type=None, act=None, groups=1, conv_stride=1, pool_type=None, act=None, groups=1, conv_stride=1,
conv_padding=0, bias_attr=None, num_channel=None, conv_padding=0, bias_attr=None, num_channel=None,
param_attr=None, shared_bias=True, param_attr=None, shared_bias=True,
conv_layer_attr=None, pool_stride=1, pool_start=None, conv_layer_attr=None, pool_stride=1,
pool_padding=0, pool_layer_attr=None): pool_padding=0, pool_layer_attr=None):
""" """
Simple image convolution and pooling group. Simple image convolution and pooling group.
...@@ -172,8 +172,6 @@ def simple_img_conv_pool(input, filter_size, num_filters, pool_size, name=None, ...@@ -172,8 +172,6 @@ def simple_img_conv_pool(input, filter_size, num_filters, pool_size, name=None,
:type conv_layer_attr: ExtraLayerAttribute :type conv_layer_attr: ExtraLayerAttribute
:param pool_stride: see img_pool_layer for details :param pool_stride: see img_pool_layer for details
:type pool_stride: int :type pool_stride: int
:param pool_start: see img_pool_layer for details. It is deprecated now.
:type pool_start: int
:param pool_padding: see img_pool_layer for details :param pool_padding: see img_pool_layer for details
:type pool_padding: int :type pool_padding: int
:param pool_layer_attr: see img_pool_layer for details :param pool_layer_attr: see img_pool_layer for details
...@@ -192,7 +190,7 @@ def simple_img_conv_pool(input, filter_size, num_filters, pool_size, name=None, ...@@ -192,7 +190,7 @@ def simple_img_conv_pool(input, filter_size, num_filters, pool_size, name=None,
return img_pool_layer(name="%s_pool" % name, input=_conv_, return img_pool_layer(name="%s_pool" % name, input=_conv_,
pool_size=pool_size, pool_size=pool_size,
pool_type=pool_type, stride=pool_stride, pool_type=pool_type, stride=pool_stride,
start=pool_start, padding=pool_padding, padding=pool_padding,
layer_attr=pool_layer_attr) layer_attr=pool_layer_attr)
...@@ -203,7 +201,7 @@ def img_conv_bn_pool(input, filter_size, num_filters, pool_size, name=None, ...@@ -203,7 +201,7 @@ def img_conv_bn_pool(input, filter_size, num_filters, pool_size, name=None,
conv_param_attr=None, shared_bias=True, conv_param_attr=None, shared_bias=True,
conv_layer_attr=None, bn_param_attr=None, conv_layer_attr=None, bn_param_attr=None,
bn_bias_attr=None, bn_layer_attr=None, pool_stride=1, bn_bias_attr=None, bn_layer_attr=None, pool_stride=1,
pool_start=None, pool_padding=0, pool_layer_attr=None): pool_padding=0, pool_layer_attr=None):
""" """
Convolution, batch normalization, pooling group. Convolution, batch normalization, pooling group.
...@@ -243,8 +241,6 @@ def img_conv_bn_pool(input, filter_size, num_filters, pool_size, name=None, ...@@ -243,8 +241,6 @@ def img_conv_bn_pool(input, filter_size, num_filters, pool_size, name=None,
:param bn_layer_attr: ParameterAttribute. :param bn_layer_attr: ParameterAttribute.
:param pool_stride: see img_pool_layer's document. :param pool_stride: see img_pool_layer's document.
:type pool_stride: int :type pool_stride: int
:param pool_start: see img_pool_layer's document. It is deprecated now.
:type pool_start: int
:param pool_padding: see img_pool_layer's document. :param pool_padding: see img_pool_layer's document.
:type pool_padding: int :type pool_padding: int
:param pool_layer_attr: see img_pool_layer's document. :param pool_layer_attr: see img_pool_layer's document.
...@@ -268,7 +264,7 @@ def img_conv_bn_pool(input, filter_size, num_filters, pool_size, name=None, ...@@ -268,7 +264,7 @@ def img_conv_bn_pool(input, filter_size, num_filters, pool_size, name=None,
return img_pool_layer(name="%s_pool" % name, return img_pool_layer(name="%s_pool" % name,
input=__bn__, pool_type=pool_type, input=__bn__, pool_type=pool_type,
pool_size=pool_size, stride=pool_stride, pool_size=pool_size, stride=pool_stride,
start=pool_start, padding=pool_padding, padding=pool_padding,
layer_attr=pool_layer_attr) layer_attr=pool_layer_attr)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册