Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
urhero
Paddle
提交
869cef6d
P
Paddle
项目概览
urhero
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
869cef6d
编写于
10月 09, 2019
作者:
L
liym27
提交者:
Aurelius84
10月 09, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix bug of infer shape in pool op. test=develop (#20213)
上级
acb02fd6
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
38 addition
and
7 deletion
+38
-7
paddle/fluid/operators/pool_op.cc
paddle/fluid/operators/pool_op.cc
+1
-5
python/paddle/fluid/tests/unittests/test_pool2d_op.py
python/paddle/fluid/tests/unittests/test_pool2d_op.py
+37
-2
未找到文件。
paddle/fluid/operators/pool_op.cc
浏览文件 @
869cef6d
...
...
@@ -93,7 +93,7 @@ void PoolOp::InferShape(framework::InferShapeContext* ctx) const {
}
else
{
for
(
size_t
i
=
0
;
i
<
data_dims
.
size
();
++
i
)
{
if
((
!
ctx
->
IsRuntime
())
&&
(
data_dims
[
i
]
<
0
))
{
output_shape
.
push_back
(
in_x
_dims
[
i
]);
output_shape
.
push_back
(
data
_dims
[
i
]);
}
else
{
output_shape
.
push_back
(
PoolOutputSize
(
data_dims
[
i
],
ksize
[
i
],
paddings
[
2
*
i
],
...
...
@@ -118,8 +118,6 @@ void PoolOp::InferShape(framework::InferShapeContext* ctx) const {
framework
::
OpKernelType
PoolOp
::
GetExpectedKernelType
(
const
framework
::
ExecutionContext
&
ctx
)
const
{
framework
::
LibraryType
library_
{
framework
::
LibraryType
::
kPlain
};
// std::string data_format = ctx.Attr<std::string>("data_format"); // change:
// delete
std
::
string
data_format
=
"AnyLayout"
;
framework
::
DataLayout
layout_
=
framework
::
StringToDataLayout
(
data_format
);
...
...
@@ -150,8 +148,6 @@ void PoolOpGrad::InferShape(framework::InferShapeContext* ctx) const {
framework
::
OpKernelType
PoolOpGrad
::
GetExpectedKernelType
(
const
framework
::
ExecutionContext
&
ctx
)
const
{
framework
::
LibraryType
library_
{
framework
::
LibraryType
::
kPlain
};
// std::string data_format = ctx.Attr<std::string>("data_format"); //
// change:delete
std
::
string
data_format
=
"AnyLayout"
;
framework
::
DataLayout
layout_
=
framework
::
StringToDataLayout
(
data_format
);
...
...
python/paddle/fluid/tests/unittests/test_pool2d_op.py
浏览文件 @
869cef6d
...
...
@@ -968,6 +968,18 @@ class TestPool2dAPI(OpTest):
append_batch_size
=
False
,
dtype
=
"float32"
)
input_NHWC_negetive
=
fluid
.
layers
.
data
(
name
=
"input_NHWC_negetive"
,
shape
=
[
2
,
-
1
,
5
,
3
],
append_batch_size
=
False
,
dtype
=
"float32"
)
input_NCHW_negetive
=
fluid
.
layers
.
data
(
name
=
"input_NCHW_negetive"
,
shape
=
[
2
,
3
,
-
1
,
-
1
],
append_batch_size
=
False
,
dtype
=
"float32"
)
ksize
=
[
3
,
3
]
out_1
=
fluid
.
layers
.
pool2d
(
input
=
input_NHWC
,
...
...
@@ -1034,11 +1046,34 @@ class TestPool2dAPI(OpTest):
use_cudnn
=
False
,
data_format
=
"NHWC"
)
# test negetive
out_9
=
fluid
.
layers
.
pool2d
(
input
=
input_NHWC_negetive
,
pool_size
=
ksize
,
pool_type
=
"avg"
,
pool_padding
=
[
0
,
0
],
use_cudnn
=
False
,
data_format
=
"NHWC"
)
assert
out_9
.
shape
==
(
2
,
-
1
,
3
,
3
)
out_10
=
fluid
.
layers
.
pool2d
(
input
=
input_NCHW_negetive
,
pool_size
=
ksize
,
pool_type
=
"avg"
,
pool_padding
=
[
0
,
0
],
use_cudnn
=
False
,
data_format
=
"NCHW"
)
assert
out_10
.
shape
==
(
2
,
3
,
-
1
,
-
1
)
exe
=
fluid
.
Executor
(
place
=
fluid
.
CPUPlace
())
[
res_1
,
res_2
,
res_3
,
res_4
,
res_5
,
res_6
,
res_7
,
res_8
]
=
exe
.
run
(
fluid
.
default_main_program
(),
feed
=
{
"input_NHWC"
:
x_NHWC
,
"input_NCHW"
:
x_NCHW
},
feed
=
{
"input_NHWC"
:
x_NHWC
,
"input_NCHW"
:
x_NCHW
,
"input_NHWC_negetive"
:
x_NHWC
,
"input_NCHW_negetive"
:
x_NCHW
},
fetch_list
=
[
out_1
,
out_2
,
out_3
,
out_4
,
out_5
,
out_6
,
out_7
,
out_8
])
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录