Merge back 2.2.2 to develop #4159

kprokofi · 2024-12-17T19:52:00Z

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 ran e2e tests and there is no issues.
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) 2024 Intel Corporation
# SPDX-License-Identifier: Apache-2.0

Fix bug

* Update test_cli.py * Update tests/e2e/cli/test_cli.py Co-authored-by: Eunwoo Shin <eunwoo.shin@intel.com> * Update test_cli.py * Update test_cli.py --------- Co-authored-by: Eunwoo Shin <eunwoo.shin@intel.com>

* add docs about configurable input size * update api usecase and fix bug

Fix

Remove init_args

Update docs

fix mean and scale

* Bump MAPI * Update exportable code requirements

* change drop pixels value * go safe, change only tested models * minor

* Update step size for eff v2 * Update effb0 recipe

update maskrcnn swimt model type to transformer

* add rtmpose_tiny for single obj * add rtmpose_tiny for single obj * modify test subset name * fix unit test * update recipe with reset

* Add warmup_iters for effv2 * Update max_epochs

* Fix pretrained_weight for timm * Fix unit-test

* add rtmpose_tiny for single obj * modify test subset name * fix unit test * property for pck

* Fix cached dir * Pretrained weight download unit-test * Fix pre-commit

Fix datamodule for ov

fix names for ignored scope

* Restore output_raw_scores for classificaiton * Add uts * Fix linter

add label info to init Signed-off-by: Ashwin Vaidya <ashwinnitinvaidya@gmail.com>

* Fix binary classification * Add unit-tests

* ignore heads and disable smooth quant * add activations_range_estimator_params * update changelog

* Fix Task Chain * Add multi-label case as well * Add multi-label case as well2 * Add H-label case

…ies using label's id/key (#3932) Modify label_groups for dm_label_categories with id/key of label

* remove datumaro attribute id from tiling * add subset names

kprokofi · 2024-12-18T12:43:29Z

@eugene123tw @sovrasov could you check thoroughly all changes you have made to releases 2.2.1 and 2.2.2?
There were a lot of merge conflicts and I might have missed something.

sovrasov

In general LGTM, but we also need @eugene123tw to double-check

sovrasov · 2024-12-18T13:04:01Z

There could be issues in iseg and sseg LabelInfo, because of some tricks with bg labels done on develop, which were missing in 2.2

* ellipse shape * Update changelog * update transform * update * Allow empty anno * Update todo

codecov · 2024-12-18T22:04:22Z

Codecov Report

Attention: Patch coverage is 52.44755% with 136 lines in your changes missing coverage. Please review.

Project coverage is 80.27%. Comparing base (31823cd) to head (a73e214).
Report is 65 commits behind head on develop.

Files with missing lines	Patch %	Lines
...lgo/classification/backbones/vision_transformer.py	14.92%	57 Missing ⚠️
src/otx/core/data/dataset/tile.py	30.76%	36 Missing ⚠️
src/otx/core/data/dataset/instance_segmentation.py	40.62%	19 Missing ⚠️
src/otx/core/data/dataset/classification.py	61.76%	13 Missing ⚠️
src/otx/core/types/label.py	91.66%	5 Missing ⚠️
src/otx/core/model/base.py	42.85%	4 Missing ⚠️
src/otx/core/data/dataset/base.py	75.00%	1 Missing ⚠️
src/otx/core/model/segmentation.py	0.00%	1 Missing ⚠️

Additional details and impacted files

@@             Coverage Diff             @@
##           develop    #4159      +/-   ##
===========================================
+ Coverage    77.11%   80.27%   +3.15%     
===========================================
  Files          308      319      +11     
  Lines        30571    31661    +1090     
===========================================
+ Hits         23576    25415    +1839     
+ Misses        6995     6246     -749

Flag	Coverage Δ
py310	`80.20% <52.44%> (+3.09%)`	⬆️
py311	`80.17% <52.44%> (+3.12%)`	⬆️

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.

eugene123tw

@kprokofi Thanks for the efforts! Overrall looks good! Though, could you change this line in HungarianMatcher?

https://github.com/openvinotoolkit/training_extensions/compare/kp/merge_back_2.2.2...eugene123tw:training_extensions:eugene/kp/merge_back_2.2.2?expand=1

yunchu and others added 30 commits August 20, 2024 09:16

update for releases 2.2.0rc0

d1bd1d5

