Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Crayon鑫
Paddle
提交
6612068e
P
Paddle
项目概览
Crayon鑫
/
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看板
未验证
提交
6612068e
编写于
2月 08, 2018
作者:
W
whs
提交者:
GitHub
2月 08, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #8114 from wanghaoshuang/fix_ctc_align
Make CTC align op support for empty output
上级
e80255ce
3aae7815
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
47 addition
and
20 deletion
+47
-20
paddle/operators/ctc_align_op.cu
paddle/operators/ctc_align_op.cu
+8
-0
paddle/operators/ctc_align_op.h
paddle/operators/ctc_align_op.h
+8
-1
python/paddle/v2/fluid/layers/nn.py
python/paddle/v2/fluid/layers/nn.py
+20
-19
python/paddle/v2/fluid/tests/test_ctc_align.py
python/paddle/v2/fluid/tests/test_ctc_align.py
+11
-0
未找到文件。
paddle/operators/ctc_align_op.cu
浏览文件 @
6612068e
...
@@ -80,6 +80,14 @@ class CTCAlignOpCUDAKernel : public framework::OpKernel<T> {
...
@@ -80,6 +80,14 @@ class CTCAlignOpCUDAKernel : public framework::OpKernel<T> {
// resize output dims
// resize output dims
output
->
Resize
({
static_cast
<
int64_t
>
(
host_out_lod0
.
back
()),
1
});
output
->
Resize
({
static_cast
<
int64_t
>
(
host_out_lod0
.
back
()),
1
});
if
(
host_out_lod0
.
back
()
==
0
)
{
output
->
Resize
({
1
,
1
});
output
->
mutable_data
<
T
>
(
ctx
.
GetPlace
());
math
::
SetConstant
<
platform
::
CUDADeviceContext
,
T
>
set_constant
;
set_constant
(
ctx
.
template
device_context
<
platform
::
CUDADeviceContext
>(),
output
,
-
1
);
}
}
}
};
};
...
...
paddle/operators/ctc_align_op.h
浏览文件 @
6612068e
...
@@ -16,6 +16,8 @@ limitations under the License. */
...
@@ -16,6 +16,8 @@ limitations under the License. */
#include <string.h>
#include <string.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
{
...
@@ -65,9 +67,14 @@ class CTCAlignKernel : public framework::OpKernel<T> {
...
@@ -65,9 +67,14 @@ class CTCAlignKernel : public framework::OpKernel<T> {
framework
::
LoD
output_lod
;
framework
::
LoD
output_lod
;
output_lod
.
push_back
(
output_lod0
);
output_lod
.
push_back
(
output_lod0
);
output
->
set_lod
(
output_lod
);
output
->
set_lod
(
output_lod
);
// resize output dims
// resize output dims
output
->
Resize
({
static_cast
<
int64_t
>
(
output_lod0
.
back
()),
1
});
output
->
Resize
({
static_cast
<
int64_t
>
(
output_lod0
.
back
()),
1
});
// for empty sequence
if
(
output_lod0
.
back
()
==
0
)
{
output
->
Resize
({
1
,
1
});
output_data
=
output
->
mutable_data
<
T
>
(
ctx
.
GetPlace
());
output_data
[
0
]
=
-
1
;
}
}
}
};
};
...
...
python/paddle/v2/fluid/layers/nn.py
浏览文件 @
6612068e
...
@@ -2525,7 +2525,8 @@ def ctc_greedy_decoder(input, blank, name=None):
...
@@ -2525,7 +2525,8 @@ def ctc_greedy_decoder(input, blank, name=None):
interval [0, num_classes + 1).
interval [0, num_classes + 1).
Returns:
Returns:
Variable: CTC greedy decode result.
Variable: CTC greedy decode result. If all the sequences in result were
empty, the result LoDTensor will be [-1] with LoD [[0]] and dims [1, 1].
Examples:
Examples:
.. code-block:: python
.. code-block:: python
...
...
python/paddle/v2/fluid/tests/test_ctc_align.py
浏览文件 @
6612068e
...
@@ -31,6 +31,8 @@ def CTCAlign(input, lod, blank, merge_repeated):
...
@@ -31,6 +31,8 @@ def CTCAlign(input, lod, blank, merge_repeated):
result
.
append
(
token
)
result
.
append
(
token
)
prev_token
=
token
prev_token
=
token
result
=
np
.
array
(
result
).
reshape
([
len
(
result
),
1
]).
astype
(
"int32"
)
result
=
np
.
array
(
result
).
reshape
([
len
(
result
),
1
]).
astype
(
"int32"
)
if
len
(
result
)
==
0
:
result
=
np
.
array
([
-
1
])
return
result
return
result
...
@@ -72,5 +74,14 @@ class TestCTCAlignOpCase1(TestCTCAlignOp):
...
@@ -72,5 +74,14 @@ class TestCTCAlignOpCase1(TestCTCAlignOp):
[
19
,
1
]).
astype
(
"int32"
)
[
19
,
1
]).
astype
(
"int32"
)
class
TestCTCAlignOpCase2
(
TestCTCAlignOp
):
def
config
(
self
):
self
.
op_type
=
"ctc_align"
self
.
input_lod
=
[[
0
,
4
]]
self
.
blank
=
0
self
.
merge_repeated
=
True
self
.
input
=
np
.
array
([
0
,
0
,
0
,
0
]).
reshape
([
4
,
1
]).
astype
(
"int32"
)
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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录