Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
652b8347
P
Paddle
项目概览
PaddlePaddle
/
Paddle
大约 1 年 前同步成功
通知
2298
Star
20931
Fork
5422
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1423
列表
看板
标记
里程碑
合并请求
543
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1,423
Issue
1,423
列表
看板
标记
里程碑
合并请求
543
合并请求
543
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
652b8347
编写于
10月 24, 2016
作者:
L
luotao1
提交者:
qingqing01
10月 24, 2016
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
remove deprecated start input in img_pool_layer (#237)
上级
3dd8c9be
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
6 addition
and
12 deletion
+6
-12
python/paddle/trainer_config_helpers/layers.py
python/paddle/trainer_config_helpers/layers.py
+2
-4
python/paddle/trainer_config_helpers/networks.py
python/paddle/trainer_config_helpers/networks.py
+4
-8
未找到文件。
python/paddle/trainer_config_helpers/layers.py
浏览文件 @
652b8347
...
...
@@ -1630,7 +1630,7 @@ def img_conv_layer(input, filter_size, num_filters,
@
layer_support
()
def
img_pool_layer
(
input
,
pool_size
,
name
=
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
,
img_width
=
None
):
"""
...
...
@@ -1661,8 +1661,6 @@ def img_pool_layer(input, pool_size, name=None,
:type stride: int
:param stride_y: stride height of pooling. It is equal to stride by default.
: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.
:type layer_attr: ExtraLayerAttribute
: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,
pool_type
=
type_name
,
channels
=
num_channels
,
size_x
=
pool_size
,
start
=
start
,
start
=
None
,
stride
=
stride
,
padding
=
padding
,
size_y
=
pool_size_y
,
...
...
python/paddle/trainer_config_helpers/networks.py
浏览文件 @
652b8347
...
...
@@ -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
,
conv_padding
=
0
,
bias_attr
=
None
,
num_channel
=
None
,
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
):
"""
Simple image convolution and pooling group.
...
...
@@ -172,8 +172,6 @@ def simple_img_conv_pool(input, filter_size, num_filters, pool_size, name=None,
:type conv_layer_attr: ExtraLayerAttribute
:param pool_stride: see img_pool_layer for details
: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
:type pool_padding: int
: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,
return
img_pool_layer
(
name
=
"%s_pool"
%
name
,
input
=
_conv_
,
pool_size
=
pool_size
,
pool_type
=
pool_type
,
stride
=
pool_stride
,
start
=
pool_start
,
padding
=
pool_padding
,
padding
=
pool_padding
,
layer_attr
=
pool_layer_attr
)
...
...
@@ -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_layer_attr
=
None
,
bn_param_attr
=
None
,
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.
...
...
@@ -243,8 +241,6 @@ def img_conv_bn_pool(input, filter_size, num_filters, pool_size, name=None,
:param bn_layer_attr: ParameterAttribute.
:param pool_stride: see img_pool_layer's document.
: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.
:type pool_padding: int
: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,
return
img_pool_layer
(
name
=
"%s_pool"
%
name
,
input
=
__bn__
,
pool_type
=
pool_type
,
pool_size
=
pool_size
,
stride
=
pool_stride
,
start
=
pool_start
,
padding
=
pool_padding
,
padding
=
pool_padding
,
layer_attr
=
pool_layer_attr
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录