Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
s920243400
PaddleDetection
提交
d15b2e02
P
PaddleDetection
项目概览
s920243400
/
PaddleDetection
与 Fork 源项目一致
Fork自
PaddlePaddle / PaddleDetection
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
PaddleDetection
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
d15b2e02
编写于
6月 27, 2018
作者:
G
guosheng
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix copying empty tensor in beam_search_decode_op
上级
983566d9
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
12 addition
and
8 deletion
+12
-8
paddle/fluid/operators/beam_search_decode_op.cc
paddle/fluid/operators/beam_search_decode_op.cc
+11
-6
paddle/fluid/operators/beam_search_decode_op.h
paddle/fluid/operators/beam_search_decode_op.h
+1
-2
未找到文件。
paddle/fluid/operators/beam_search_decode_op.cc
浏览文件 @
d15b2e02
...
@@ -42,9 +42,11 @@ struct BeamSearchDecodeFunctor {
...
@@ -42,9 +42,11 @@ struct BeamSearchDecodeFunctor {
// Copy all tensors in the input tensor array
// Copy all tensors in the input tensor array
for
(
auto
&
step_id
:
step_ids_origin_
)
{
for
(
auto
&
step_id
:
step_ids_origin_
)
{
framework
::
LoDTensor
out
;
framework
::
LoDTensor
out
;
if
(
step_id
.
numel
()
>
0
)
{
dev_ctx
->
Wait
();
dev_ctx
->
Wait
();
framework
::
TensorCopy
(
step_id
,
platform
::
CPUPlace
(),
*
dev_ctx
,
&
out
);
framework
::
TensorCopy
(
step_id
,
platform
::
CPUPlace
(),
*
dev_ctx
,
&
out
);
dev_ctx
->
Wait
();
dev_ctx
->
Wait
();
}
out
.
set_lod
(
step_id
.
lod
());
out
.
set_lod
(
step_id
.
lod
());
step_ids_
.
push_back
(
out
);
step_ids_
.
push_back
(
out
);
...
@@ -58,9 +60,12 @@ struct BeamSearchDecodeFunctor {
...
@@ -58,9 +60,12 @@ struct BeamSearchDecodeFunctor {
// Copy all tensors in the input tensor array
// Copy all tensors in the input tensor array
for
(
auto
&
step_score
:
step_scores_origin_
)
{
for
(
auto
&
step_score
:
step_scores_origin_
)
{
framework
::
LoDTensor
out
;
framework
::
LoDTensor
out
;
if
(
step_score
.
numel
()
>
0
)
{
dev_ctx
->
Wait
();
dev_ctx
->
Wait
();
framework
::
TensorCopy
(
step_score
,
platform
::
CPUPlace
(),
*
dev_ctx
,
&
out
);
framework
::
TensorCopy
(
step_score
,
platform
::
CPUPlace
(),
*
dev_ctx
,
&
out
);
dev_ctx
->
Wait
();
dev_ctx
->
Wait
();
}
out
.
set_lod
(
step_score
.
lod
());
out
.
set_lod
(
step_score
.
lod
());
step_scores_
.
push_back
(
out
);
step_scores_
.
push_back
(
out
);
...
...
paddle/fluid/operators/beam_search_decode_op.h
浏览文件 @
d15b2e02
...
@@ -151,8 +151,7 @@ void BeamSearchDecoder<T>::Backtrace(const LoDTensorArray& step_ids,
...
@@ -151,8 +151,7 @@ void BeamSearchDecoder<T>::Backtrace(const LoDTensorArray& step_ids,
const
size_t
src_num
=
step_ids
.
at
(
0
).
lod
().
at
(
kSourceLevel
).
size
()
-
1
;
const
size_t
src_num
=
step_ids
.
at
(
0
).
lod
().
at
(
kSourceLevel
).
size
()
-
1
;
std
::
vector
<
SentenceVector
<
T
>>
sentence_vector_list
(
std
::
vector
<
SentenceVector
<
T
>>
sentence_vector_list
(
src_num
,
SentenceVector
<
T
>
(
beam_size_
));
src_num
,
SentenceVector
<
T
>
(
beam_size_
));
std
::
vector
<
std
::
vector
<
size_t
>>
prefix_idx_vector_list
(
std
::
vector
<
std
::
vector
<
size_t
>>
prefix_idx_vector_list
(
src_num
);
src_num
,
std
::
vector
<
size_t
>
());
for
(
int
step_id
=
step_num
-
1
;
step_id
>=
0
;
--
step_id
)
{
for
(
int
step_id
=
step_num
-
1
;
step_id
>=
0
;
--
step_id
)
{
auto
&
cur_ids
=
step_ids
.
at
(
step_id
);
auto
&
cur_ids
=
step_ids
.
at
(
step_id
);
auto
&
cur_scores
=
step_scores
.
at
(
step_id
);
auto
&
cur_scores
=
step_scores
.
at
(
step_id
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录