Fix Classification explain forward issue (#3867)

c16f985

Fix bug

Fix e2e code error (#3871)

cba5120

* Update test_cli.py * Update tests/e2e/cli/test_cli.py Co-authored-by: Eunwoo Shin <eunwoo.shin@intel.com> * Update test_cli.py * Update test_cli.py --------- Co-authored-by: Eunwoo Shin <eunwoo.shin@intel.com>

Add documentation about configurable input size (#3870)

b807c9d

* add docs about configurable input size * update api usecase and fix bug

Fix zero-shot e2e (#3876)

2835aba

Fix

Fix DeiT for multi-label classification (#3881)

ccf2d50

Remove init_args

Fix Semi-SL for ViT accuracy drop (#3883)

e577b6a

Remove init_args

Update docs for 2.2 (#3884)

d1dd2b0

Update docs

Fix mean and scale for segmentation task (#3885)

c17a923

fix mean and scale

Update MAPI in 2.2 (#3889)

d72feeb

* Bump MAPI * Update exportable code requirements

Improve Semi-SL for LiteHRNet (small-medium case) (#3891)

00ed3a0

* change drop pixels value * go safe, change only tested models * minor

Improve h-cls for eff models (#3893)

2c6b4de

* Update step size for eff v2 * Update effb0 recipe

Fix maskrcnn swin nncf acc drop (#3900)

0dc7a29

update maskrcnn swimt model type to transformer

Add keypoint detection recipe for single object cases (#3903)

0d6799c

* add rtmpose_tiny for single obj * add rtmpose_tiny for single obj * modify test subset name * fix unit test * update recipe with reset

Improve acc drop of efficientnetv2 for h-label cls (#3907)

8115b52

* Add warmup_iters for effv2 * Update max_epochs

Fix pretrained weight cached dir for timm (#3909)

4c8555e

* Fix pretrained_weight for timm * Fix unit-test

Fix keypoint detection single obj recipe (#3915)

52221e3

* add rtmpose_tiny for single obj * modify test subset name * fix unit test * property for pck

Fix cached dir for timm & hugging-face (#3914)

9265c59

* Fix cached dir * Pretrained weight download unit-test * Fix pre-commit

Fix wrong template id mapping for anomaly (#3916)

5170736

Update script to allow setting otx version using env. variable (#3913)

f611cc1

Fix Datamodule creation for OV in AutoConfigurator (#3920)

425a479

Fix datamodule for ov

Update tpp file for 2.2.0 (#3921)

7f1c7da

Fix names for ignored scope [HOT-FIX, 2.2.0] (#3924)

51d1adf

fix names for ignored scope

Fix classification rt_info (#3922)

2bcf1b2

* Restore output_raw_scores for classificaiton * Add uts * Fix linter

Update label info (#3925)

112b2b2

add label info to init Signed-off-by: Ashwin Vaidya <ashwinnitinvaidya@gmail.com>

Fix binary classification metric task (#3928)

929132d

* Fix binary classification * Add unit-tests

Improve MaskRCNN SwinT NNCF (#3929)

706f99b

* ignore heads and disable smooth quant * add activations_range_estimator_params * update changelog

Fix get_item for Chained Tasks in Classification (#3931)

53a7d9a

* Fix Task Chain * Add multi-label case as well * Add multi-label case as well2 * Add H-label case

Correct Keyerror for h-label cls in label_groups for dm_label_categor…

c3749e3

…ies using label's id/key (#3932) Modify label_groups for dm_label_categories with id/key of label

Remove datumaro attribute id from tiling, add subset names (#3933)

98a9cac

* remove datumaro attribute id from tiling * add subset names

kprokofi requested review from negvet, Daankrol, djdameln, ashwinvaidya17, rajeshgangireddy and atwinand as code owners December 18, 2024 12:41

kprokofi requested a review from sovrasov December 18, 2024 12:41

sovrasov previously approved these changes Dec 18, 2024

View reviewed changes

update tests

e51a403

kprokofi dismissed sovrasov’s stale review via e51a403 December 18, 2024 14:25

kprokofi and others added 5 commits December 19, 2024 02:46

fix linter

b44ebea

fix unit test

045e3ed

fix unite tests 2

c92bda3

Support Ellipse Shape for InstSeg algo (#4152)

91b5dd5

* ellipse shape * Update changelog * update transform * update * Allow empty anno * Update todo

fix linter

a409186

eugene123tw reviewed Dec 19, 2024

View reviewed changes

fix hungarian matcher

b8c912d

eugene123tw previously approved these changes Dec 19, 2024

View reviewed changes

fix augmentations tests

21c88c9

kprokofi dismissed eugene123tw’s stale review via 21c88c9 December 19, 2024 11:59

fix dinov2 tiling

a73e214

kprokofi requested review from sovrasov and eugene123tw December 19, 2024 13:27

eugene123tw approved these changes Dec 19, 2024

View reviewed changes

sovrasov approved these changes Dec 19, 2024

View reviewed changes

sovrasov merged commit 8a82764 into develop Dec 19, 2024
21 of 22 checks passed

sovrasov deleted the kp/merge_back_2.2.2 branch December 19, 2024 16:37

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge back 2.2.2 to develop #4159

Merge back 2.2.2 to develop #4159

kprokofi commented Dec 17, 2024

kprokofi commented Dec 18, 2024

sovrasov left a comment

sovrasov commented Dec 18, 2024

codecov bot commented Dec 18, 2024 •

edited

Loading

eugene123tw left a comment •

edited

Loading

Merge back 2.2.2 to develop #4159

Merge back 2.2.2 to develop #4159

Conversation

kprokofi commented Dec 17, 2024

Summary

How to test

Checklist

License

kprokofi commented Dec 18, 2024

sovrasov left a comment

Choose a reason for hiding this comment

sovrasov commented Dec 18, 2024

codecov bot commented Dec 18, 2024 • edited Loading

Codecov Report

eugene123tw left a comment • edited Loading

Choose a reason for hiding this comment

codecov bot commented Dec 18, 2024 •

edited

Loading

eugene123tw left a comment •

edited

Loading