Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
27decacb
P
Paddle
项目概览
PaddlePaddle
/
Paddle
接近 2 年 前同步成功
通知
2323
Star
20933
Fork
5424
代码
文件
提交
分支
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看板
未验证
提交
27decacb
编写于
12月 26, 2019
作者:
H
hutuxian
提交者:
GitHub
12月 26, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix aucop stat shape (#21846)
* fix stat shape back in global auc scenario * add UT to cover global auc
上级
0d61653c
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
94 addition
and
8 deletion
+94
-8
paddle/fluid/operators/metrics/auc_op.cc
paddle/fluid/operators/metrics/auc_op.cc
+9
-6
python/paddle/fluid/layers/metric_op.py
python/paddle/fluid/layers/metric_op.py
+2
-2
python/paddle/fluid/tests/unittests/test_auc_op.py
python/paddle/fluid/tests/unittests/test_auc_op.py
+40
-0
python/paddle/fluid/tests/unittests/test_auc_single_pred_op.py
...n/paddle/fluid/tests/unittests/test_auc_single_pred_op.py
+43
-0
未找到文件。
paddle/fluid/operators/metrics/auc_op.cc
浏览文件 @
27decacb
...
@@ -49,12 +49,15 @@ class AucOp : public framework::OperatorWithKernel {
...
@@ -49,12 +49,15 @@ class AucOp : public framework::OperatorWithKernel {
ctx
->
SetOutputDim
(
"AUC"
,
{
1
});
ctx
->
SetOutputDim
(
"AUC"
,
{
1
});
// slide_steps = slide_steps == 0 ? 1 : slide_steps;
if
(
slide_steps
)
{
int
need_batch_id
=
slide_steps
?
1
:
0
;
ctx
->
SetOutputDim
(
"StatPosOut"
,
ctx
->
SetOutputDim
(
"StatPosOut"
,
{(
1
+
slide_steps
)
*
num_pred_buckets
+
1
});
{(
1
+
slide_steps
)
*
num_pred_buckets
+
need_batch_id
});
ctx
->
SetOutputDim
(
"StatNegOut"
,
ctx
->
SetOutputDim
(
"StatNegOut"
,
{(
1
+
slide_steps
)
*
num_pred_buckets
+
1
});
{(
1
+
slide_steps
)
*
num_pred_buckets
+
need_batch_id
});
}
else
{
ctx
->
SetOutputDim
(
"StatPosOut"
,
{
1
,
num_pred_buckets
});
ctx
->
SetOutputDim
(
"StatNegOut"
,
{
1
,
num_pred_buckets
});
}
}
}
protected:
protected:
...
...
python/paddle/fluid/layers/metric_op.py
浏览文件 @
27decacb
...
@@ -184,9 +184,9 @@ def auc(input,
...
@@ -184,9 +184,9 @@ def auc(input,
# for global auc
# for global auc
# Needn't maintain the batch id
# Needn't maintain the batch id
stat_pos
=
helper
.
create_global_variable
(
stat_pos
=
helper
.
create_global_variable
(
persistable
=
True
,
dtype
=
'int64'
,
shape
=
[
num_thresholds
+
1
])
persistable
=
True
,
dtype
=
'int64'
,
shape
=
[
1
,
num_thresholds
+
1
])
stat_neg
=
helper
.
create_global_variable
(
stat_neg
=
helper
.
create_global_variable
(
persistable
=
True
,
dtype
=
'int64'
,
shape
=
[
num_thresholds
+
1
])
persistable
=
True
,
dtype
=
'int64'
,
shape
=
[
1
,
num_thresholds
+
1
])
for
var
in
[
batch_stat_pos
,
batch_stat_neg
,
stat_pos
,
stat_neg
]:
for
var
in
[
batch_stat_pos
,
batch_stat_neg
,
stat_pos
,
stat_neg
]:
helper
.
set_variable_initializer
(
helper
.
set_variable_initializer
(
...
...
python/paddle/fluid/tests/unittests/test_auc_op.py
浏览文件 @
27decacb
...
@@ -64,5 +64,45 @@ class TestAucOp(OpTest):
...
@@ -64,5 +64,45 @@ class TestAucOp(OpTest):
self
.
check_output
()
self
.
check_output
()
class
TestGlobalAucOp
(
OpTest
):
def
setUp
(
self
):
self
.
op_type
=
"auc"
pred
=
np
.
random
.
random
((
128
,
2
)).
astype
(
"float32"
)
labels
=
np
.
random
.
randint
(
0
,
2
,
(
128
,
1
)).
astype
(
"int64"
)
num_thresholds
=
200
slide_steps
=
0
stat_pos
=
np
.
zeros
((
1
,
(
num_thresholds
+
1
))).
astype
(
"int64"
)
stat_neg
=
np
.
zeros
((
1
,
(
num_thresholds
+
1
))).
astype
(
"int64"
)
self
.
inputs
=
{
'Predict'
:
pred
,
'Label'
:
labels
,
"StatPos"
:
stat_pos
,
"StatNeg"
:
stat_neg
}
self
.
attrs
=
{
'curve'
:
'ROC'
,
'num_thresholds'
:
num_thresholds
,
"slide_steps"
:
slide_steps
}
python_auc
=
metrics
.
Auc
(
name
=
"auc"
,
curve
=
'ROC'
,
num_thresholds
=
num_thresholds
)
python_auc
.
update
(
pred
,
labels
)
pos
=
python_auc
.
_stat_pos
neg
=
python_auc
.
_stat_neg
self
.
outputs
=
{
'AUC'
:
np
.
array
(
python_auc
.
eval
()),
'StatPosOut'
:
np
.
array
(
pos
),
'StatNegOut'
:
np
.
array
(
neg
)
}
def
test_check_output
(
self
):
self
.
check_output
()
if
__name__
==
"__main__"
:
if
__name__
==
"__main__"
:
unittest
.
main
()
unittest
.
main
()
python/paddle/fluid/tests/unittests/test_auc_single_pred_op.py
浏览文件 @
27decacb
...
@@ -67,5 +67,48 @@ class TestAucSinglePredOp(OpTest):
...
@@ -67,5 +67,48 @@ class TestAucSinglePredOp(OpTest):
self
.
check_output
()
self
.
check_output
()
class
TestAucGlobalSinglePredOp
(
OpTest
):
def
setUp
(
self
):
self
.
op_type
=
"auc"
pred
=
np
.
random
.
random
((
128
,
2
)).
astype
(
"float32"
)
pred0
=
pred
[:,
0
].
reshape
(
128
,
1
)
labels
=
np
.
random
.
randint
(
0
,
2
,
(
128
,
1
)).
astype
(
"int64"
)
num_thresholds
=
200
slide_steps
=
0
stat_pos
=
np
.
zeros
((
1
,
(
num_thresholds
+
1
))).
astype
(
"int64"
)
stat_neg
=
np
.
zeros
((
1
,
(
num_thresholds
+
1
))).
astype
(
"int64"
)
self
.
inputs
=
{
'Predict'
:
pred0
,
'Label'
:
labels
,
"StatPos"
:
stat_pos
,
"StatNeg"
:
stat_neg
}
self
.
attrs
=
{
'curve'
:
'ROC'
,
'num_thresholds'
:
num_thresholds
,
"slide_steps"
:
slide_steps
}
python_auc
=
metrics
.
Auc
(
name
=
"auc"
,
curve
=
'ROC'
,
num_thresholds
=
num_thresholds
)
for
i
in
range
(
128
):
pred
[
i
][
1
]
=
pred
[
i
][
0
]
python_auc
.
update
(
pred
,
labels
)
pos
=
python_auc
.
_stat_pos
neg
=
python_auc
.
_stat_neg
self
.
outputs
=
{
'AUC'
:
np
.
array
(
python_auc
.
eval
()),
'StatPosOut'
:
np
.
array
(
pos
),
'StatNegOut'
:
np
.
array
(
neg
)
}
def
test_check_output
(
self
):
self
.
check_output
()
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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录