[Feature/OTX] Rebase develop to feature/otx before MPA refactoring #1284

harimkang · 2022-09-26T06:36:44Z

Summary

This is to rebase the current develop branch to feature/otx before MPA refactoring (This excludes external/anomaly)

This PR includes :

Rebase develop -> feature/otx
Exclude external/anomaly

* Update multi-label classification templates * Change default from multi-class to multi-label

[CVS-89912] Fixed config path computation

* Remove initialize from export functions * self._precision to FP32 * Update export initialize * Task changes

Co-authored-by: Lee, Soobee <soobeele@intel.com>

Update d-o-r

@attr

* Add @attr decorator for base configs * Update config.py * Fix import Signed-off-by: Songki Choi <songki.choi@intel.com> Co-authored-by: Harim Kang <harim.kang@intel.com>

…t-reid in SC (#1233)

[Anomaly Task] Change OpenVINO MO Command

[Hot-Fix] subprocess call issue

…-train-failure Fix CVS-90509 Semantic segmentation training with all templates doesn't work in cpu.

…icense-file-in-exportable-code Ludo/cvs 90428 update license file in exportable code

…cy-map

…liency-map Fix saliency map issues

* Move configuration.yaml and associated files to tempates folder. * Revert to old configuration format + fix save model issue * Update nncf compression_config.json path * Disable editable in pruning_supported * Remove copy * Move algorithm/configuration.py to base

* Address progress issue for HPO callback * Merge hpo and progress callback as only one progress callback is supported

Propagate changes from the 1.2 release branch (RC1) to develop

* Remove (Change to skip) some model template test cases for OTE-CI test (some external backend's API & performance tests) * Fixed some library version conflict issue (in OTE CI venv) * Fixed some test cases not working (MPA ote_cli tests) * Add MPA pre-commit tests (not for pydocstyle -> will check it out later) * Resolve prettier issue (data/car_tree_bug/annotations/hierarchical_default.json) * Resolve black issue (ote_cli/ote_cli/utils/hpo.py) Co-authored-by: Jihwan Eom <jihwan.eom@intel.com>

* conftest Import Error Fix * Validation Report Selection fix * Change Name TestClass for resolving file name too long issue * Fix Anomaly template root path

* flake8 & black check * Enable black to mpa_tasks * Modify flake8 issue in mpa_tasks * README update & skip algo_table check test * Change test_docs::test_algorithms_table * Fix some codes * Temporaly disable mpa mypy * Resolve pylint issues * Rebase develop * Resolve new develop commit's pre-commit issues * Remove duplicated code in config * MPA commit update * Update TT_STABILITY_TEST * Update anomaly ote_cli test for TT_STABILITY_TEST * Rename TT_STABILITY_TEST to TT_STABILITY_TESTS

harimkang · 2022-09-26T07:27:49Z

@ashwinvaidya17 Hi, Before starting the MPA task refactoring in feature/otx, I first reflected the changes in the develop branch. However, I have excluded the changes in the external/anomaly folder for now. Because I wasn't sure exactly what changes should be reflected here. With this in mind, take a look at the code. (And please let me know if I'm missing anything)

And, as I recall, we set the number of character limits in the code to 120. However, Codacy-Static-Code-Analysis (CSCA) is still checking based on 80 characters. Do you have any idea how to solve this? Currently, CSCA is in Fail status, but this is confirmed by the content related to the number of characters in quick_guide doc.

samet-akcay · 2022-09-26T07:52:50Z

@harimkang, thanks for creating this PR.

I see that there are some changes in ote_sdk. These changes should also be added to otx.api. Otherwise, it would be hard to sync the changes between ote_sdk and otx.api.

Would you be able to add those changes to the corresponding location in otx.api?

harimkang · 2022-09-26T07:58:38Z

@harimkang, thanks for creating this PR.

I see that there are some changes in ote_sdk. These changes should also be added to otx.api. Otherwise, it would be hard to sync the changes between ote_sdk and otx.api.

Would you be able to add those changes to the corresponding location in otx.api?

Hi @samet-akcay, Yes, I will look into it (ote_sdk & otx.api) and reflect on it.

samet-akcay · 2022-09-26T08:02:17Z

And, as I recall, we set the number of character limits in the code to 120. However, Codacy-Static-Code-Analysis (CSCA) is still checking based on 80 characters. Do you have any idea how to solve this? Currently, CSCA is in Fail status, but this is confirmed by the content related to the number of characters in quick_guide doc.

This is because Codacy complains about the markdown file. We set the line length to 120 for the .py files, but not .md files. You could ignore that for now. We'll address that later.

samet-akcay

Thanks @harimkang

…1284) * Update submodule branch (#1222) * Enhance training schedule for multi-label classification (#1212) * [CVS-88098] Remove initialize from export functions (#1226) * Train graph added (#1211) Co-authored-by: Lee, Soobee <soobeele@intel.com> * Add @attrs decorator for base configs (#1229) Signed-off-by: Songki Choi <songki.choi@intel.com> Co-authored-by: Harim Kang <harim.kang@intel.com> * Pretrained weight download error in MobilenetV3-large-1 of deep-object-reid in SC (#1233) * [Anomaly Task] Revert hpo template (#1230) * 🐞 [Anomaly Task] Fix progress bar (#1223) * [CVS-90555] Fix NaN value in classification (#1244) * update hpo_config.yaml (#1240) * [CVS-90400, CVS-91015] NNCF pruning supported tweaks (#1248) * Turned off pruning_support visibility for anomaly models (CVS-91015) * Disabled pruning for EfficientNet-V2-S (CVS-90400) * [Anomaly Task] 🐞 Fix inference when model backbone changes (#1242) * Fix CVS-91469 sseg compatibility issue * [CVS-91472] Add pruning_supported value (#1263) * Pruning supported tweaks (#1256) * [CVS-90400, CVS-91015] NNCF pruning supported tweaks (#1248) * Turned off pruning_support visibility for anomaly models (CVS-91015) * Disabled pruning for EfficientNet-V2-S (CVS-90400) * Revert "[CVS-90400, CVS-91015] NNCF pruning supported tweaks (#1248)" (#1269) * [OTE-TEST] Disable obsolete test cases (#1220) * [OTE-TEST] hot-fix for MPA performance tests (#1273) * Expose early stopping hyper-parameters for all tasks (#1241) * Resolve pre-commit issues (#1272) * Remove LazyEarlyStopHook in model_multilabel.py (#1281) * Removed xfail (#1239) Signed-off-by: Songki Choi <songki.choi@intel.com> Co-authored-by: Ashwin Vaidya <ashwin.vaidya@intel.com> Co-authored-by: Jaeguk Hyun <jaeguk.hyun@intel.com> Co-authored-by: Nikita Savelyev <nikita.savelyev@intel.com> Co-authored-by: Vladisalv Sovrasov <sovrasov.vlad@gmail.com> Co-authored-by: Jihwan Eom <jihwan.eom@intel.com> Co-authored-by: Songki Choi <songki.choi@intel.com> Co-authored-by: Soobee Lee <soobee.lee@intel.com> Co-authored-by: Lee, Soobee <soobeele@intel.com> Co-authored-by: Eugene Liu <eugene.liu@intel.com> Co-authored-by: Emily Chun <emily.chun@intel.com> Co-authored-by: ljcornel <ludo.cornelissen@intel.com> Co-authored-by: Eunwoo Shin <eunwoo.shin@intel.com>

ashwinvaidya17 and others added 30 commits August 24, 2022 09:02

Migrate from subprocess to os.system

3db19dd

Change to subprocess.run

489fa45

Update submodule branch (#1222)

f4e0f0c

Fixed how nncf_config_path is computed

46edd50

Update d-o-r

c901ad8

Enhance training schedule for multi-label classification (#1212)

3dd9207

* Update multi-label classification templates * Change default from multi-class to multi-label

Merge pull request #1228 from openvinotoolkit/ns/CVS-89912-fix

3140397

[CVS-89912] Fixed config path computation

[CVS-88098] Remove initialize from export functions (#1226)

5ad9525

* Remove initialize from export functions * self._precision to FP32 * Update export initialize * Task changes

Train graph added (#1211)

818aca4

Co-authored-by: Lee, Soobee <soobeele@intel.com>

Merge pull request #1227 from openvinotoolkit/vs/upd_dor

4a06d98

Update d-o-r

fix saliency map issues

487b467

Add @attrs decorator for base configs (#1229)

8b50623

* Add @attr decorator for base configs * Update config.py * Fix import Signed-off-by: Songki Choi <songki.choi@intel.com> Co-authored-by: Harim Kang <harim.kang@intel.com>

Pretrained weight download error in MobilenetV3-large-1 of deep-objec…

2dc9515

…t-reid in SC (#1233)

Merge pull request #1221 from openvinotoolkit/fix/ashwin/remove_shell

1022e47

[Anomaly Task] Change OpenVINO MO Command

Update exportable code licence file to include full Apache licence text

60bb5fd

fix inconsistence naming

f18bf97

Hot-fix subprocess call issue

141cb1e

Merge pull request #1235 from openvinotoolkit/harimkang-patch-1

1b541e3

[Hot-Fix] subprocess call issue

Fix sseg cpu training failure

82e652d

Merge pull request #1236 from openvinotoolkit/emily/CVS-90509-seg-cpu…

6e37011

…-train-failure Fix CVS-90509 Semantic segmentation training with all templates doesn't work in cpu.

Merge pull request #1237 from openvinotoolkit/ludo/CVS-90428-update-l…

719b739

…icense-file-in-exportable-code Ludo/cvs 90428 update license file in exportable code

update submodule

acffde9

Merge branch 'releases/v0.3.0-sc1.2' into eugene/CVS-90192-fix-salien…

ab4c73b

…cy-map

remove redundant check

59e94dd

update

fd3c875

Merge pull request #1232 from openvinotoolkit/eugene/CVS-90192-fix-sa…

86e9e4a

…liency-map Fix saliency map issues

🐞 [Anomaly Task] Fix progress bar (#1223)

b57a3a5

* Address progress issue for HPO callback * Merge hpo and progress callback as only one progress callback is supported

[CVS-90555] Fix NaN value in classification (#1244)

bc90480

update hpo_config.yaml (#1240)

5f622b4

supersoob and others added 9 commits September 15, 2022 18:29

[CVS-91441] Rename EfficientNet template ID

33ca598

Merge pull request #1224 from openvinotoolkit/releases/v0.3.0-sc1.2

519f5fb

Propagate changes from the 1.2 release branch (RC1) to develop

[OTE-TEST] hot-fix for MPA performance tests (#1273)

232ed03

* conftest Import Error Fix * Validation Report Selection fix * Change Name TestClass for resolving file name too long issue * Fix Anomaly template root path

Expose early stopping hyper-parameters for all tasks (#1241)

f4a4827

Remove LazyEarlyStopHook in model_multilabel.py (#1281)

7b184d3

Removed xfail (#1239)

444e6e4

Rebase develop except exterval/anomaly

e1b932a

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 labels Sep 26, 2022

samet-akcay requested a review from ashwinvaidya17 September 26, 2022 06:49

harimkang changed the title ~~[Feature/OTX] Rebase develop to feature/otx for MPA refactoring~~ [Feature/OTX] Rebase develop to feature/otx before MPA refactoring Sep 26, 2022

harimkang marked this pull request as ready for review September 26, 2022 07:34

harimkang requested a review from a team as a code owner September 26, 2022 07:34

harimkang requested review from supersoob and goodsong81 September 26, 2022 07:43

harimkang added 2 commits September 26, 2022 17:18

Reflect ote_sdk changes to otx.api

1b8d582

Resolve pydocstyle in otx.api.utils.vis_utils

cd2eeff

harimkang requested a review from samet-akcay September 26, 2022 09:38

samet-akcay approved these changes Sep 26, 2022

View reviewed changes

harimkang merged commit caf7492 into feature/otx Sep 26, 2022

harimkang deleted the feature/harim/otx branch September 26, 2022 11:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Feature/OTX] Rebase develop to feature/otx before MPA refactoring #1284

[Feature/OTX] Rebase develop to feature/otx before MPA refactoring #1284

harimkang commented Sep 26, 2022

harimkang commented Sep 26, 2022 •

edited

Loading

samet-akcay commented Sep 26, 2022

harimkang commented Sep 26, 2022

samet-akcay commented Sep 26, 2022

samet-akcay left a comment

[Feature/OTX] Rebase develop to feature/otx before MPA refactoring #1284

[Feature/OTX] Rebase develop to feature/otx before MPA refactoring #1284

Conversation

harimkang commented Sep 26, 2022

Summary

This PR includes :

harimkang commented Sep 26, 2022 • edited Loading

samet-akcay commented Sep 26, 2022

harimkang commented Sep 26, 2022

samet-akcay commented Sep 26, 2022

samet-akcay left a comment

Choose a reason for hiding this comment

harimkang commented Sep 26, 2022 •

edited

Loading