Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Datumaro installation #2715

Merged
merged 3 commits into from
Jan 26, 2021
Merged

Update Datumaro installation #2715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7d6273a
Update datumaro installation
zhiltsov-max Jan 25, 2021
0779ff5
Update dm usage
zhiltsov-max Jan 25, 2021
5b12ea1
add no-binary to force setup.py invocation
zhiltsov-max Jan 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions cvat/apps/dataset_manager/formats/cvat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
from cvat.apps.dataset_manager.util import make_zip_archive
from cvat.apps.engine.frame_provider import FrameProvider
from datumaro.components.extractor import DatasetItem
from datumaro.util.image import save_image

from .registry import exporter, importer

Expand Down Expand Up @@ -441,8 +440,11 @@ def load(file_object, annotations):
elif el.tag == 'image':
image_is_opened = True
frame_id = annotations.abs_frame_id(match_dm_item(
DatasetItem(id=el.attrib['id'], image=el.attrib['name']),
annotations))
DatasetItem(id=el.attrib['name'],
attributes={'frame': el.attrib['id']}
),
task_data=annotations
))
elif el.tag in supported_shapes and (track is not None or image_is_opened):
attributes = []
shape = {
Expand Down
2 changes: 1 addition & 1 deletion cvat/requirements/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,4 @@ tensorflow==2.4.0 # Optional requirement of Datumaro
patool==1.12
diskcache==5.0.2
open3d==0.11.2
git+https://github.com/openvinotoolkit/datumaro@v0.1.4
datumaro==0.1.5.1 --no-binary=datumaro