Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
PaddleDetection
提交
62d82636
P
PaddleDetection
项目概览
PaddlePaddle
/
PaddleDetection
大约 1 年 前同步成功
通知
695
Star
11112
Fork
2696
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
184
列表
看板
标记
里程碑
合并请求
40
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
PaddleDetection
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
184
Issue
184
列表
看板
标记
里程碑
合并请求
40
合并请求
40
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
未验证
提交
62d82636
编写于
4月 13, 2021
作者:
S
shangliang Xu
提交者:
GitHub
4月 13, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add save only in eval/train test=develop (#2604)
上级
bd7adb05
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
52 addition
and
23 deletion
+52
-23
ppdet/engine/trainer.py
ppdet/engine/trainer.py
+4
-1
ppdet/metrics/metrics.py
ppdet/metrics/metrics.py
+34
-21
tools/eval.py
tools/eval.py
+8
-1
tools/train.py
tools/train.py
+6
-0
未找到文件。
ppdet/engine/trainer.py
浏览文件 @
62d82636
...
@@ -125,6 +125,8 @@ class Trainer(object):
...
@@ -125,6 +125,8 @@ class Trainer(object):
bias
=
self
.
cfg
[
'bias'
]
if
'bias'
in
self
.
cfg
else
0
bias
=
self
.
cfg
[
'bias'
]
if
'bias'
in
self
.
cfg
else
0
output_eval
=
self
.
cfg
[
'output_eval'
]
\
output_eval
=
self
.
cfg
[
'output_eval'
]
\
if
'output_eval'
in
self
.
cfg
else
None
if
'output_eval'
in
self
.
cfg
else
None
save_prediction_only
=
self
.
cfg
[
'save_prediction_only'
]
\
if
'save_prediction_only'
in
self
.
cfg
else
False
# pass clsid2catid info to metric instance to avoid multiple loading
# pass clsid2catid info to metric instance to avoid multiple loading
# annotation file
# annotation file
...
@@ -145,7 +147,8 @@ class Trainer(object):
...
@@ -145,7 +147,8 @@ class Trainer(object):
clsid2catid
=
clsid2catid
,
clsid2catid
=
clsid2catid
,
classwise
=
classwise
,
classwise
=
classwise
,
output_eval
=
output_eval
,
output_eval
=
output_eval
,
bias
=
bias
)
bias
=
bias
,
save_prediction_only
=
save_prediction_only
)
]
]
elif
self
.
cfg
.
metric
==
'VOC'
:
elif
self
.
cfg
.
metric
==
'VOC'
:
self
.
_metrics
=
[
self
.
_metrics
=
[
...
...
ppdet/metrics/metrics.py
浏览文件 @
62d82636
...
@@ -69,6 +69,7 @@ class COCOMetric(Metric):
...
@@ -69,6 +69,7 @@ class COCOMetric(Metric):
self
.
output_eval
=
kwargs
.
get
(
'output_eval'
,
None
)
self
.
output_eval
=
kwargs
.
get
(
'output_eval'
,
None
)
# TODO: bias should be unified
# TODO: bias should be unified
self
.
bias
=
kwargs
.
get
(
'bias'
,
0
)
self
.
bias
=
kwargs
.
get
(
'bias'
,
0
)
self
.
save_prediction_only
=
kwargs
.
get
(
'save_prediction_only'
,
False
)
self
.
reset
()
self
.
reset
()
def
reset
(
self
):
def
reset
(
self
):
...
@@ -104,6 +105,10 @@ class COCOMetric(Metric):
...
@@ -104,6 +105,10 @@ class COCOMetric(Metric):
json
.
dump
(
self
.
results
[
'bbox'
],
f
)
json
.
dump
(
self
.
results
[
'bbox'
],
f
)
logger
.
info
(
'The bbox result is saved to bbox.json.'
)
logger
.
info
(
'The bbox result is saved to bbox.json.'
)
if
self
.
save_prediction_only
:
logger
.
info
(
'The bbox result is saved to {} and do not '
'evaluate the mAP.'
.
format
(
output
))
else
:
bbox_stats
=
cocoapi_eval
(
bbox_stats
=
cocoapi_eval
(
output
,
output
,
'bbox'
,
'bbox'
,
...
@@ -120,6 +125,10 @@ class COCOMetric(Metric):
...
@@ -120,6 +125,10 @@ class COCOMetric(Metric):
json
.
dump
(
self
.
results
[
'mask'
],
f
)
json
.
dump
(
self
.
results
[
'mask'
],
f
)
logger
.
info
(
'The mask result is saved to mask.json.'
)
logger
.
info
(
'The mask result is saved to mask.json.'
)
if
self
.
save_prediction_only
:
logger
.
info
(
'The mask result is saved to {} and do not '
'evaluate the mAP.'
.
format
(
output
))
else
:
seg_stats
=
cocoapi_eval
(
seg_stats
=
cocoapi_eval
(
output
,
output
,
'segm'
,
'segm'
,
...
@@ -136,6 +145,10 @@ class COCOMetric(Metric):
...
@@ -136,6 +145,10 @@ class COCOMetric(Metric):
json
.
dump
(
self
.
results
[
'segm'
],
f
)
json
.
dump
(
self
.
results
[
'segm'
],
f
)
logger
.
info
(
'The segm result is saved to segm.json.'
)
logger
.
info
(
'The segm result is saved to segm.json.'
)
if
self
.
save_prediction_only
:
logger
.
info
(
'The segm result is saved to {} and do not '
'evaluate the mAP.'
.
format
(
output
))
else
:
seg_stats
=
cocoapi_eval
(
seg_stats
=
cocoapi_eval
(
output
,
output
,
'segm'
,
'segm'
,
...
...
tools/eval.py
浏览文件 @
62d82636
...
@@ -66,6 +66,12 @@ def parse_args():
...
@@ -66,6 +66,12 @@ def parse_args():
action
=
"store_true"
,
action
=
"store_true"
,
help
=
"whether per-category AP and draw P-R Curve or not."
)
help
=
"whether per-category AP and draw P-R Curve or not."
)
parser
.
add_argument
(
'--save_prediction_only'
,
action
=
'store_true'
,
default
=
False
,
help
=
'Whether to save the evaluation results only'
)
args
=
parser
.
parse_args
()
args
=
parser
.
parse_args
()
return
args
return
args
...
@@ -102,6 +108,7 @@ def main():
...
@@ -102,6 +108,7 @@ def main():
cfg
[
'bias'
]
=
1
if
FLAGS
.
bias
else
0
cfg
[
'bias'
]
=
1
if
FLAGS
.
bias
else
0
cfg
[
'classwise'
]
=
True
if
FLAGS
.
classwise
else
False
cfg
[
'classwise'
]
=
True
if
FLAGS
.
classwise
else
False
cfg
[
'output_eval'
]
=
FLAGS
.
output_eval
cfg
[
'output_eval'
]
=
FLAGS
.
output_eval
cfg
[
'save_prediction_only'
]
=
FLAGS
.
save_prediction_only
merge_config
(
FLAGS
.
opt
)
merge_config
(
FLAGS
.
opt
)
place
=
paddle
.
set_device
(
'gpu'
if
cfg
.
use_gpu
else
'cpu'
)
place
=
paddle
.
set_device
(
'gpu'
if
cfg
.
use_gpu
else
'cpu'
)
...
...
tools/train.py
浏览文件 @
62d82636
...
@@ -75,6 +75,11 @@ def parse_args():
...
@@ -75,6 +75,11 @@ def parse_args():
type
=
str
,
type
=
str
,
default
=
"vdl_log_dir/scalar"
,
default
=
"vdl_log_dir/scalar"
,
help
=
'VisualDL logging directory for scalar.'
)
help
=
'VisualDL logging directory for scalar.'
)
parser
.
add_argument
(
'--save_prediction_only'
,
action
=
'store_true'
,
default
=
False
,
help
=
'Whether to save the evaluation results only'
)
args
=
parser
.
parse_args
()
args
=
parser
.
parse_args
()
return
args
return
args
...
@@ -110,6 +115,7 @@ def main():
...
@@ -110,6 +115,7 @@ def main():
cfg
[
'fleet'
]
=
FLAGS
.
fleet
cfg
[
'fleet'
]
=
FLAGS
.
fleet
cfg
[
'use_vdl'
]
=
FLAGS
.
use_vdl
cfg
[
'use_vdl'
]
=
FLAGS
.
use_vdl
cfg
[
'vdl_log_dir'
]
=
FLAGS
.
vdl_log_dir
cfg
[
'vdl_log_dir'
]
=
FLAGS
.
vdl_log_dir
cfg
[
'save_prediction_only'
]
=
FLAGS
.
save_prediction_only
merge_config
(
FLAGS
.
opt
)
merge_config
(
FLAGS
.
opt
)
place
=
paddle
.
set_device
(
'gpu'
if
cfg
.
use_gpu
else
'cpu'
)
place
=
paddle
.
set_device
(
'gpu'
if
cfg
.
use_gpu
else
'cpu'
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录