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

Mergeback 1.5.0 to develop #2633

Merged
merged 116 commits into from
Nov 15, 2023
Merged

Mergeback 1.5.0 to develop #2633

merged 116 commits into from
Nov 15, 2023

Conversation

yunchu
Copy link
Contributor

@yunchu yunchu commented Nov 14, 2023

Summary

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 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

yunchu and others added 30 commits July 7, 2023 22:41
updated dependency version of datumaro
update version string
Signed-off-by: Kim, Vinnam <vinnam.kim@intel.com>
* Fix semantic segmentation soft prediction dtype

* relax ref sal vals check

---------

Co-authored-by: Songki Choi <songki.choi@intel.com>
* Make black happy

* Fix conflicts

* Merge-back: add test datasets and edit the test code

* Make black happy

* Fix mis-merge

* Make balck happy

* Fix typo

* Fix typoi

---------

Co-authored-by: Songki Choi <songki.choi@intel.com>
bump datumaro up to 1.4.0rc2
* Add tiling documentation
* Enable `otx deploy`

* (WIP) integration test

* Docstring

* Update args for create_model

* Manually set image embedding layout

* Enable to use model api for preprocessing
- `fit_to_window` doesn't work expectedly, so newly implemented `VisualPromptingOpenvinoAdapter` to use new resize function

* Remove skipped test

* Updated

* Update unit tests on model wrappers

* Update

* Update configuration

* Fix not to patch pretrained path

* pylint & update model api version in docstring

---------

Co-authored-by: Wonju Lee <wonju.lee@intel.com>
* Remove skip mark for PTQ test of action detection

* Update action detection documentation
* Change classification dataset from dummy to toy

* Revert test changes

* Change label name for multilabel dataset

* Revert e2e test changes

* Change ov test cases' threshold

* Add parent's label
* Upgrade model API

* Update otx in exportable code

* Fix unit tests

* Fix black

* Fix detection inference

* Fix det tiling

* Fix mypy

* Fix demo

* Fix visualizer in demo

* Fix black
* Initial commit

* Update block

* (WIP) otx optimize

* Fix

* WIP

* Update configs & exported outputs

* Remove unused modules for torch

* Add unit tests

* pre-commit

* Update CHANGELOG
* Update detection docs

* Revert template id changes

* Fix wrong template id

* Update docs/source/guide/explanation/algorithms/object_detection/object_detection.rst

Co-authored-by: Eunwoo Shin <eunwoo.shin@intel.com>

* Update docs/source/guide/explanation/algorithms/object_detection/object_detection.rst

Co-authored-by: Eunwoo Shin <eunwoo.shin@intel.com>

---------

Co-authored-by: Eunwoo Shin <eunwoo.shin@intel.com>
* (WIP) write docs

* Add visual prompting documentation

* Update CHANGELOG

---------

Co-authored-by: sungchul.kim <sungchul@ikvensx010>
* Remove custom modelapi patch

* Update test
* Fix graph metric going backward issue
* Add license notice
* Fix pre-commit issue
* Add rename items & logic for metric
---------
Signed-off-by: Songki Choi <songki.choi@intel.com>
* fix transforms export in metadata

* wrap transform dict

* add todo for updating to_dict call
* (WIP) otx optimize

* pre-commit

* (WIP) set e2e

* Remove nncf config

* Add visual prompting requirement

* Add visual prompting in tox

* Add visual prompting in setup.py

* Fix typo

* Delete unused configuration.yaml

* Edit test_name

* Add to limit activation range

* Update from `vp` to `visprompt`

* Fix about no returning the first label

* pre-commit

* (WIP) otx optimize

* pre-commit

* (WIP) set e2e

* Remove nncf config

* Add visual prompting requirement

* Add visual prompting in tox

* Add visual prompting in setup.py

* Fix typo

* pre-commit

* Add actions

* Update tests/e2e/cli/visual_prompting/test_visual_prompting.py

