Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
Y
yolov5
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
Administrator
yolov5
Commits
ffb6e110
Unverified
提交
ffb6e110
authored
6月 25, 2021
作者:
Ayush Chaurasia
提交者:
GitHub
6月 25, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
W&B: Update Tables API and comply with new dataset_check (#3772)
* Update tables API and windows path fix * update dataset check
上级
09246a5a
隐藏空白字符变更
内嵌
并排
正在显示
1 个修改的文件
包含
11 行增加
和
6 行删除
+11
-6
wandb_utils.py
utils/wandb_logging/wandb_utils.py
+11
-6
没有找到文件。
utils/wandb_logging/wandb_utils.py
浏览文件 @
ffb6e110
...
@@ -136,7 +136,6 @@ class WandbLogger():
...
@@ -136,7 +136,6 @@ class WandbLogger():
def
check_and_upload_dataset
(
self
,
opt
):
def
check_and_upload_dataset
(
self
,
opt
):
assert
wandb
,
'Install wandb to upload dataset'
assert
wandb
,
'Install wandb to upload dataset'
check_dataset
(
self
.
data_dict
)
config_path
=
self
.
log_dataset_artifact
(
check_file
(
opt
.
data
),
config_path
=
self
.
log_dataset_artifact
(
check_file
(
opt
.
data
),
opt
.
single_cls
,
opt
.
single_cls
,
'YOLOv5'
if
opt
.
project
==
'runs/train'
else
Path
(
opt
.
project
)
.
stem
)
'YOLOv5'
if
opt
.
project
==
'runs/train'
else
Path
(
opt
.
project
)
.
stem
)
...
@@ -171,9 +170,11 @@ class WandbLogger():
...
@@ -171,9 +170,11 @@ class WandbLogger():
data_dict
[
'val'
]
=
str
(
val_path
)
data_dict
[
'val'
]
=
str
(
val_path
)
self
.
val_table
=
self
.
val_artifact
.
get
(
"val"
)
self
.
val_table
=
self
.
val_artifact
.
get
(
"val"
)
self
.
map_val_table_path
()
self
.
map_val_table_path
()
wandb
.
log
({
"validation dataset"
:
self
.
val_table
})
if
self
.
val_artifact
is
not
None
:
if
self
.
val_artifact
is
not
None
:
self
.
result_artifact
=
wandb
.
Artifact
(
"run_"
+
wandb
.
run
.
id
+
"_progress"
,
"evaluation"
)
self
.
result_artifact
=
wandb
.
Artifact
(
"run_"
+
wandb
.
run
.
id
+
"_progress"
,
"evaluation"
)
self
.
result_table
=
wandb
.
Table
([
"epoch"
,
"id"
,
"prediction"
,
"avg_confidence"
])
self
.
result_table
=
wandb
.
Table
([
"epoch"
,
"id"
,
"
ground truth"
,
"
prediction"
,
"avg_confidence"
])
if
opt
.
bbox_interval
==
-
1
:
if
opt
.
bbox_interval
==
-
1
:
self
.
bbox_interval
=
opt
.
bbox_interval
=
(
opt
.
epochs
//
10
)
if
opt
.
epochs
>
10
else
1
self
.
bbox_interval
=
opt
.
bbox_interval
=
(
opt
.
epochs
//
10
)
if
opt
.
epochs
>
10
else
1
return
data_dict
return
data_dict
...
@@ -181,7 +182,7 @@ class WandbLogger():
...
@@ -181,7 +182,7 @@ class WandbLogger():
def
download_dataset_artifact
(
self
,
path
,
alias
):
def
download_dataset_artifact
(
self
,
path
,
alias
):
if
isinstance
(
path
,
str
)
and
path
.
startswith
(
WANDB_ARTIFACT_PREFIX
):
if
isinstance
(
path
,
str
)
and
path
.
startswith
(
WANDB_ARTIFACT_PREFIX
):
artifact_path
=
Path
(
remove_prefix
(
path
,
WANDB_ARTIFACT_PREFIX
)
+
":"
+
alias
)
artifact_path
=
Path
(
remove_prefix
(
path
,
WANDB_ARTIFACT_PREFIX
)
+
":"
+
alias
)
dataset_artifact
=
wandb
.
use_artifact
(
artifact_path
.
as_posix
())
dataset_artifact
=
wandb
.
use_artifact
(
artifact_path
.
as_posix
()
.
replace
(
"
\\
"
,
"/"
)
)
assert
dataset_artifact
is
not
None
,
"'Error: W&B dataset artifact doesn
\'
t exist'"
assert
dataset_artifact
is
not
None
,
"'Error: W&B dataset artifact doesn
\'
t exist'"
datadir
=
dataset_artifact
.
download
()
datadir
=
dataset_artifact
.
download
()
return
datadir
,
dataset_artifact
return
datadir
,
dataset_artifact
...
@@ -216,6 +217,7 @@ class WandbLogger():
...
@@ -216,6 +217,7 @@ class WandbLogger():
def
log_dataset_artifact
(
self
,
data_file
,
single_cls
,
project
,
overwrite_config
=
False
):
def
log_dataset_artifact
(
self
,
data_file
,
single_cls
,
project
,
overwrite_config
=
False
):
with
open
(
data_file
)
as
f
:
with
open
(
data_file
)
as
f
:
data
=
yaml
.
safe_load
(
f
)
# data dict
data
=
yaml
.
safe_load
(
f
)
# data dict
check_dataset
(
data
)
nc
,
names
=
(
1
,
[
'item'
])
if
single_cls
else
(
int
(
data
[
'nc'
]),
data
[
'names'
])
nc
,
names
=
(
1
,
[
'item'
])
if
single_cls
else
(
int
(
data
[
'nc'
]),
data
[
'names'
])
names
=
{
k
:
v
for
k
,
v
in
enumerate
(
names
)}
# to index dictionary
names
=
{
k
:
v
for
k
,
v
in
enumerate
(
names
)}
# to index dictionary
self
.
train_artifact
=
self
.
create_dataset_table
(
LoadImagesAndLabels
(
self
.
train_artifact
=
self
.
create_dataset_table
(
LoadImagesAndLabels
(
...
@@ -228,6 +230,7 @@ class WandbLogger():
...
@@ -228,6 +230,7 @@ class WandbLogger():
data
[
'val'
]
=
WANDB_ARTIFACT_PREFIX
+
str
(
Path
(
project
)
/
'val'
)
data
[
'val'
]
=
WANDB_ARTIFACT_PREFIX
+
str
(
Path
(
project
)
/
'val'
)
path
=
data_file
if
overwrite_config
else
'_wandb.'
.
join
(
data_file
.
rsplit
(
'.'
,
1
))
# updated data.yaml path
path
=
data_file
if
overwrite_config
else
'_wandb.'
.
join
(
data_file
.
rsplit
(
'.'
,
1
))
# updated data.yaml path
data
.
pop
(
'download'
,
None
)
data
.
pop
(
'download'
,
None
)
data
.
pop
(
'path'
,
None
)
with
open
(
path
,
'w'
)
as
f
:
with
open
(
path
,
'w'
)
as
f
:
yaml
.
safe_dump
(
data
,
f
)
yaml
.
safe_dump
(
data
,
f
)
...
@@ -297,6 +300,7 @@ class WandbLogger():
...
@@ -297,6 +300,7 @@ class WandbLogger():
id
=
self
.
val_table_map
[
Path
(
path
)
.
name
]
id
=
self
.
val_table_map
[
Path
(
path
)
.
name
]
self
.
result_table
.
add_data
(
self
.
current_epoch
,
self
.
result_table
.
add_data
(
self
.
current_epoch
,
id
,
id
,
self
.
val_table
.
data
[
id
][
1
],
wandb
.
Image
(
self
.
val_table
.
data
[
id
][
1
],
boxes
=
boxes
,
classes
=
class_set
),
wandb
.
Image
(
self
.
val_table
.
data
[
id
][
1
],
boxes
=
boxes
,
classes
=
class_set
),
total_conf
/
max
(
1
,
len
(
box_data
))
total_conf
/
max
(
1
,
len
(
box_data
))
)
)
...
@@ -312,11 +316,12 @@ class WandbLogger():
...
@@ -312,11 +316,12 @@ class WandbLogger():
wandb
.
log
(
self
.
log_dict
)
wandb
.
log
(
self
.
log_dict
)
self
.
log_dict
=
{}
self
.
log_dict
=
{}
if
self
.
result_artifact
:
if
self
.
result_artifact
:
train_results
=
wandb
.
JoinedTable
(
self
.
val_table
,
self
.
result_table
,
"id"
)
self
.
result_artifact
.
add
(
self
.
result_table
,
'result'
)
self
.
result_artifact
.
add
(
train_results
,
'result'
)
wandb
.
log_artifact
(
self
.
result_artifact
,
aliases
=
[
'latest'
,
'last'
,
'epoch '
+
str
(
self
.
current_epoch
),
wandb
.
log_artifact
(
self
.
result_artifact
,
aliases
=
[
'latest'
,
'last'
,
'epoch '
+
str
(
self
.
current_epoch
),
(
'best'
if
best_result
else
''
)])
(
'best'
if
best_result
else
''
)])
self
.
result_table
=
wandb
.
Table
([
"epoch"
,
"id"
,
"prediction"
,
"avg_confidence"
])
wandb
.
log
({
"evaluation"
:
self
.
result_table
})
self
.
result_table
=
wandb
.
Table
([
"epoch"
,
"id"
,
"ground truth"
,
"prediction"
,
"avg_confidence"
])
self
.
result_artifact
=
wandb
.
Artifact
(
"run_"
+
wandb
.
run
.
id
+
"_progress"
,
"evaluation"
)
self
.
result_artifact
=
wandb
.
Artifact
(
"run_"
+
wandb
.
run
.
id
+
"_progress"
,
"evaluation"
)
def
finish_run
(
self
):
def
finish_run
(
self
):
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论