Refactor OTX classification phase 1: move modules from MPA to OTX #1893

JihwanEom · 2023-03-16T07:47:58Z

Summary

Moved modules which is registered in mmcls and used only in classification in mpa folder to otx mmclsadapter. (except for stage files) Summary is almost copied from #1911, special thanks to @harimkang and @supersoob :)

Move all mmcls dependant modules to otx/algo/cls/adapter/mmcls
Fix pre-commit issues
Update test codes
Update docs

Unit tests (all passed)

E2E tests (classification)

How to test

Checklist

I submit my changes into the develop branch
I have added description of my changes into CHANGELOG
I have updated the documentation accordingly
I have added tests to cover my changes
I have linked related issues

License

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

Updated daily workflow - remove if statement to allow running on any branch by manually

harimkang

We can easily fix the dangerous-default-value issue. I didn't get to comment on all of them because there are so many, but please fix them.

otx/algorithms/classification/adapters/mmcls/models/heads/conv_head.py

otx/algorithms/classification/adapters/mmcls/models/heads/custom_cls_head.py

...algorithms/classification/adapters/mmcls/models/heads/custom_hierarchical_linear_cls_head.py

...orithms/classification/adapters/mmcls/models/heads/custom_multi_label_non_linear_cls_head.py

otx/algorithms/classification/adapters/mmcls/models/heads/non_linear_cls_head.py

otx/algorithms/classification/adapters/mmcls/models/heads/semisl_cls_head.py

otx/algorithms/classification/adapters/mmcls/models/heads/semisl_multilabel_cls_head.py

JihwanEom · 2023-03-22T01:40:27Z

@harimkang relected, could you review again?

eunwoosh

It's quite big work! I want to say thanks to you. I left some comments. Please take a look :)

otx/algorithms/classification/adapters/mmcls/datasets/pipelines/transforms/augments.py

otx/algorithms/classification/adapters/mmcls/datasets/pipelines/transforms/augmix.py

otx/algorithms/classification/adapters/mmcls/datasets/pipelines/transforms/augments.py

otx/algorithms/classification/adapters/mmcls/models/heads/semisl_multilabel_cls_head.py

otx/algorithms/classification/adapters/mmcls/optimizer/lars.py

pyproject.toml

JihwanEom · 2023-03-22T06:26:39Z

@eunwoosh @harimkang Reflected all of comments. Could you review again?

supersoob

overall looks good to me but minor comments. I will approve if all reviews are reflected. Thanks:) And thanks for precommit resolving for some hooks:)

otx/algorithms/classification/adapters/mmcls/datasets/pipelines/transforms/__init__.py

otx/algorithms/classification/adapters/mmcls/datasets/__init__.py

eunwoosh

LGTM. Thanks for your work!

supersoob

Great work:)