Co-authored-by: Jaeguk Hyun <jaeguk.hyun@intel.com>

* Skip PTQ e2e test

* Change task name

* Remove skipped tc

---------

Co-authored-by: Jaeguk Hyun <jaeguk.hyun@intel.com>
* Change e2e reference name

* Update openvino eval threshold for multiclass classification

* Change comment message

* Fix tiling e2e tests

---------

Co-authored-by: GalyaZalesskaya <galina.zalesskaya@intel.com>
Recover DINO head unit tests
* update for release 1.4.0rc2

* Add skip mark for unstable unit tests

---------

Co-authored-by: jaegukhyun <jaeguk.hyun@intel.com>
@yunchu yunchu requested a review from a team as a code owner November 14, 2023 07:36
@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 API Any changes in OTX API ALGO Any changes in OTX Algo Tasks implementation TEST Any changes in tests BUILD DOC Improvements or additions to documentation labels Nov 14, 2023
sungmanc
sungmanc previously approved these changes Nov 14, 2023
Copy link
Contributor

@sungmanc sungmanc left a comment

Choose a reason for hiding this comment

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

LGTM, I left 2 minor questions

Copy link

codecov bot commented Nov 14, 2023

Codecov Report

Attention: 263 lines in your changes are missing coverage. Please review.

Comparison is base (d240eba) 81.54% compared to head (e3bd52d) 81.02%.

Files Patch % Lines
src/otx/api/utils/tiler.py 0.00% 200 Missing ⚠️
src/otx/algorithms/anomaly/tasks/openvino.py 3.57% 27 Missing ⚠️
src/otx/algorithms/anomaly/tasks/inference.py 0.00% 10 Missing ⚠️
src/otx/algorithms/detection/utils/utils.py 50.00% 5 Missing ⚠️
...cls/models/heads/custom_vision_transformer_head.py 20.00% 4 Missing ⚠️
...portable_code/demo/demo_package/model_container.py 0.00% 4 Missing ⚠️
...sification/adapters/mmcls/datasets/otx_datasets.py 66.66% 3 Missing ⚠️
...ion/adapters/mmcls/models/heads/custom_cls_head.py 50.00% 2 Missing ⚠️
...x/algorithms/classification/adapters/mmcls/task.py 75.00% 2 Missing ⚠️
...mmon/adapters/mmcv/hooks/recording_forward_hook.py 66.66% 2 Missing ⚠️
... and 3 more
Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #2633      +/-   ##
===========================================
- Coverage    81.54%   81.02%   -0.52%     
===========================================
  Files          515      516       +1     
  Lines        38298    38570     +272     
===========================================
+ Hits         31229    31253      +24     
- Misses        7069     7317     +248     
Flag Coverage Δ
py310 81.02% <15.70%> (-0.52%) ⬇️
py38 81.00% <15.70%> (-0.52%) ⬇️
py39 81.01% <15.70%> (-0.51%) ⬇️

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

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

Copy link
Contributor

@goodsong81 goodsong81 left a comment

Choose a reason for hiding this comment

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

Looks OK to me. Could you fix a few minor things?

README.md Outdated Show resolved Hide resolved
docs/source/guide/release_notes/index.rst Outdated Show resolved Hide resolved
goodsong81
goodsong81 previously approved these changes Nov 14, 2023
Copy link
Contributor

@goodsong81 goodsong81 left a comment

Choose a reason for hiding this comment

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

Thank you!

@yunchu yunchu dismissed stale reviews from goodsong81 and sungmanc via e3bd52d November 14, 2023 10:59
@yunchu yunchu merged commit 104404b into develop Nov 15, 2023
19 of 22 checks passed
@yunchu yunchu deleted the mergeback/1.5.0 branch November 15, 2023 01:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ALGO Any changes in OTX Algo Tasks implementation API Any changes in OTX API BUILD DEPENDENCY Any changes in any dependencies (new dep or its version) should be produced via Change Request on PM DOC Improvements or additions to documentation TEST Any changes in tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.