Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
64e33566
P
Paddle
项目概览
PaddlePaddle
/
Paddle
1 年多 前同步成功
通知
2301
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看板
提交
64e33566
编写于
2月 24, 2019
作者:
D
dengkaipeng
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix pool3d doc.
test=release/1.3
上级
324e73fc
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
34 addition
and
13 deletion
+34
-13
paddle/fluid/operators/pool_op.cc
paddle/fluid/operators/pool_op.cc
+8
-7
python/paddle/fluid/layers/nn.py
python/paddle/fluid/layers/nn.py
+26
-6
未找到文件。
paddle/fluid/operators/pool_op.cc
浏览文件 @
64e33566
...
@@ -168,9 +168,10 @@ void Pool2dOpMaker::Make() {
...
@@ -168,9 +168,10 @@ void Pool2dOpMaker::Make() {
"be ignored."
);
// TODO(Chengduo): Add checker.
"be ignored."
);
// TODO(Chengduo): Add checker.
// (Currently,
// (Currently,
// TypedAttrChecker don't support vector type.)
// TypedAttrChecker don't support vector type.)
AddAttr
<
bool
>
(
"global_pooling"
,
AddAttr
<
bool
>
(
"global_pooling"
,
"(bool, default false) Whether to use the global pooling. "
"(bool, default false) Whether to use the global pooling. "
"If global_pooling = true, k
size and paddings will be ignored."
)
"If global_pooling = true, kernel
size and paddings will be ignored."
)
.
SetDefault
(
false
);
.
SetDefault
(
false
);
AddAttr
<
std
::
vector
<
int
>>
(
"strides"
,
AddAttr
<
std
::
vector
<
int
>>
(
"strides"
,
"(vector<int>, default {1, 1}), strides(height, "
"(vector<int>, default {1, 1}), strides(height, "
...
@@ -182,7 +183,7 @@ void Pool2dOpMaker::Make() {
...
@@ -182,7 +183,7 @@ void Pool2dOpMaker::Make() {
"paddings"
,
"paddings"
,
"(vector<int>, default {0,0}), paddings(height, width) of pooling "
"(vector<int>, default {0,0}), paddings(height, width) of pooling "
"operator."
"operator."
"If global_pooling = true, paddings and ksize will be ignored."
)
"If global_pooling = true, paddings and k
ernel
size will be ignored."
)
.
SetDefault
({
0
,
0
});
.
SetDefault
({
0
,
0
});
AddAttr
<
bool
>
(
AddAttr
<
bool
>
(
"exclusive"
,
"exclusive"
,
...
@@ -204,7 +205,7 @@ void Pool2dOpMaker::Make() {
...
@@ -204,7 +205,7 @@ void Pool2dOpMaker::Make() {
.
SetDefault
(
false
);
.
SetDefault
(
false
);
AddAttr
<
bool
>
(
AddAttr
<
bool
>
(
"ceil_mode"
,
"ceil_mode"
,
"(bool, default false) Wether to use the ceil function to calculate "
"(bool, default false) W
h
ether to use the ceil function to calculate "
"output height and width. False is the default. If it is set to False, "
"output height and width. False is the default. If it is set to False, "
"the floor function will be used."
)
"the floor function will be used."
)
.
SetDefault
(
false
);
.
SetDefault
(
false
);
...
@@ -333,7 +334,7 @@ void Pool3dOpMaker::Make() {
...
@@ -333,7 +334,7 @@ void Pool3dOpMaker::Make() {
AddAttr
<
bool
>
(
AddAttr
<
bool
>
(
"global_pooling"
,
"global_pooling"
,
"(bool, default false) Whether to use the global pooling. "
"(bool, default false) Whether to use the global pooling. "
"If global_pooling = true, k
size and paddings wille
be ignored."
)
"If global_pooling = true, k
ernel size and paddings will
be ignored."
)
.
SetDefault
(
false
);
.
SetDefault
(
false
);
AddAttr
<
std
::
vector
<
int
>>
(
AddAttr
<
std
::
vector
<
int
>>
(
"strides"
,
"strides"
,
...
@@ -368,7 +369,7 @@ void Pool3dOpMaker::Make() {
...
@@ -368,7 +369,7 @@ void Pool3dOpMaker::Make() {
.
SetDefault
(
false
);
.
SetDefault
(
false
);
AddAttr
<
bool
>
(
AddAttr
<
bool
>
(
"ceil_mode"
,
"ceil_mode"
,
"(bool, default false) Wether to use the ceil function to calculate "
"(bool, default false) W
h
ether to use the ceil function to calculate "
"output height and width. False is the default. If it is set to False, "
"output height and width. False is the default. If it is set to False, "
"the floor function will be used."
)
"the floor function will be used."
)
.
SetDefault
(
false
);
.
SetDefault
(
false
);
...
...
python/paddle/fluid/layers/nn.py
浏览文件 @
64e33566
...
@@ -2441,7 +2441,7 @@ def pool2d(input,
...
@@ -2441,7 +2441,7 @@ def pool2d(input,
data = fluid.layers.data(
data = fluid.layers.data(
name='data', shape=[3, 32, 32], dtype='float32')
name='data', shape=[3, 32, 32], dtype='float32')
conv
2d = fluid.layers.pool2d(
pool
2d = fluid.layers.pool2d(
input=data,
input=data,
pool_size=2,
pool_size=2,
pool_type='max',
pool_type='max',
...
@@ -2490,6 +2490,7 @@ def pool2d(input,
...
@@ -2490,6 +2490,7 @@ def pool2d(input,
return
pool_out
return
pool_out
@
templatedoc
()
def
pool3d
(
input
,
def
pool3d
(
input
,
pool_size
=-
1
,
pool_size
=-
1
,
pool_type
=
"max"
,
pool_type
=
"max"
,
...
@@ -2501,13 +2502,19 @@ def pool3d(input,
...
@@ -2501,13 +2502,19 @@ def pool3d(input,
name
=
None
,
name
=
None
,
exclusive
=
True
):
exclusive
=
True
):
"""
"""
This function adds the operator for pooling in 3-dimensions, using the
${comment}
pooling configurations mentioned in input parameters.
Args:
Args:
input (Variable): ${input_comment}
input (Variable): The input tensor of pooling operator. The format of
pool_size (int): ${ksize_comment}
input tensor is NCDHW, where N is batch size, C is
pool_type (str): ${pooling_type_comment}
the number of channels, D is the depth of the feature,
H is the height of the feature, and W is the width
of the feature.
pool_size (int|list|tuple): The pool kernel size. If pool kernel size
is a tuple or list, it must contain three integers,
(pool_size_Depth, pool_size_Height, pool_size_Width).
Otherwise, the pool kernel size will be the cube of an int.
pool_type (string): ${pooling_type_comment}
pool_stride (int): stride of the pooling layer.
pool_stride (int): stride of the pooling layer.
pool_padding (int): padding size.
pool_padding (int): padding size.
global_pooling (bool): ${global_pooling_comment}
global_pooling (bool): ${global_pooling_comment}
...
@@ -2520,6 +2527,19 @@ def pool3d(input,
...
@@ -2520,6 +2527,19 @@ def pool3d(input,
Returns:
Returns:
Variable: output of pool3d layer.
Variable: output of pool3d layer.
Examples:
.. code-block:: python
data = fluid.layers.data(
name='data', shape=[3, 32, 32, 32], dtype='float32')
pool3d = fluid.layers.pool3d(
input=data,
pool_size=2,
pool_type='max',
pool_stride=1,
global_pooling=False)
"""
"""
if
pool_type
not
in
[
"max"
,
"avg"
]:
if
pool_type
not
in
[
"max"
,
"avg"
]:
raise
ValueError
(
raise
ValueError
(
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录