* Bump up version to 1.1.0rc1 * Updated daily workflow (#1905) - remove if statement to allow running on any branch by manually * [FIX] Wrong test temp directory path (#1902) * Fix wrong test temp directory * Update tests/unit/algorithms/action/adapters/mmaction/utils/test_action_config_utils.py * Update test_action_config_utils.py * Update PR template (#1914) * Update . location. * Fix OTX1.1 -> Geti1.4 integration issues (#1910) * Add dill to requirements/api.txt * Return None instead of raising NotImplementedError in IMedia2DEntity.path * Move utils HPO uses into HPO directory (#1912) move utils into hpo dir * [FIX] Add stability to explain detection (#1901) Add stability to explain detection * [Fix] e2e tests FQ references (#1918) Fix FQ references * Move mpa.deploy to otx.algorithms.common (#1903) * Move deploy modules to otx * test: fix mmdeploy api replacement error * Fix pre-commit issues * Update otx/mpa/det/exporter.py * Update otx/mpa/exporter_mixin.py * Update otx/mpa/seg/exporter.py * Update otx/mpa/cls/exporter.py * Update otx/algorithms/common/adapters/mmdeploy/utils/mmdeploy.py * Update otx/algorithms/common/adapters/mmdeploy/utils/operations_domain.py * Add mmcls.VisionTransformer backbone support (#1908) * Add mmcls transformer backbones * Fix VisionTransformeroutput check * Add changes * Disable recording forward hooks in inferrer * Remove unused import * Move semantic-segmentation related codes to otx adapters (#1911) * Added security.md Add the security related notification * Update security.md fix prettier issue * Add custom exception class for CLI (#1919) * Add custom exception class for CLI * Fixed TCs for config_manager * Correct License to Apache * Remove temp hot key values (#1916) * Refactor OTX classification phase 1: move modules from MPA to OTX (#1893) * Revert TrainType typo (#1928) * Fix Conflict * Fix conflict * Fix unit-tests * Fix cli tests * Fix cli tests * Fix type * Move all hooks in MPA into OTX common mmcv adapter (#1922) * Add explanation for XAI & minor doc fixes (#1923) * [CI] Updated daily workflow (#1904) Updated daily workflow - remove if statement to allow running on any branch by manually * [FIX] re-bugfix: ATSS head loss (#1907) re bugfix * Fix typos * Explanation of Explanation * Add images & typo fixes * Fixes from comments * Add accuracy for OD explanation * Tutorial update * Add accuracy for BCCD and WGISD * Fix * Move utils to OTX common & adapter (#1931) * [CI] Updated daily workflow (#1904) Updated daily workflow - remove if statement to allow running on any branch by manually * [FIX] re-bugfix: ATSS head loss (#1907) re bugfix * Added security.md Added the security related notification. * Update security.md fix prettier issue * Move utils * Fix typo * Move classification unit tests to OTX tests (#1932) * [CI] Updated daily workflow (#1904) Updated daily workflow - remove if statement to allow running on any branch by manually * [FIX] re-bugfix: ATSS head loss (#1907) re bugfix * Added security.md Added the security related notification. * Update security.md fix prettier issue * Move classification unit tests * Apply mocker in RandAugment TC * Move otx.mpa.modules.ov -> otx.core.ov (#1929) * First Refactoring * Refactor mpa.modules.ov -> otx.core.ov * Remove otx.mpa.modules.ov * Fix docs & unit test paths * Fix some import * Add TODO comments * Add github icon link in doc head (#1934) * Fix invalid temp_dir inside unit tests (#1937) * Move all model utils and dataloaders/samplers in mpa to otx adapter (#1930) * Move stages to each algorithms (#1938) * Move stages to each algorithms * Change docs for action recognition (#1940) * Change docs for action recognition * Fix typo * Update MoViNet related parts * Add MoViNet performance * Revert table include Complexity and Model size * Fix tox to run tests on non-editable install * Fix packaging errors including cython module build / import issues (#1936) * Avoid cychon compile on Windows * Fix packaging errors * Fix pre-commit * Remove use_develop option from tox tests * Fix pre-commit * Fix tox -e -> -re for clean build * Fix import error * Add missing __init__.py * Fix relative -> absolute import * Revert to editable package in tox tests * Release 1.1.0 (#1933) * Release OTX 1.1.0 * Update known issues in CHANGELOG.md * Fix PR / issue # to links * Fix pre-commit * Bump-up version to 1.2 * Fix pre-commit --------- Signed-off-by: Songki Choi <songki.choi@intel.com> Co-authored-by: Yunchu Lee <yunchu.lee@intel.com> Co-authored-by: Harim Kang <harim.kang@intel.com> Co-authored-by: Eunwoo Shin <eunwoo.shin@intel.com> Co-authored-by: Emily Chun <emily.chun@intel.com> Co-authored-by: emily.chun <chuneuny@ikvensx012> Co-authored-by: Sungman Cho <sungman.cho@intel.com> Co-authored-by: Inhyuk Andy Cho <andy.inhyuk.jo@intel.com> Co-authored-by: Jaeguk Hyun <jaeguk.hyun@intel.com> Co-authored-by: Jihwan Eom <jihwan.eom@intel.com> Co-authored-by: Soobee Lee <soobee.lee@intel.com> Co-authored-by: Galina Zalesskaya <galina.zalesskaya@intel.com>

github-actions bot added ALGO Any changes in OTX Algo Tasks implementation TEST Any changes in tests labels Mar 16, 2023

JihwanEom added this to the 1.1.0 milestone Mar 16, 2023

JihwanEom and others added 4 commits March 17, 2023 01:01

initial move to mmcls adapters

8df2f6b

Fix typo

23f062a

Fix typo

9f0235a

[CI] Updated daily workflow (#1904)

40559b0

Updated daily workflow - remove if statement to allow running on any branch by manually

github-actions bot added BUILD DEPENDENCY Any changes in any dependencies (new dep or its version) should be produced via Change Request on PM labels Mar 18, 2023

JihwanEom added 9 commits March 18, 2023 17:59

Rebase

08047b3

Fix setup.py for cython modules

459b301

Move OV modules

6f302b2

Fix pre-commit

2d95643

Fix flake8 issues

19119d0

Move semisl multilabel files

e5131eb

Fix bugs

0574766

Fix bugs

792caac

Fix pre-commit

428e9c2

goodsong81 added RELEASE REFACTOR DO NOT MERGE labels Mar 21, 2023

goodsong81 changed the title ~~[ENHANCE][WIP] Refactor OTX classification phase 1: move modules from MPA to OTX~~ Refactor OTX classification phase 1: move modules from MPA to OTX Mar 21, 2023

Fix pre-commit issues

8cc3371

github-actions bot added CLI Any changes in OTE CLI DOC Improvements or additions to documentation labels Mar 21, 2023

JihwanEom marked this pull request as ready for review March 21, 2023 05:56

JihwanEom requested a review from a team as a code owner March 21, 2023 05:56

JihwanEom requested review from harimkang, eunwoosh and jaegukhyun March 21, 2023 05:57

JihwanEom added 3 commits March 22, 2023 03:49

Fix pre-commit

14287b8

Fix pre-commit

e82c68f

Add pylint disable

884191f

harimkang reviewed Mar 22, 2023

View reviewed changes

JihwanEom requested a review from harimkang March 22, 2023 01:40

eunwoosh reviewed Mar 22, 2023

View reviewed changes

JihwanEom requested a review from eunwoosh March 22, 2023 06:26

supersoob reviewed Mar 22, 2023

View reviewed changes

otx/algorithms/classification/adapters/mmcls/datasets/pipelines/transforms/__init__.py Outdated Show resolved Hide resolved

otx/algorithms/classification/adapters/mmcls/datasets/__init__.py Show resolved Hide resolved

JihwanEom requested a review from supersoob March 22, 2023 07:10

eunwoosh previously approved these changes Mar 22, 2023

View reviewed changes

JihwanEom dismissed eunwoosh’s stale review via eaa5b7b March 22, 2023 07:19

supersoob previously approved these changes Mar 22, 2023

View reviewed changes

JihwanEom requested a review from eunwoosh March 22, 2023 07:40

eunwoosh previously approved these changes Mar 22, 2023

View reviewed changes

JihwanEom dismissed stale reviews from eunwoosh and supersoob via ed1ca79 March 22, 2023 07:51

JihwanEom requested review from supersoob and eunwoosh March 22, 2023 08:27

eunwoosh approved these changes Mar 22, 2023

View reviewed changes

supersoob approved these changes Mar 22, 2023

View reviewed changes

JihwanEom merged commit 12e145c into openvinotoolkit:releases/1.1.0 Mar 22, 2023

JihwanEom added 5 commits March 22, 2023 18:45

Remove dangerous-default-value

2fe826b

Reflect comments

0caad89

Reflect review comments

7f192e6

Resolve pre-commit issue

eaa5b7b

Resolve unit-test issue

ed1ca79

JihwanEom deleted the jeom/move-cls-modules branch March 22, 2023 17:11

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Refactor OTX classification phase 1: move modules from MPA to OTX #1893

Refactor OTX classification phase 1: move modules from MPA to OTX #1893

JihwanEom commented Mar 16, 2023 •

edited

Loading

harimkang left a comment

JihwanEom commented Mar 22, 2023

eunwoosh left a comment

JihwanEom commented Mar 22, 2023

supersoob left a comment

eunwoosh left a comment

supersoob left a comment

Refactor OTX classification phase 1: move modules from MPA to OTX #1893

Refactor OTX classification phase 1: move modules from MPA to OTX #1893

Conversation

JihwanEom commented Mar 16, 2023 • edited Loading

Summary

Unit tests (all passed)

E2E tests (classification)

How to test

Checklist

License

harimkang left a comment

Choose a reason for hiding this comment

JihwanEom commented Mar 22, 2023

eunwoosh left a comment

Choose a reason for hiding this comment

JihwanEom commented Mar 22, 2023

supersoob left a comment

Choose a reason for hiding this comment

eunwoosh left a comment

Choose a reason for hiding this comment

supersoob left a comment

Choose a reason for hiding this comment

JihwanEom commented Mar 16, 2023 •

edited

Loading