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

Improve simple merge #634

Merged
merged 14 commits into from
Feb 4, 2022
Merged

Improve simple merge #634

merged 14 commits into from
Feb 4, 2022

Conversation

zhiltsov-max
Copy link
Contributor

@zhiltsov-max zhiltsov-max commented Jan 27, 2022

Summary

This PR implements missing item attribute merging functionality in the simple merging algorithm. Also, it improves image merging in some cases, including data-supplied and placeholder (metainfo-only) images.

  • Allowed Image creation from just a size value. Now images can be built from array, or a function returning it, a path, or size info, including any mixed variants. The old restriction for size seems unnecessary.
  • Added Image class docs
  • Added image search in VOC XML-based formats
  • Added image path equality checks in simple merge, when applicable
  • Added item attribute merging in simple merge

How to test

Checklist

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) 2021 Intel Corporation
#
# SPDX-License-Identifier: MIT

datumaro/components/errors.py Outdated Show resolved Hide resolved
datumaro/components/errors.py Outdated Show resolved Hide resolved
datumaro/components/errors.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/operations.py Outdated Show resolved Hide resolved
datumaro/components/operations.py Outdated Show resolved Hide resolved
datumaro/components/operations.py Outdated Show resolved Hide resolved
tests/test_images.py Outdated Show resolved Hide resolved
tests/test_images.py Outdated Show resolved Hide resolved
@zhiltsov-max zhiltsov-max merged commit ad65324 into develop Feb 4, 2022
@zhiltsov-max zhiltsov-max deleted the zm/update-simple-merge branch February 4, 2022 13:21
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants