From 7d6273a20e1874d56a4325ae7536def96354834f Mon Sep 17 00:00:00 2001 From: Zhiltsov Max Date: Mon, 25 Jan 2021 16:04:51 +0300 Subject: [PATCH 1/3] Update datumaro installation --- cvat/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cvat/requirements/base.txt b/cvat/requirements/base.txt index 6d0a26b9f6d0..b6ac85c5d0bf 100644 --- a/cvat/requirements/base.txt +++ b/cvat/requirements/base.txt @@ -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 From 0779ff50721ce383ec029a5207949d98a6090a3e Mon Sep 17 00:00:00 2001 From: Zhiltsov Max Date: Mon, 25 Jan 2021 19:10:36 +0300 Subject: [PATCH 2/3] Update dm usage --- cvat/apps/dataset_manager/formats/cvat.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cvat/apps/dataset_manager/formats/cvat.py b/cvat/apps/dataset_manager/formats/cvat.py index 4f78e20d3706..d825dae0c651 100644 --- a/cvat/apps/dataset_manager/formats/cvat.py +++ b/cvat/apps/dataset_manager/formats/cvat.py @@ -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 @@ -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 = { From 5b12ea1606d530bc201113264a6c49ff9c2439ef Mon Sep 17 00:00:00 2001 From: Zhiltsov Max Date: Tue, 26 Jan 2021 12:56:50 +0300 Subject: [PATCH 3/3] add no-binary to force setup.py invocation --- cvat/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cvat/requirements/base.txt b/cvat/requirements/base.txt index b6ac85c5d0bf..4c031d422a45 100644 --- a/cvat/requirements/base.txt +++ b/cvat/requirements/base.txt @@ -45,4 +45,4 @@ tensorflow==2.4.0 # Optional requirement of Datumaro patool==1.12 diskcache==5.0.2 open3d==0.11.2 -datumaro==0.1.5.1 +datumaro==0.1.5.1 --no-binary=datumaro