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

Jump to bottom

Enhance Datumaro data format stream importer performance #1153

Merged
merged 5 commits into from
Sep 22, 2023
Merged

Enhance Datumaro data format stream importer performance #1153

merged 5 commits into from
Sep 22, 2023

Conversation

vinnamkim
Copy link
Contributor

@vinnamkim vinnamkim commented Sep 19, 2023 •
edited
Loading

Summary

  • Ticket no. 120785
  • Change streaming import logic with DatumPageMapper implemented in Rust
Before After
image image

How to test

Our existing tests cover this change.

Checklist

  • I have added unit tests to cover my changes.​
  • I have added integration tests to cover my changes.​
  • I have added the description of my changes into CHANGELOG.​
  • I have updated the documentation accordingly

License

  • I submit my code changes under the same MIT License that covers the project.
    Feel free to contact the maintainers if that's a concern.
  • I have updated the license header for each file (see an example below).
# Copyright (C) 2023 Intel Corporation
#
# SPDX-License-Identifier: MIT

@vinnamkim vinnamkim added this to the 1.6.0 milestone Sep 19, 2023
@vinnamkim vinnamkim added the ENHANCE Enhancement of existing features label Sep 19, 2023
@vinnamkim vinnamkim marked this pull request as ready for review September 19, 2023 09:00
@vinnamkim vinnamkim requested review from a team as code owners September 19, 2023 09:00
@vinnamkim vinnamkim requested review from wonjuleee and removed request for a team September 19, 2023 09:00
@yunchu yunchu marked this pull request as draft September 20, 2023 01:24
@yunchu yunchu marked this pull request as ready for review September 20, 2023 01:24
@vinnamkim vinnamkim closed this Sep 20, 2023
@vinnamkim vinnamkim reopened this Sep 20, 2023
@codecov
Copy link

codecov bot commented Sep 20, 2023 •
edited
Loading

Codecov Report

Patch coverage: 81.03% and project coverage change: -0.03% ⚠️

Comparison is base (0e8312b) 79.98% compared to head (97011c5) 79.96%.

Additional details and impacted files 
@@                Coverage Diff                 @@
##           releases/1.5.0    #1153      +/-   ##
==================================================
- Coverage           79.98%   79.96%   -0.03%     
==================================================
  Files                 266      267       +1     
  Lines               29967    29981      +14     
  Branches             5901     5898       -3     
==================================================
+ Hits                23970    23975       +5     
- Misses               4637     4649      +12     
+ Partials             1360     1357       -3
Flag Coverage Δ
macos-11_Python-3.8 79.08% <81.03%> (-0.02%) ⬇️
ubuntu-20.04_Python-3.8 79.95% <81.03%> (-0.03%) ⬇️
windows-2019_Python-3.8 79.89% <81.03%> (-0.03%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Changed Coverage Δ
...umaro/plugins/data_formats/datumaro/page_mapper.py 78.57% <78.57%> (ø)
src/datumaro/plugins/data_formats/datumaro/base.py 88.70% <87.50%> (+0.66%) ⬆️

... and 1 file with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@vinnamkim vinnamkim force-pushed the enhance/datum-stream-importer-to-rust-impl branch 4 times, most recently from 294193c to 8728679 Compare September 21, 2023 05:13
wonjuleee
wonjuleee reviewed Sep 21, 2023
View reviewed changes
Copy link
Contributor

@wonjuleee wonjuleee left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In overall, it looks good to me, but could you change the target branch to release/1.5.0?

@vinnamkim vinnamkim changed the base branch from develop to releases/1.5.0 September 21, 2023 07:13
@vinnamkim vinnamkim force-pushed the enhance/datum-stream-importer-to-rust-impl branch 2 times, most recently from d7e17c4 to 97011c5 Compare September 21, 2023 07:16
@vinnamkim
Enhance stream importer for the Datumaro data format
1d6590a 
 - Change streaming import logic with DatumPageMapper implemented in Rust

Signed-off-by: Kim, Vinnam <vinnam.kim@intel.com>
@vinnamkim
Update CHANGELOG.md
61a1665 
Signed-off-by: Kim, Vinnam <vinnam.kim@intel.com>
@vinnamkim
Log compare()'s exception
8126a8e 
Signed-off-by: Kim, Vinnam <vinnam.kim@intel.com>
@vinnamkim
Use TestDir()
bdb96e6 
Signed-off-by: Kim, Vinnam <vinnam.kim@intel.com>
@vinnamkim
Copy link
Contributor Author

In overall, it looks good to me, but could you change the target branch to release/1.5.0?

Changed it to releases/1.5.0

@vinnamkim
Try rmtree() several times
97011c5 
Signed-off-by: Kim, Vinnam <vinnam.kim@intel.com>
@vinnamkim vinnamkim merged commit 45958aa into openvinotoolkit:releases/1.5.0 Sep 22, 2023
6 checks passed
@vinnamkim vinnamkim removed this from the 1.6.0 milestone Oct 19, 2023
@vinnamkim vinnamkim added this to the 1.5.1 milestone Oct 19, 2023
yunchu pushed a commit to yunchu/datumaro that referenced this pull request Oct 23, 2023
@vinnamkim @yunchu
Enhance Datumaro data format stream importer performance (openvinotoo…
1e45f45 
…lkit#1153)

 - Ticket no. 120785
- Change streaming import logic with DatumPageMapper implemented in Rust

| Before | After |
| :-: | :-: |
|
![image](https://github.com/openvinotoolkit/datumaro/assets/26541465/0a06ddc0-5256-45b4-af03-e9299b8e61b8)
|
![image](https://github.com/openvinotoolkit/datumaro/assets/26541465/af76210b-8fb5-4b30-aec1-2b5a22856ef7)
|

Signed-off-by: Kim, Vinnam <vinnam.kim@intel.com>
@vinnamkim
Copy link
Contributor Author

vinnamkim commented Jul 9, 2024 •
edited
Loading

These are final performance comparison results between StreamDataset and Dataset (non-StreamDataset) for COCO, Datum, VOC, and YOLO data formats:

  StreamDataset Dataset
COCO image image 
Datumaro image  image
VOC image image 
YOLO image image

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wonjuleee wonjuleee wonjuleee approved these changes

Assignees
No one assigned
Labels
ENHANCE Enhancement of existing features
Projects
None yet
Milestone
1.5.1
Development

Successfully merging this pull request may close these issues.
2 participants
@vinnamkim @wonjuleee