Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Crayon鑫
Paddle
提交
2e49faca
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看板
提交
2e49faca
编写于
1月 01, 2018
作者:
Y
Yibing Liu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Rename inputs & format license
上级
2c1adb06
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
37 addition
and
37 deletion
+37
-37
paddle/operators/edit_distance_op.cc
paddle/operators/edit_distance_op.cc
+14
-14
paddle/operators/edit_distance_op.cu
paddle/operators/edit_distance_op.cu
+11
-11
paddle/operators/edit_distance_op.h
paddle/operators/edit_distance_op.h
+11
-11
python/paddle/v2/fluid/tests/test_edit_distance_op.py
python/paddle/v2/fluid/tests/test_edit_distance_op.py
+1
-1
未找到文件。
paddle/operators/edit_distance_op.cc
浏览文件 @
2e49faca
/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserve.
/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserve.
Licensed under the Apache License, Version 2.0 (the "License");
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
See the License for the specific language governing permissions and
limitations under the License. */
limitations under the License. */
#include "paddle/operators/edit_distance_op.h"
#include "paddle/operators/edit_distance_op.h"
...
@@ -22,8 +22,8 @@ class EditDistanceOp : public framework::OperatorWithKernel {
...
@@ -22,8 +22,8 @@ class EditDistanceOp : public framework::OperatorWithKernel {
using
framework
::
OperatorWithKernel
::
OperatorWithKernel
;
using
framework
::
OperatorWithKernel
::
OperatorWithKernel
;
void
InferShape
(
framework
::
InferShapeContext
*
ctx
)
const
override
{
void
InferShape
(
framework
::
InferShapeContext
*
ctx
)
const
override
{
PADDLE_ENFORCE
(
ctx
->
HasInput
(
"
X1"
),
"Input(X1
) shouldn't be null."
);
PADDLE_ENFORCE
(
ctx
->
HasInput
(
"
Hyp"
),
"Input(Hyp
) shouldn't be null."
);
PADDLE_ENFORCE
(
ctx
->
HasInput
(
"
X2"
),
"Input(X2
) shouldn't be null."
);
PADDLE_ENFORCE
(
ctx
->
HasInput
(
"
Ref"
),
"Input(Ref
) shouldn't be null."
);
PADDLE_ENFORCE
(
ctx
->
HasOutput
(
"Out"
),
"Output(Out) shouldn't be null."
);
PADDLE_ENFORCE
(
ctx
->
HasOutput
(
"Out"
),
"Output(Out) shouldn't be null."
);
ctx
->
SetOutputDim
(
"Out"
,
{
1
});
ctx
->
SetOutputDim
(
"Out"
,
{
1
});
}
}
...
@@ -40,16 +40,16 @@ class EditDistanceOpMaker : public framework::OpProtoAndCheckerMaker {
...
@@ -40,16 +40,16 @@ class EditDistanceOpMaker : public framework::OpProtoAndCheckerMaker {
public:
public:
EditDistanceOpMaker
(
OpProto
*
proto
,
OpAttrChecker
*
op_checker
)
EditDistanceOpMaker
(
OpProto
*
proto
,
OpAttrChecker
*
op_checker
)
:
OpProtoAndCheckerMaker
(
proto
,
op_checker
)
{
:
OpProtoAndCheckerMaker
(
proto
,
op_checker
)
{
AddInput
(
"
X1
"
,
AddInput
(
"
Hyp
"
,
"(2-D tensor with shape [M x 1]) The indices for "
"(2-D tensor with shape [M x 1]) The indices for "
"hypothesis string"
);
"hypothesis string"
);
AddInput
(
"
X2
"
,
AddInput
(
"
Ref
"
,
"(2-D tensor with shape [N x 1]) The indices "
"(2-D tensor with shape [N x 1]) The indices "
"for reference string."
);
"for reference string."
);
AddAttr
<
bool
>
(
"normalized"
,
AddAttr
<
bool
>
(
"normalized"
,
"(bool, default false) Indicated whether "
"(bool, default false) Indicated whether "
"normalize the Output(Out) by the length of reference "
"normalize the Output(Out) by the length of reference "
"string (
X2
)."
)
"string (
Ref
)."
)
.
SetDefault
(
false
);
.
SetDefault
(
false
);
AddOutput
(
"Out"
,
AddOutput
(
"Out"
,
"(2-D tensor with shape [1 x 1]) "
"(2-D tensor with shape [1 x 1]) "
...
...
paddle/operators/edit_distance_op.cu
浏览文件 @
2e49faca
/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserve.
/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserve.
Licensed under the Apache License, Version 2.0 (the "License");
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
See the License for the specific language governing permissions and
limitations under the License. */
limitations under the License. */
#include <algorithm>
#include <algorithm>
#include "paddle/framework/op_registry.h"
#include "paddle/framework/op_registry.h"
...
@@ -70,8 +70,8 @@ class EditDistanceGPUKernel : public framework::OpKernel<T> {
...
@@ -70,8 +70,8 @@ class EditDistanceGPUKernel : public framework::OpKernel<T> {
void
Compute
(
const
framework
::
ExecutionContext
&
ctx
)
const
{
void
Compute
(
const
framework
::
ExecutionContext
&
ctx
)
const
{
auto
*
out_t
=
ctx
.
Output
<
framework
::
Tensor
>
(
"Out"
);
auto
*
out_t
=
ctx
.
Output
<
framework
::
Tensor
>
(
"Out"
);
auto
*
x1_t
=
ctx
.
Input
<
framework
::
Tensor
>
(
"
X1
"
);
auto
*
x1_t
=
ctx
.
Input
<
framework
::
Tensor
>
(
"
Hyp
"
);
auto
*
x2_t
=
ctx
.
Input
<
framework
::
Tensor
>
(
"
X2
"
);
auto
*
x2_t
=
ctx
.
Input
<
framework
::
Tensor
>
(
"
Ref
"
);
out_t
->
mutable_data
<
T
>
(
ctx
.
GetPlace
());
out_t
->
mutable_data
<
T
>
(
ctx
.
GetPlace
());
auto
out
=
out_t
->
data
<
T
>
();
auto
out
=
out_t
->
data
<
T
>
();
...
...
paddle/operators/edit_distance_op.h
浏览文件 @
2e49faca
/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserve.
/* Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserve.
Licensed under the Apache License, Version 2.0 (the "License");
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
See the License for the specific language governing permissions and
limitations under the License. */
limitations under the License. */
#pragma once
#pragma once
#include <algorithm>
#include <algorithm>
...
@@ -26,8 +26,8 @@ class EditDistanceKernel : public framework::OpKernel<T> {
...
@@ -26,8 +26,8 @@ class EditDistanceKernel : public framework::OpKernel<T> {
void
Compute
(
const
framework
::
ExecutionContext
&
ctx
)
const
{
void
Compute
(
const
framework
::
ExecutionContext
&
ctx
)
const
{
auto
*
out_t
=
ctx
.
Output
<
framework
::
Tensor
>
(
"Out"
);
auto
*
out_t
=
ctx
.
Output
<
framework
::
Tensor
>
(
"Out"
);
auto
*
x1_t
=
ctx
.
Input
<
framework
::
Tensor
>
(
"
X1
"
);
auto
*
x1_t
=
ctx
.
Input
<
framework
::
Tensor
>
(
"
Hyp
"
);
auto
*
x2_t
=
ctx
.
Input
<
framework
::
Tensor
>
(
"
X2
"
);
auto
*
x2_t
=
ctx
.
Input
<
framework
::
Tensor
>
(
"
Ref
"
);
out_t
->
mutable_data
<
float
>
(
ctx
.
GetPlace
());
out_t
->
mutable_data
<
float
>
(
ctx
.
GetPlace
());
...
...
python/paddle/v2/fluid/tests/test_edit_distance_op.py
浏览文件 @
2e49faca
...
@@ -45,7 +45,7 @@ class TestCTCEditDistanceOp(OpTest):
...
@@ -45,7 +45,7 @@ class TestCTCEditDistanceOp(OpTest):
if
normalized
is
True
:
if
normalized
is
True
:
distance
=
distance
/
len
(
x2
)
distance
=
distance
/
len
(
x2
)
self
.
attrs
=
{
'normalized'
:
normalized
}
self
.
attrs
=
{
'normalized'
:
normalized
}
self
.
inputs
=
{
'
X1'
:
x1
,
'X2
'
:
x2
}
self
.
inputs
=
{
'
Hyp'
:
x1
,
'Ref
'
:
x2
}
self
.
outputs
=
{
'Out'
:
distance
}
self
.
outputs
=
{
'Out'
:
distance
}
def
test_check_output
(
self
):
def
test_check_output
(
self
):
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录