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.

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

Refactor Images #921

Merged
merged 26 commits into from
Apr 11, 2023
Merged

Refactor Images #921

merged 26 commits into from
Apr 11, 2023

Conversation

cih9088
Copy link
Contributor

@cih9088 cih9088 commented Apr 7, 2023

Summary

Refactoring Media (CVS-107626).

A following work of #911.

  • Refactored Image, RoIImage, MosaicImage
  • Deprecated ByteImage
  • Fixed PointCloud design mismatch
  • Added extra images save functionality in PointCloud
  • Removed related_images directory for Datumaro/Datumaro binary format and used images directory for extra images instead.
  • Fixed to compare contents in tests.utils.test_utils.compare_datasets_3d

We may require to split the medi.py into multiple files.

How to test

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

Signed-off-by: Inhyuk Andy Cho <andy.inhyuk.jo@intel.com>
Signed-off-by: Inhyuk Andy Cho <andy.inhyuk.jo@intel.com>
Signed-off-by: Inhyuk Andy Cho <andy.inhyuk.jo@intel.com>
Signed-off-by: Inhyuk Andy Cho <andy.inhyuk.jo@intel.com>
Signed-off-by: Inhyuk Andy Cho <andy.inhyuk.jo@intel.com>
Signed-off-by: Inhyuk Andy Cho <andy.inhyuk.jo@intel.com>
Signed-off-by: Inhyuk Andy Cho <andy.inhyuk.jo@intel.com>
Signed-off-by: Inhyuk Andy Cho <andy.inhyuk.jo@intel.com>
Signed-off-by: Inhyuk Andy Cho <andy.inhyuk.jo@intel.com>
Signed-off-by: Inhyuk Andy Cho <andy.inhyuk.jo@intel.com>
Signed-off-by: Inhyuk Andy Cho <andy.inhyuk.jo@intel.com>
Signed-off-by: Inhyuk Andy Cho <andy.inhyuk.jo@intel.com>
Signed-off-by: Inhyuk Andy Cho <andy.inhyuk.jo@intel.com>
Signed-off-by: Inhyuk Andy Cho <andy.inhyuk.jo@intel.com>
@cih9088 cih9088 added this to the 1.2.0 milestone Apr 7, 2023
@cih9088 cih9088 requested a review from vinnamkim April 7, 2023 04:36
@cih9088 cih9088 requested review from a team as code owners April 7, 2023 04:36
@cih9088 cih9088 force-pushed the refactor/image branch 2 times, most recently from b75c5b0 to e3937e6 Compare April 7, 2023 04:39
@codecov-commenter
Copy link

codecov-commenter commented Apr 7, 2023

Codecov Report

Patch coverage: 75.65% and project coverage change: -0.15 ⚠️

Comparison is base (d122ab8) 78.88% compared to head (a64b42f) 78.73%.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop     #921      +/-   ##
===========================================
- Coverage    78.88%   78.73%   -0.15%     
===========================================
  Files          215      215              
  Lines        25220    25478     +258     
  Branches      5046     5085      +39     
===========================================
+ Hits         19895    20061     +166     
- Misses        4191     4255      +64     
- Partials      1134     1162      +28     
Flag Coverage Δ
macos-11_Python-3.8 77.73% <75.65%> (-0.15%) ⬇️
ubuntu-20.04_Python-3.8 78.73% <75.65%> (-0.15%) ⬇️
windows-2019_Python-3.8 ?

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

Impacted Files Coverage Δ
datumaro/components/dataset_base.py 72.89% <0.00%> (-1.80%) ⬇️
datumaro/components/filter.py 91.34% <0.00%> (-0.93%) ⬇️
datumaro/plugins/data_formats/ade20k2017.py 83.00% <ø> (ø)
datumaro/plugins/data_formats/ade20k2020.py 85.24% <ø> (ø)
datumaro/plugins/data_formats/ava/ava.py 84.00% <ø> (ø)
datumaro/plugins/data_formats/camvid.py 87.14% <ø> (ø)
datumaro/plugins/data_formats/coco/base.py 92.09% <ø> (ø)
datumaro/plugins/data_formats/datumaro/format.py 100.00% <ø> (ø)
...aro/plugins/data_formats/datumaro_binary/format.py 89.47% <ø> (-0.53%) ⬇️
datumaro/plugins/data_formats/imagenet_txt.py 86.56% <ø> (ø)
... and 49 more

... and 3 files with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

Signed-off-by: Inhyuk Andy Cho <andy.inhyuk.jo@intel.com>
@cih9088 cih9088 marked this pull request as draft April 7, 2023 06:42
@cih9088 cih9088 marked this pull request as ready for review April 7, 2023 07:36
datumaro/components/exporter.py Show resolved Hide resolved
datumaro/components/media.py Outdated Show resolved Hide resolved
datumaro/components/media.py Outdated Show resolved Hide resolved
datumaro/components/media.py Outdated Show resolved Hide resolved
datumaro/components/media.py Show resolved Hide resolved
datumaro/components/media.py Outdated Show resolved Hide resolved
datumaro/components/media.py Show resolved Hide resolved
Signed-off-by: Inhyuk Andy Cho <andy.inhyuk.jo@intel.com>
Signed-off-by: Inhyuk Andy Cho <andy.inhyuk.jo@intel.com>
vinnamkim
vinnamkim previously approved these changes Apr 10, 2023
Copy link
Contributor

@vinnamkim vinnamkim left a comment

Choose a reason for hiding this comment

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

LGTM.

Signed-off-by: Inhyuk Andy Cho <andy.inhyuk.jo@intel.com>
Signed-off-by: Inhyuk Andy Cho <andy.inhyuk.jo@intel.com>
datumaro/components/filter.py Outdated Show resolved Hide resolved
datumaro/components/media.py Outdated Show resolved Hide resolved
Signed-off-by: Inhyuk Andy Cho <andy.inhyuk.jo@intel.com>
Signed-off-by: Inhyuk Andy Cho <andy.inhyuk.jo@intel.com>
Signed-off-by: Inhyuk Andy Cho <andy.inhyuk.jo@intel.com>
CHANGELOG.md Outdated Show resolved Hide resolved
datumaro/components/dataset_base.py Show resolved Hide resolved
datumaro/components/extractor_tfds.py Show resolved Hide resolved
datumaro/components/extractor_tfds.py Show resolved Hide resolved
datumaro/components/media.py Show resolved Hide resolved
datumaro/components/media.py Show resolved Hide resolved
datumaro/components/media.py Outdated Show resolved Hide resolved
datumaro/components/media.py Outdated Show resolved Hide resolved
datumaro/components/media.py Show resolved Hide resolved
Copy link
Contributor

@bonhunko bonhunko left a comment

Choose a reason for hiding this comment

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

LGTM

@cih9088 cih9088 merged commit bddf3cb into openvinotoolkit:develop Apr 11, 2023
@cih9088 cih9088 mentioned this pull request Apr 17, 2023
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants