Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
77a15b67
P
Paddle
项目概览
PaddlePaddle
/
Paddle
12 个月 前同步成功
通知
2292
Star
20931
Fork
5422
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1423
列表
看板
标记
里程碑
合并请求
543
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1,423
Issue
1,423
列表
看板
标记
里程碑
合并请求
543
合并请求
543
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
77a15b67
编写于
9月 04, 2017
作者:
C
Cao Ying
提交者:
GitHub
9月 04, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #3844 from lcy-seso/fix_ctc_evaluator
fix ctc edit distance evaluator can not print information in v2 API.
上级
35420274
a523bea8
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
67 addition
and
17 deletion
+67
-17
paddle/gserver/evaluators/CTCErrorEvaluator.cpp
paddle/gserver/evaluators/CTCErrorEvaluator.cpp
+52
-11
paddle/gserver/evaluators/ChunkEvaluator.cpp
paddle/gserver/evaluators/ChunkEvaluator.cpp
+7
-1
paddle/gserver/evaluators/Evaluator.h
paddle/gserver/evaluators/Evaluator.h
+8
-5
未找到文件。
paddle/gserver/evaluators/CTCErrorEvaluator.cpp
浏览文件 @
77a15b67
...
...
@@ -14,18 +14,20 @@ limitations under the License. */
#include "Evaluator.h"
#include "paddle/gserver/gradientmachines/NeuralNetwork.h"
#include "paddle/utils/StringUtil.h"
namespace
paddle
{
/**
* calculate sequence-to-sequence edit distance
*/
class
CTCErrorEvaluator
:
public
NotGetable
Evaluator
{
class
CTCErrorEvaluator
:
public
Evaluator
{
private:
MatrixPtr
outActivations_
;
int
numTimes_
,
numClasses_
,
numSequences_
,
blank_
;
real
deletions_
,
insertions_
,
substitutions_
;
int
seqClassficationError_
;
mutable
std
::
unordered_map
<
std
::
string
,
real
>
evalResults_
;
std
::
vector
<
int
>
path2String
(
const
std
::
vector
<
int
>&
path
)
{
std
::
vector
<
int
>
str
;
...
...
@@ -183,6 +185,18 @@ private:
return
stringAlignment
(
gtStr
,
recogStr
);
}
void
storeLocalValues
()
const
{
evalResults_
[
"error"
]
=
numSequences_
?
totalScore_
/
numSequences_
:
0
;
evalResults_
[
"deletion_error"
]
=
numSequences_
?
deletions_
/
numSequences_
:
0
;
evalResults_
[
"insertion_error"
]
=
numSequences_
?
insertions_
/
numSequences_
:
0
;
evalResults_
[
"substitution_error"
]
=
numSequences_
?
substitutions_
/
numSequences_
:
0
;
evalResults_
[
"sequence_error"
]
=
(
real
)
seqClassficationError_
/
numSequences_
;
}
public:
CTCErrorEvaluator
()
:
numTimes_
(
0
),
...
...
@@ -245,16 +259,12 @@ public:
}
virtual
void
printStats
(
std
::
ostream
&
os
)
const
{
os
<<
config_
.
name
()
<<
"="
<<
(
numSequences_
?
totalScore_
/
numSequences_
:
0
);
os
<<
" deletions error"
<<
"="
<<
(
numSequences_
?
deletions_
/
numSequences_
:
0
);
os
<<
" insertions error"
<<
"="
<<
(
numSequences_
?
insertions_
/
numSequences_
:
0
);
os
<<
" substitutions error"
<<
"="
<<
(
numSequences_
?
substitutions_
/
numSequences_
:
0
);
os
<<
" sequences error"
<<
"="
<<
(
real
)
seqClassficationError_
/
numSequences_
;
storeLocalValues
();
os
<<
config_
.
name
()
<<
" error = "
<<
evalResults_
[
"error"
];
os
<<
" deletions error = "
<<
evalResults_
[
"deletion_error"
];
os
<<
" insertions error = "
<<
evalResults_
[
"insertion_error"
];
os
<<
" substitution error = "
<<
evalResults_
[
"substitution_error"
];
os
<<
" sequence error = "
<<
evalResults_
[
"sequence_error"
];
}
virtual
void
distributeEval
(
ParameterClient2
*
client
)
{
...
...
@@ -272,6 +282,37 @@ public:
seqClassficationError_
=
(
int
)
buf
[
4
];
numSequences_
=
(
int
)
buf
[
5
];
}
void
getNames
(
std
::
vector
<
std
::
string
>*
names
)
{
storeLocalValues
();
names
->
reserve
(
names
->
size
()
+
evalResults_
.
size
());
for
(
auto
it
=
evalResults_
.
begin
();
it
!=
evalResults_
.
end
();
++
it
)
{
names
->
push_back
(
config_
.
name
()
+
"."
+
it
->
first
);
}
}
real
getValue
(
const
std
::
string
&
name
,
Error
*
err
)
const
{
storeLocalValues
();
std
::
vector
<
std
::
string
>
buffers
;
paddle
::
str
::
split
(
name
,
'.'
,
&
buffers
);
auto
it
=
evalResults_
.
find
(
buffers
[
buffers
.
size
()
-
1
]);
if
(
it
==
evalResults_
.
end
())
{
*
err
=
Error
(
"Evaluator does not have the key %s"
,
name
.
c_str
());
return
0.0
f
;
}
return
it
->
second
;
}
std
::
string
getType
(
const
std
::
string
&
name
,
Error
*
err
)
const
{
this
->
getValue
(
name
,
err
);
if
(
!
err
->
isOK
())
{
return
""
;
}
return
"ctc_edit_distance"
;
}
};
REGISTER_EVALUATOR
(
ctc_edit_distance
,
CTCErrorEvaluator
);
...
...
paddle/gserver/evaluators/ChunkEvaluator.cpp
浏览文件 @
77a15b67
...
...
@@ -268,7 +268,13 @@ public:
}
// get type of evaluator
std
::
string
getTypeImpl
()
const
{
return
"chunk"
;
}
std
::
string
getType
(
const
std
::
string
&
name
,
Error
*
err
)
const
{
this
->
getValue
(
name
,
err
);
if
(
!
err
->
isOK
())
{
return
""
;
}
return
"chunk"
;
}
private:
void
storeLocalValues
()
const
{
...
...
paddle/gserver/evaluators/Evaluator.h
浏览文件 @
77a15b67
...
...
@@ -211,6 +211,7 @@ public:
*
err
=
Error
(
"Not implemented"
);
return
.0
f
;
}
std
::
string
getType
(
const
std
::
string
&
name
,
Error
*
err
)
const
{
*
err
=
Error
(
"Not implemented"
);
return
""
;
...
...
@@ -331,6 +332,7 @@ private:
protected:
std
::
string
getTypeImpl
()
const
;
};
/**
* @brief precision, recall and f1 score Evaluator
* \f[
...
...
@@ -358,6 +360,12 @@ public:
virtual
void
distributeEval
(
ParameterClient2
*
client
);
void
getNames
(
std
::
vector
<
std
::
string
>*
names
);
real
getValue
(
const
std
::
string
&
name
,
Error
*
err
)
const
;
std
::
string
getType
(
const
std
::
string
&
name
,
Error
*
err
)
const
;
struct
StatsInfo
{
/// numbers of true positives
double
TP
;
...
...
@@ -428,11 +436,6 @@ private:
mutable
std
::
unordered_map
<
std
::
string
,
real
>
values_
;
void
storeLocalValues
()
const
;
// Evaluator interface
public:
void
getNames
(
std
::
vector
<
std
::
string
>*
names
);
real
getValue
(
const
std
::
string
&
name
,
Error
*
err
)
const
;
std
::
string
getType
(
const
std
::
string
&
name
,
Error
*
err
)
const
;
};
/*
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录