Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
机器未来
Paddle
提交
393c748c
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看板
提交
393c748c
编写于
10月 12, 2017
作者:
L
Luo Tao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add seqlastin/seqfirstin for seq_pool op
上级
e69a565a
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
57 addition
and
0 deletion
+57
-0
paddle/operators/sequence_pool_op.h
paddle/operators/sequence_pool_op.h
+17
-0
python/paddle/v2/framework/tests/test_seq_pool.py
python/paddle/v2/framework/tests/test_seq_pool.py
+40
-0
未找到文件。
paddle/operators/sequence_pool_op.h
浏览文件 @
393c748c
...
@@ -15,6 +15,7 @@ limitations under the License. */
...
@@ -15,6 +15,7 @@ limitations under the License. */
#pragma once
#pragma once
#include "paddle/framework/eigen.h"
#include "paddle/framework/eigen.h"
#include "paddle/framework/op_registry.h"
#include "paddle/framework/op_registry.h"
#include "paddle/operators/math/math_function.h"
namespace
paddle
{
namespace
paddle
{
namespace
operators
{
namespace
operators
{
...
@@ -81,6 +82,12 @@ class SequencePoolKernel : public framework::OpKernel<T> {
...
@@ -81,6 +82,12 @@ class SequencePoolKernel : public framework::OpKernel<T> {
out_e
.
device
(
place
)
=
in_e
.
sum
(
Eigen
::
array
<
int
,
1
>
({{
0
}}))
/
out_e
.
device
(
place
)
=
in_e
.
sum
(
Eigen
::
array
<
int
,
1
>
({{
0
}}))
/
std
::
sqrt
(
static_cast
<
T
>
(
h
));
std
::
sqrt
(
static_cast
<
T
>
(
h
));
break
;
break
;
case
LAST
:
out_e
.
device
(
place
)
=
in_e
.
chip
(
h
-
1
,
0
);
break
;
case
FIRST
:
out_e
.
device
(
place
)
=
in_e
.
chip
(
0
,
0
);
break
;
default:
default:
PADDLE_THROW
(
"unsupported pooling strategy"
);
PADDLE_THROW
(
"unsupported pooling strategy"
);
}
}
...
@@ -102,6 +109,10 @@ class SequencePoolGradKernel : public framework::OpKernel<T> {
...
@@ -102,6 +109,10 @@ class SequencePoolGradKernel : public framework::OpKernel<T> {
int64_t
w
=
in
->
numel
()
/
dims
[
0
];
int64_t
w
=
in
->
numel
()
/
dims
[
0
];
in_g
->
mutable_data
<
T
>
(
context
.
GetPlace
());
in_g
->
mutable_data
<
T
>
(
context
.
GetPlace
());
if
(
strategy
>
2
)
{
// set X@Grad be zero at first when strategy is LAST/FIRST/MAX
math
::
SetConstant
<
Place
,
T
>
(
context
.
device_context
(),
in_g
,
0
);
}
auto
place
=
context
.
GetEigenDevice
<
Place
>
();
auto
place
=
context
.
GetEigenDevice
<
Place
>
();
for
(
int
i
=
0
;
i
<
static_cast
<
int
>
(
lod
.
size
())
-
1
;
++
i
)
{
for
(
int
i
=
0
;
i
<
static_cast
<
int
>
(
lod
.
size
())
-
1
;
++
i
)
{
auto
in_g_t
=
in_g
->
Slice
<
T
>
(
static_cast
<
int
>
(
lod
[
i
]),
auto
in_g_t
=
in_g
->
Slice
<
T
>
(
static_cast
<
int
>
(
lod
[
i
]),
...
@@ -123,6 +134,12 @@ class SequencePoolGradKernel : public framework::OpKernel<T> {
...
@@ -123,6 +134,12 @@ class SequencePoolGradKernel : public framework::OpKernel<T> {
in_g_e
.
device
(
place
)
=
in_g_e
.
device
(
place
)
=
(
out_g_e
/
std
::
sqrt
(
static_cast
<
T
>
(
h
))).
broadcast
(
bcast
);
(
out_g_e
/
std
::
sqrt
(
static_cast
<
T
>
(
h
))).
broadcast
(
bcast
);
break
;
break
;
case
LAST
:
in_g_e
.
chip
(
h
-
1
,
0
).
device
(
place
)
=
out_g_e
;
break
;
case
FIRST
:
in_g_e
.
chip
(
0
,
0
).
device
(
place
)
=
out_g_e
;
break
;
default:
default:
PADDLE_THROW
(
"unsupported pooling strategy"
);
PADDLE_THROW
(
"unsupported pooling strategy"
);
}
}
...
...
python/paddle/v2/framework/tests/test_seq_pool.py
浏览文件 @
393c748c
...
@@ -107,5 +107,45 @@ class TestSeqSqrtPool2D(TestSeqAvgPool2D):
...
@@ -107,5 +107,45 @@ class TestSeqSqrtPool2D(TestSeqAvgPool2D):
self
.
check_grad
([
"X"
],
"Out"
,
max_relative_error
=
0.06
)
self
.
check_grad
([
"X"
],
"Out"
,
max_relative_error
=
0.06
)
class
TestSeqLastPool
(
TestSeqAvgPool
):
def
compute
(
self
):
self
.
attrs
=
{
'strategy'
:
SeqPoolType
.
LAST
}
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
]
=
sub_x
[
-
1
,
:]
class
TestSeqLastPool2D
(
TestSeqAvgPool2D
):
def
compute
(
self
):
self
.
attrs
=
{
'strategy'
:
SeqPoolType
.
LAST
}
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
(
sub_x
[
-
1
,
:],
(
3
,
17
))
class
TestSeqFirstPool
(
TestSeqAvgPool
):
def
compute
(
self
):
self
.
attrs
=
{
'strategy'
:
SeqPoolType
.
FIRST
}
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
]
=
sub_x
[
0
,
:]
class
TestSeqFirstPool2D
(
TestSeqAvgPool2D
):
def
compute
(
self
):
self
.
attrs
=
{
'strategy'
:
SeqPoolType
.
FIRST
}
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
(
sub_x
[
0
,
:],
(
3
,
17
))
if
__name__
==
'__main__'
:
if
__name__
==
'__main__'
:
unittest
.
main
()
unittest
.
main
()
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录