Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
机器未来
Paddle
提交
a8a63d4c
P
Paddle
项目概览
机器未来
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
a8a63d4c
编写于
10月 17, 2017
作者:
L
Luo Tao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add MAX strategy for seqpool op
上级
73a8b78a
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
44 addition
and
3 deletion
+44
-3
paddle/operators/sequence_pool_op.h
paddle/operators/sequence_pool_op.h
+18
-1
python/paddle/v2/framework/tests/test_seq_pool.py
python/paddle/v2/framework/tests/test_seq_pool.py
+26
-2
未找到文件。
paddle/operators/sequence_pool_op.h
浏览文件 @
a8a63d4c
...
...
@@ -82,6 +82,9 @@ class SequencePoolKernel : public framework::OpKernel<T> {
out_e
.
device
(
place
)
=
in_e
.
sum
(
Eigen
::
array
<
int
,
1
>
({{
0
}}))
/
std
::
sqrt
(
static_cast
<
T
>
(
h
));
break
;
case
MAX
:
out_e
.
device
(
place
)
=
in_e
.
maximum
(
Eigen
::
array
<
int
,
1
>
({{
0
}}));
break
;
case
LAST
:
out_e
.
device
(
place
)
=
in_e
.
chip
(
h
-
1
,
0
);
break
;
...
...
@@ -100,8 +103,9 @@ class SequencePoolGradKernel : public framework::OpKernel<T> {
public:
void
Compute
(
const
framework
::
ExecutionContext
&
context
)
const
override
{
auto
*
in
=
context
.
Input
<
LoDTensor
>
(
"X"
);
auto
*
out
_g
=
context
.
Input
<
LoDTensor
>
(
framework
::
GradVarName
(
"Out"
)
);
auto
*
out
=
context
.
Input
<
LoDTensor
>
(
"Out"
);
auto
*
in_g
=
context
.
Output
<
LoDTensor
>
(
framework
::
GradVarName
(
"X"
));
auto
*
out_g
=
context
.
Input
<
LoDTensor
>
(
framework
::
GradVarName
(
"Out"
));
int
strategy
=
context
.
Attr
<
int
>
(
"strategy"
);
auto
dims
=
in
->
dims
();
...
...
@@ -135,6 +139,19 @@ class SequencePoolGradKernel : public framework::OpKernel<T> {
in_g_e
.
device
(
place
)
=
(
out_g_e
/
std
::
sqrt
(
static_cast
<
T
>
(
h
))).
broadcast
(
bcast
);
break
;
case
MAX
:
{
auto
in_t
=
in
->
Slice
<
T
>
(
static_cast
<
int
>
(
lod
[
i
]),
static_cast
<
int
>
(
lod
[
i
+
1
]));
auto
out_t
=
out
->
Slice
<
T
>
(
i
,
i
+
1
);
auto
in_e
=
EigenMatrix
<
T
>::
From
(
in_t
,
{
h
,
w
});
auto
out_e
=
EigenMatrix
<
T
>::
From
(
out_t
,
{
1
,
w
});
auto
equals
=
in_e
==
out_e
.
broadcast
(
bcast
);
auto
ones
=
in_g_e
.
constant
(
1
);
auto
zeros
=
in_g_e
.
constant
(
0
);
in_g_e
.
device
(
place
)
=
out_g_e
.
broadcast
(
bcast
)
*
equals
.
select
(
ones
,
zeros
);
break
;
}
case
LAST
:
in_g_e
.
chip
(
h
-
1
,
0
).
device
(
place
)
=
out_g_e
;
break
;
...
...
python/paddle/v2/framework/tests/test_seq_pool.py
浏览文件 @
a8a63d4c
...
...
@@ -16,11 +16,11 @@ class TestSeqAvgPool(OpTest):
def
set_data
(
self
):
self
.
op_type
=
'sequence_pool'
# one level, batch size is 4
x
=
np
.
random
.
uniform
(
0.1
,
1
,
[
11
,
2
3
]).
astype
(
'float32'
)
x
=
np
.
random
.
uniform
(
0.1
,
1
,
[
11
,
2
]).
astype
(
'float32'
)
lod
=
[[
0
,
4
,
5
,
8
,
11
]]
self
.
inputs
=
{
'X'
:
(
x
,
lod
)}
out
=
np
.
zeros
((
4
,
2
3
)).
astype
(
'float32'
)
out
=
np
.
zeros
((
4
,
2
)).
astype
(
'float32'
)
self
.
outputs
=
{
'Out'
:
out
}
def
compute
(
self
):
...
...
@@ -107,6 +107,30 @@ class TestSeqSqrtPool2D(TestSeqAvgPool2D):
self
.
check_grad
([
"X"
],
"Out"
,
max_relative_error
=
0.06
)
class
TestSeqMaxPool
(
TestSeqAvgPool
):
def
compute
(
self
):
self
.
attrs
=
{
'strategy'
:
SeqPoolType
.
MAX
}
x
,
lod
=
self
.
inputs
[
'X'
]
out
=
self
.
outputs
[
'Out'
]
for
i
in
range
(
4
):
sub_x
=
x
[
lod
[
0
][
i
]:
lod
[
0
][
i
+
1
],
:]
out
[
i
]
=
np
.
amax
(
sub_x
,
axis
=
0
)
class
TestSeqMaxPool2D
(
TestSeqAvgPool2D
):
def
compute
(
self
):
self
.
attrs
=
{
'strategy'
:
SeqPoolType
.
MAX
}
x
,
lod
=
self
.
inputs
[
'X'
]
out
=
self
.
outputs
[
'Out'
]
for
i
in
range
(
4
):
sub_x
=
np
.
reshape
(
x
[
lod
[
0
][
i
]:
lod
[
0
][
i
+
1
],
:],
(
-
1
,
3
*
17
))
out
[
i
]
=
np
.
reshape
(
np
.
amax
(
sub_x
,
axis
=
0
),
(
3
,
17
))
def
test_check_grad
(
self
):
# Remove MaxPool2D from gradient check to confirm the success of CI.
return
class
TestSeqLastPool
(
TestSeqAvgPool
):
def
compute
(
self
):
self
.
attrs
=
{
'strategy'
:
SeqPoolType
.
LAST
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录