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 configuration & CLI #2805

Merged
merged 37 commits into from
Jan 23, 2024
Merged

Refactor configuration & CLI #2805

merged 37 commits into from
Jan 23, 2024

Conversation

harimkang
Copy link
Contributor

@harimkang harimkang commented Jan 17, 2024

Summary

I wanted to break up the PR as much as possible, but the CLI and configuration are still intertwined, so please excuse the large size of the PR. (Most files are YAML files.)

Next PR

  • Auto-configuration
  • Engine.from_config

How to test

image

(otx) otx train --config <Config-Path> --data_root <Data-Path> --model.num_classes 2

Checklist

  • I have added unit tests to cover my changes.​
  • I have added integration tests to cover my changes.​
  • I have added e2e tests for validation.
  • I have added the description of my changes into CHANGELOG in my target branch (e.g., CHANGELOG in develop).​
  • I have updated the documentation in my target branch accordingly (e.g., documentation in develop).
  • I have linked related issues.

License

  • I submit my code changes under the same Apache 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: Apache-2.0

@github-actions github-actions bot added DEPENDENCY Any changes in any dependencies (new dep or its version) should be produced via Change Request on PM TEST Any changes in tests BUILD OTX 2.0 labels Jan 17, 2024
Copy link
Contributor

@samet-akcay samet-akcay left a comment

Choose a reason for hiding this comment

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

i've reviewed until cli.py. Will continue tomorrow

src/otx/cli/cli.py Show resolved Hide resolved
src/otx/cli/cli.py Outdated Show resolved Hide resolved
src/otx/cli/cli.py Show resolved Hide resolved
src/otx/cli/cli.py Outdated Show resolved Hide resolved
src/otx/cli/cli.py Outdated Show resolved Hide resolved
src/otx/cli/cli.py Outdated Show resolved Hide resolved
src/otx/cli/cli.py Outdated Show resolved Hide resolved
src/otx/cli/cli.py Show resolved Hide resolved
src/otx/cli/utils/__init__.py Show resolved Hide resolved
src/otx/cli/utils/help_formatter.py Outdated Show resolved Hide resolved
src/otx/cli/cli.py Outdated Show resolved Hide resolved
vinnamkim
vinnamkim previously approved these changes Jan 22, 2024
jaegukhyun
jaegukhyun previously approved these changes Jan 22, 2024
samet-akcay
samet-akcay previously approved these changes Jan 22, 2024
Copy link
Contributor

@samet-akcay samet-akcay left a comment

Choose a reason for hiding this comment

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

thanks @harimkang. I think I'm happy with the changes. Great effort!

@harimkang harimkang dismissed stale reviews from samet-akcay, jaegukhyun, and vinnamkim via 3214f22 January 22, 2024 09:51
@harimkang
Copy link
Contributor Author

the process doesn't end as shown below with integration test.
image
image

It is only reproduced in the Visual Prompting model (GPU train & test) + openvino_model (CPU test only) test case.
so I disable visual_prompting SAM model in integration test case temporarily.
I have reported this to Vinnam and will revisit this at a later date.

@vinnamkim
Copy link
Contributor

Sorry for your inconvenience, but since the time zone is different, please resolve the conflict and merge after this PR #2764.

@harimkang
Copy link
Contributor Author

Sorry for your inconvenience, but since the time zone is different, please resolve the conflict and merge after this PR #2764.

Yes, of course. If that PR passes all the tests and then gets merged, I'll fix it here.

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.

Since the integration tests of #2764 were failed and seem hard to fix this time, let merge this first.

@harimkang harimkang merged commit 6b8b82e into openvinotoolkit:v2 Jan 23, 2024
7 checks passed
@harimkang harimkang mentioned this pull request Jan 23, 2024
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
BUILD DEPENDENCY Any changes in any dependencies (new dep or its version) should be produced via Change Request on PM TEST Any changes in tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants