Merge back 2.2.0.rc3 to develop #3963

kprokofi · 2024-09-18T22:18:53Z

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

…t#3903) * 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

…inotoolkit#3913)

) 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 (openvinotoolkit#3932) Modify label_groups for dm_label_categories with id/key of label

…oolkit#3933) * remove datumaro attribute id from tiling * add subset names

…ining_extensions into kp/merge_back_2.2.0

harimkang · 2024-09-23T01:44:29Z

@eugene123tw Hi Eugene, Something is conflicting between 2.2.0.rc2 and develop with tiling, getting unit-test fails in s-seg tiling case (tests/unit/core/data/test_tiling.py::TestOTXTiling::test_tile_transform[SEMANTIC_SEGMENTATION]).

Can you take a look?

eugene123tw · 2024-09-23T13:20:21Z

@kprokofi Could you add fixes in this PR? https://github.com/openvinotoolkit/training_extensions/pull/3973/files

codecov · 2024-09-23T21:26:48Z

Codecov Report

Attention: Patch coverage is 80.54299% with 43 lines in your changes missing coverage. Please review.

Project coverage is 81.61%. Comparing base (0e2ab6c) to head (97dad60).
Report is 1 commits behind head on develop.

Files with missing lines	Patch %	Lines
src/otx/core/data/dataset/anomaly.py	86.30%	10 Missing ⚠️
src/otx/core/metrics/pck.py	30.76%	9 Missing ⚠️
src/otx/core/model/anomaly.py	25.00%	6 Missing ⚠️
src/otx/algo/detection/rtdetr.py	40.00%	3 Missing ⚠️
src/otx/algo/segmentation/litehrnet.py	0.00%	3 Missing ⚠️
src/otx/core/data/pre_filtering.py	60.00%	2 Missing ⚠️
src/otx/core/model/keypoint_detection.py	33.33%	2 Missing ⚠️
src/otx/core/model/segmentation.py	0.00%	2 Missing ⚠️
src/otx/core/types/label.py	83.33%	2 Missing ⚠️
src/otx/algo/detection/yolox.py	66.66%	1 Missing ⚠️
... and 3 more

Additional details and impacted files

@@             Coverage Diff             @@
##           develop    #3963      +/-   ##
===========================================
- Coverage    81.70%   81.61%   -0.09%     
===========================================
  Files          289      289              
  Lines        27916    28047     +131     
===========================================
+ Hits         22808    22890      +82     
- Misses        5108     5157      +49

Flag	Coverage Δ
py310	`81.61% <80.54%> (-0.07%)`	⬇️
py311	`?`

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.

sovrasov · 2024-09-24T10:03:50Z

@kprokofi could you provide a result of a local tests launch? CI doesn't work today

kprokofi · 2024-09-25T11:23:38Z

detection tests are passed locally:

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

update for releases 2.2.0rc0

d1bd1d5

Fix Classification explain forward issue (openvinotoolkit#3867)

c16f985

Fix bug

Fix e2e code error (openvinotoolkit#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 (openvinotoolkit#3870)

b807c9d

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

Fix zero-shot e2e (openvinotoolkit#3876)

2835aba

Fix

Fix DeiT for multi-label classification (openvinotoolkit#3881)

ccf2d50

Remove init_args

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

e577b6a

Remove init_args

Update docs for 2.2 (openvinotoolkit#3884)

d1dd2b0

Update docs

Fix mean and scale for segmentation task (openvinotoolkit#3885)

c17a923

fix mean and scale

Update MAPI in 2.2 (openvinotoolkit#3889)

d72feeb

* Bump MAPI * Update exportable code requirements

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

00ed3a0

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

Improve h-cls for eff models (openvinotoolkit#3893)

2c6b4de

* Update step size for eff v2 * Update effb0 recipe

Fix maskrcnn swin nncf acc drop (openvinotoolkit#3900)

0dc7a29

update maskrcnn swimt model type to transformer

Add keypoint detection recipe for single object cases (openvinotoolki…

0d6799c

…t#3903) * 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 (openvinotoolkit#3907

8115b52

) * Add warmup_iters for effv2 * Update max_epochs

Fix pretrained weight cached dir for timm (openvinotoolkit#3909)

4c8555e

* Fix pretrained_weight for timm * Fix unit-test

Fix keypoint detection single obj recipe (openvinotoolkit#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 (openvinotoolkit#3914)

9265c59

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

Fix wrong template id mapping for anomaly (openvinotoolkit#3916)

5170736

Update script to allow setting otx version using env. variable (openv…

f611cc1

…inotoolkit#3913)

Fix Datamodule creation for OV in AutoConfigurator (openvinotoolkit#3920

425a479

) Fix datamodule for ov

Update tpp file for 2.2.0 (openvinotoolkit#3921)

7f1c7da

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

51d1adf

fix names for ignored scope

Fix classification rt_info (openvinotoolkit#3922)

2bcf1b2

* Restore output_raw_scores for classificaiton * Add uts * Fix linter

Update label info (openvinotoolkit#3925)

112b2b2

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

Fix binary classification metric task (openvinotoolkit#3928)

929132d

* Fix binary classification * Add unit-tests

Improve MaskRCNN SwinT NNCF (openvinotoolkit#3929)

706f99b

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

Fix get_item for Chained Tasks in Classification (openvinotoolkit#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 (openvinotoolkit#3932) Modify label_groups for dm_label_categories with id/key of label

Remove datumaro attribute id from tiling, add subset names (openvinot…

98a9cac

…oolkit#3933) * remove datumaro attribute id from tiling * add subset names

kprokofi added 4 commits September 21, 2024 00:39

fix semantic seg tests

901fd16

Merge branch 'kp/merge_back_2.2.0' of https://github.com/kprokofi/tra…

5971993

…ining_extensions into kp/merge_back_2.2.0

fix detection tiling

a30ef81

merge develop

27ac89c

kprokofi enabled auto-merge September 20, 2024 15:55

github-actions bot removed DEPENDENCY Any changes in any dependencies (new dep or its version) should be produced via Change Request on PM BUILD labels Sep 20, 2024

kprokofi requested review from harimkang and sungchul2 September 20, 2024 15:55

sovrasov mentioned this pull request Sep 20, 2024

Add OV model for keypoint detection #3970

Merged

harimkang added 3 commits September 23, 2024 09:23

Merge branch 'develop' into kp/merge_back_2.2.0

b45aea6

Update test_tiling.py

b45fe11

Update test_tiling.py

4c8ecd1

harimkang changed the title ~~Merge back 2.2 to develop~~ Merge back 2.2.0.rc1 to develop Sep 23, 2024

Merge rc2

cb3d903

harimkang changed the title ~~Merge back 2.2.0.rc1 to develop~~ Merge back 2.2.0.rc2 to develop Sep 23, 2024

kprokofi added 2 commits September 24, 2024 06:02

fix unit test

31b2504

Merge branch 'develop' into kp/merge_back_2.2.0

97dad60

harimkang approved these changes Sep 24, 2024

View reviewed changes

harimkang mentioned this pull request Sep 24, 2024

Refactor to allow for a wider model in TIMM #3976

Merged

8 tasks

harimkang changed the title ~~Merge back 2.2.0.rc2 to develop~~ Merge back 2.2.0.rc3 to develop Sep 24, 2024

sovrasov approved these changes Sep 24, 2024

View reviewed changes

sovrasov disabled auto-merge September 25, 2024 11:24

sovrasov merged commit 3249377 into openvinotoolkit:develop Sep 25, 2024
19 of 22 checks passed

kprokofi deleted the kp/merge_back_2.2.0 branch September 25, 2024 11:25

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge back 2.2.0.rc3 to develop #3963

Merge back 2.2.0.rc3 to develop #3963

kprokofi commented Sep 18, 2024

harimkang commented Sep 23, 2024

eugene123tw commented Sep 23, 2024

codecov bot commented Sep 23, 2024 •

edited

Loading

sovrasov commented Sep 24, 2024

kprokofi commented Sep 25, 2024 •

edited

Loading

Merge back 2.2.0.rc3 to develop #3963

Merge back 2.2.0.rc3 to develop #3963

Conversation

kprokofi commented Sep 18, 2024

Summary

How to test

Checklist

License

harimkang commented Sep 23, 2024

eugene123tw commented Sep 23, 2024

codecov bot commented Sep 23, 2024 • edited Loading

Codecov Report

sovrasov commented Sep 24, 2024

kprokofi commented Sep 25, 2024 • edited Loading

codecov bot commented Sep 23, 2024 •

edited

Loading

kprokofi commented Sep 25, 2024 •

edited

Loading