Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
疯人忠
Cvat
提交
2311b10b
C
Cvat
项目概览
疯人忠
/
Cvat
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
Cvat
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
2311b10b
编写于
10月 21, 2022
作者:
A
Anastasia Yasakova
提交者:
GitHub
10月 21, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix an issue with Imagenet dataset import (#4861)
上级
469217cc
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
119 addition
and
13 deletion
+119
-13
CHANGELOG.md
CHANGELOG.md
+1
-0
cvat/apps/dataset_manager/bindings.py
cvat/apps/dataset_manager/bindings.py
+10
-3
tests/python/rest_api/test_projects.py
tests/python/rest_api/test_projects.py
+17
-0
tests/python/shared/assets/annotations.json
tests/python/shared/assets/annotations.json
+36
-2
tests/python/shared/assets/cvat_db/cvat_data.tar.bz2
tests/python/shared/assets/cvat_db/cvat_data.tar.bz2
+0
-0
tests/python/shared/assets/cvat_db/data.json
tests/python/shared/assets/cvat_db/data.json
+51
-4
tests/python/shared/assets/jobs.json
tests/python/shared/assets/jobs.json
+1
-1
tests/python/shared/assets/projects.json
tests/python/shared/assets/projects.json
+1
-1
tests/python/shared/assets/tasks.json
tests/python/shared/assets/tasks.json
+1
-1
tests/python/shared/assets/users.json
tests/python/shared/assets/users.json
+1
-1
未找到文件。
CHANGELOG.md
浏览文件 @
2311b10b
...
...
@@ -138,6 +138,7 @@ Skeleton (<https://github.com/cvat-ai/cvat/pull/1>), (<https://github.com/opencv
-
Fix build dependencies for Siammask (
<https://github.com/openvinotoolkit/cvat/pull/4486>
)
-
Bug: Exif orientation information handled incorrectly (
<https://github.com/openvinotoolkit/cvat/pull/4529>
)
-
Fixed build of retinanet function image (
<https://github.com/cvat-ai/cvat/pull/54>
)
-
Bug: Import dataset of Imagenet format fail (
<https://github.com/opencv/cvat/issues/4850>
)
## \[2.0.0] - 2022-03-04
### Added
...
...
cvat/apps/dataset_manager/bindings.py
浏览文件 @
2311b10b
...
...
@@ -1885,17 +1885,24 @@ def load_dataset_data(project_annotation, dataset: dm.Dataset, project_data):
'data_root'
:
dataset
.
data_path
+
osp
.
sep
,
}
root_paths
=
set
()
for
dataset_item
in
subset_dataset
:
if
dataset_item
.
image
and
dataset_item
.
image
.
has_data
:
dataset_files
[
'media'
].
append
(
dataset_item
.
image
.
path
)
data_root
=
dataset_item
.
image
.
path
.
rsplit
(
dataset_item
.
id
,
1
)
if
len
(
data_root
)
==
2
:
root_paths
.
add
(
data_root
[
0
])
elif
dataset_item
.
point_cloud
:
dataset_files
[
'media'
].
append
(
dataset_item
.
point_cloud
)
data_root
=
dataset_item
.
point_cloud
.
rsplit
(
dataset_item
.
id
,
1
)
if
len
(
data_root
)
==
2
:
root_paths
.
add
(
data_root
[
0
])
if
isinstance
(
dataset_item
.
related_images
,
list
):
dataset_files
[
'media'
]
+=
\
list
(
map
(
lambda
ri
:
ri
.
path
,
dataset_item
.
related_images
))
shortes_path
=
min
(
dataset_files
[
'media'
],
key
=
lambda
x
:
len
(
Path
(
x
).
parts
),
default
=
None
)
if
shortes_path
is
not
None
:
dataset_files
[
'data_root'
]
=
str
(
Path
(
shortes_path
).
parent
.
absolute
())
+
osp
.
sep
if
len
(
root_paths
):
dataset_files
[
'data_root'
]
=
osp
.
commonpath
(
root_paths
)
+
osp
.
sep
project_annotation
.
add_task
(
task_fields
,
dataset_files
,
project_data
)
tests/python/rest_api/test_projects.py
浏览文件 @
2311b10b
...
...
@@ -458,6 +458,23 @@ class TestImportExportDatasetProject:
)
assert
response
.
status
==
HTTPStatus
.
ACCEPTED
def
test_can_import_export_dataset_with_imagenet_format
(
self
):
# https://github.com/opencv/cvat/issues/4850
username
=
"admin1"
format_name
=
"ImageNet 1.0"
project_id
=
4
response
=
self
.
_test_export_project
(
username
,
project_id
,
format_name
)
tmp_file
=
io
.
BytesIO
(
response
.
data
)
tmp_file
.
name
=
"dataset.zip"
import_data
=
{
"dataset_file"
:
tmp_file
,
}
self
.
_test_import_project
(
username
,
project_id
,
format_name
,
import_data
)
@
pytest
.
mark
.
usefixtures
(
"restore_db_per_function"
)
class
TestPatchProjectLabel
:
...
...
tests/python/shared/assets/annotations.json
浏览文件 @
2311b10b
...
...
@@ -361,7 +361,24 @@
"z_order"
:
0
}
],
"tags"
:
[],
"tags"
:
[
{
"attributes"
:
[],
"frame"
:
2
,
"group"
:
0
,
"id"
:
1
,
"label_id"
:
17
,
"source"
:
"manual"
},
{
"attributes"
:
[],
"frame"
:
3
,
"group"
:
0
,
"id"
:
2
,
"label_id"
:
16
,
"source"
:
"manual"
}
],
"tracks"
:
[],
"version"
:
0
},
...
...
@@ -1003,7 +1020,24 @@
"z_order"
:
0
}
],
"tags"
:
[],
"tags"
:
[
{
"attributes"
:
[],
"frame"
:
2
,
"group"
:
0
,
"id"
:
1
,
"label_id"
:
17
,
"source"
:
"manual"
},
{
"attributes"
:
[],
"frame"
:
3
,
"group"
:
0
,
"id"
:
2
,
"label_id"
:
16
,
"source"
:
"manual"
}
],
"tracks"
:
[],
"version"
:
0
},
...
...
tests/python/shared/assets/cvat_db/cvat_data.tar.bz2
浏览文件 @
2311b10b
无法预览此类型文件
tests/python/shared/assets/cvat_db/data.json
浏览文件 @
2311b10b
...
...
@@ -36,7 +36,7 @@
"pk"
:
1
,
"fields"
:
{
"password"
:
"pbkdf2_sha256$260000$DevmxlmLwciP1P6sZs2Qag$U9DFtjTWx96Sk95qY6UXVcvpdQEP2LcoFBftk5D2RKY="
,
"last_login"
:
"2022-
09-29T08:00:09.73
3Z"
,
"last_login"
:
"2022-
10-17T17:09:16.90
3Z"
,
"is_superuser"
:
true
,
"username"
:
"admin1"
,
"first_name"
:
"Admin"
,
...
...
@@ -487,6 +487,14 @@
"expire_date"
:
"2022-03-02T06:24:53.914Z"
}
},
{
"model"
:
"sessions.session"
,
"pk"
:
"d3rhbsiax4etv2gtdkl6j883hvlz21rc"
,
"fields"
:
{
"session_data"
:
".eJxVjMsOwiAQRf-FtSEMDAIu3fcbyPBQqgaS0q6M_y5NutDtOefeN_O0rcVvPS9-TuzCgJ1-WaD4zHUX6UH13nhsdV3mwPeEH7bzqaX8uh7t30GhXsYaQYNDpYMULqECS9IY0uIGxmYUQdoYMCpIeRgYiXVaDXoWgkImZJ8vqTk2zg:1okTc4:kq0YGX6_uyDwCa3VLl1bcp38oBfM6XfHIk0oE4XzpPw"
,
"expire_date"
:
"2022-10-31T17:09:16.915Z"
}
},
{
"model"
:
"sessions.session"
,
"pk"
:
"dpaw6pntyqwr5l6qjv6zq3yoajp301be"
,
...
...
@@ -2242,7 +2250,7 @@
"assignee"
:
null
,
"bug_tracker"
:
""
,
"created_date"
:
"2022-06-08T08:32:45.521Z"
,
"updated_date"
:
"2022-
09-28T12:26:54.279
Z"
,
"updated_date"
:
"2022-
10-17T17:09:36.526
Z"
,
"status"
:
"annotation"
,
"organization"
:
2
,
"source_storage"
:
null
,
...
...
@@ -2532,7 +2540,7 @@
"assignee"
:
null
,
"bug_tracker"
:
""
,
"created_date"
:
"2022-06-08T08:33:06.505Z"
,
"updated_date"
:
"2022-
06-08T08:33:20.808
Z"
,
"updated_date"
:
"2022-
10-17T17:09:36.570
Z"
,
"overlap"
:
0
,
"segment_size"
:
5
,
"status"
:
"annotation"
,
...
...
@@ -3574,7 +3582,7 @@
"fields"
:
{
"segment"
:
17
,
"assignee"
:
null
,
"updated_date"
:
"2022-
06-22T09:18:45.296
Z"
,
"updated_date"
:
"2022-
10-17T17:09:36.571
Z"
,
"status"
:
"annotation"
,
"stage"
:
"annotation"
,
"state"
:
"in progress"
...
...
@@ -4726,6 +4734,45 @@
"job"
:
18
}
},
{
"model"
:
"engine.jobcommit"
,
"pk"
:
73
,
"fields"
:
{
"scope"
:
"create"
,
"owner"
:
[
"admin1"
],
"timestamp"
:
"2022-10-17T17:09:36.573Z"
,
"data"
:
{
"stage"
:
"annotation"
,
"state"
:
"in progress"
,
"assignee"
:
null
},
"job"
:
17
}
},
{
"model"
:
"engine.labeledimage"
,
"pk"
:
1
,
"fields"
:
{
"job"
:
17
,
"label"
:
17
,
"frame"
:
2
,
"group"
:
0
,
"source"
:
"manual"
}
},
{
"model"
:
"engine.labeledimage"
,
"pk"
:
2
,
"fields"
:
{
"job"
:
17
,
"label"
:
16
,
"frame"
:
3
,
"group"
:
0
,
"source"
:
"manual"
}
},
{
"model"
:
"engine.labeledshape"
,
"pk"
:
1
,
...
...
tests/python/shared/assets/jobs.json
浏览文件 @
2311b10b
...
...
@@ -235,7 +235,7 @@
"status"
:
"annotation"
,
"stop_frame"
:
4
,
"task_id"
:
13
,
"updated_date"
:
"2022-
06-22T09:18:45.296
000Z"
,
"updated_date"
:
"2022-
10-17T17:09:36.571
000Z"
,
"url"
:
"http://localhost:8080/api/jobs/17"
},
{
...
...
tests/python/shared/assets/projects.json
浏览文件 @
2311b10b
...
...
@@ -353,7 +353,7 @@
"tasks"
:
[
13
],
"updated_date"
:
"2022-
09-28T12:26:54.279
000Z"
,
"updated_date"
:
"2022-
10-17T17:09:36.526
000Z"
,
"url"
:
"http://localhost:8080/api/projects/4"
},
{
...
...
tests/python/shared/assets/tasks.json
浏览文件 @
2311b10b
...
...
@@ -303,7 +303,7 @@
"status"
:
"annotation"
,
"subset"
:
""
,
"target_storage"
:
null
,
"updated_date"
:
"2022-
06-08T08:33:20.808
000Z"
,
"updated_date"
:
"2022-
10-17T17:09:36.570
000Z"
,
"url"
:
"http://localhost:8080/api/tasks/13"
},
{
...
...
tests/python/shared/assets/users.json
浏览文件 @
2311b10b
...
...
@@ -310,7 +310,7 @@
"is_active"
:
true
,
"is_staff"
:
true
,
"is_superuser"
:
true
,
"last_login"
:
"2022-
09-29T08:00:09.73300
0Z"
,
"last_login"
:
"2022-
10-17T17:09:16.90314
0Z"
,
"last_name"
:
"First"
,
"url"
:
"http://localhost:8080/api/users/1"
,
"username"
:
"admin1"
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录