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

[Datumaro] Fix duplicating keypoints in COCO export #1435

Merged
merged 3 commits into from
Apr 22, 2020
Merged

[Datumaro] Fix duplicating keypoints in COCO export #1435

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
a0fd75f
Fix coco keypoints export
zhiltsov-max Apr 20, 2020
f914882
update changelog
zhiltsov-max Apr 20, 2020
2862e50
Merge branch 'develop' into zm/dm-fix-coco-duplicating-keypoints
zhiltsov-max Apr 20, 2020
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed
- Auto annotation, TF annotation and Auto segmentation apps (https://github.com/opencv/cvat/pull/1409)
- Import works with truncated images now: "OSError:broken data stream" on corrupt images (https://github.com/opencv/cvat/pull/1430)
- Duplicating keypoints in COCO export (https://github.com/opencv/cvat/pull/1435)

### Security
-
Expand Down
6 changes: 3 additions & 3 deletions datumaro/datumaro/plugins/coco_format/converter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,8 +352,7 @@ def save_annotations(self, item):
instance = [points, [], None, points.get_bbox()]
elem = super().convert_instance(instance, item)
elem.update(self.convert_points_object(points))
if elem:
self.annotations.append(elem)
self.annotations.append(elem)

# Create annotations for complete instance + keypoints annotations
super().save_annotations(item)
Expand Down Expand Up @@ -390,7 +389,8 @@ def convert_points_object(ann):

def convert_instance(self, instance, item):
points_ann = find(item.annotations, lambda x: \
x.type == AnnotationType.points and x.group == instance[0].group)
x.type == AnnotationType.points and \
instance[0].group and x.group == instance[0].group)
if not points_ann:
return None

Expand Down
2 changes: 1 addition & 1 deletion datumaro/tests/test_coco_format.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,7 @@ def __iter__(self):
Points([1, 2, 3, 4, 2, 3], group=2, id=2),
Bbox(1, 2, 2, 2, group=2, id=2),
]),
DatasetItem(id=2, subset='train',
DatasetItem(id=2, subset='train', image=np.zeros((5, 4, 3)),
annotations=[
# Solitary keypoints
Points([1, 2, 0, 2, 4, 1], label=5, id=3),
Expand Down