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.

Sign up for GitHub

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

Jump to bottom

Move all hooks in MPA into OTX common mmcv adapter #1922

Merged
merged 34 commits into from
Mar 23, 2023
Merged

Move all hooks in MPA into OTX common mmcv adapter #1922

merged 34 commits into from
Mar 23, 2023

Conversation

supersoob
Copy link
Contributor

@supersoob supersoob commented Mar 21, 2023 •
edited
Loading

Summary

Moved hooks which is registered in mmcv in mpa folder to otx common mmcv adapter.

  • Move all hooks to otx/algo/common/adapter/mmcv/hooks
  • Group hooks in a file
  • Fix pre-commit issues
  • Update test codes
  • Update docs
  • Check local test results

How to test

pytest tests/units
or run e2e tests

Checklist

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

yunchu and others added 16 commits March 17, 2023 17:46
@yunchu
[CI] Updated daily workflow (openvinotoolkit#1904)
40559b0 
Updated daily workflow

- remove if statement to allow running on any branch by manually
modules to mmseg
42126b4
Merge branch 'develop' of https://github.com/openvinotoolkit/training…
22b38f9 
…_extensions into mpa-move
revise init files
93e165d
fix precommit
83ccc07
@eunwoosh
[FIX] re-bugfix: ATSS head loss (openvinotoolkit#1907)
cd2519f 
re bugfix
docstring
a2c983d
Merge branch 'develop' of https://github.com/openvinotoolkit/training…
b199612 
…_extensions into mpa-move
fix pylint
6f94f4e
otx precommit
a66d194
finish precommit issue
55b702f
tests revised
1f5091b
update docs
1617700
fix precommit
a220a15
fix year
d157ace
Merge branch 'releases/1.1.0' of https://github.com/openvinotoolkit/t…
fabbd4f 
…raining_extensions into mpa-move
@github-actions github-actions bot added ALGO Any changes in OTX Algo Tasks implementation TEST Any changes in tests labels Mar 21, 2023
@github-actions github-actions bot added the DOC Improvements or additions to documentation label Mar 23, 2023
@supersoob supersoob added this to the 1.1.0 milestone Mar 23, 2023
@supersoob supersoob marked this pull request as ready for review March 23, 2023 06:54
@supersoob supersoob requested a review from a team as a code owner March 23, 2023 06:54
@supersoob supersoob requested a review from eunwoosh March 23, 2023 06:54
goodsong81
goodsong81 approved these changes Mar 23, 2023
View reviewed changes
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, it's great work!

@codecov-commenter
Copy link

Codecov Report

Patch coverage: 79.18% and project coverage change: +0.08 🎉

Comparison is base (12e145c) 80.65% compared to head (6812abb) 80.73%.

Additional details and impacted files 
@@                Coverage Diff                 @@
##           releases/1.1.0    #1922      +/-   ##
==================================================
+ Coverage           80.65%   80.73%   +0.08%     
==================================================
  Files                 484      486       +2     
  Lines               33468    33358     -110     
==================================================
- Hits                26992    26931      -61     
+ Misses               6476     6427      -49
Impacted Files Coverage Δ
...algorithms/common/adapters/mmcv/hooks/eval_hook.py 100.00% <ø> (ø)
...mon/adapters/mmcv/hooks/fp16_sam_optimizer_hook.py 23.52% <ø> (ø)
...orithms/common/adapters/mmcv/hooks/ib_loss_hook.py 38.09% <ø> (ø)
...s/common/adapters/mmcv/hooks/no_bias_decay_hook.py 92.00% <ø> (ø)
...s/common/adapters/mmcv/hooks/sam_optimizer_hook.py 16.66% <ø> (ø)
...thms/common/adapters/mmcv/hooks/semisl_cls_hook.py 45.16% <ø> (ø)
...thms/common/adapters/mmcv/hooks/task_adapt_hook.py 32.25% <ø> (ø)
...tx/algorithms/common/adapters/mmcv/nncf/patches.py 100.00% <ø> (ø)
...n/adapters/mmcv/hooks/composed_dataloaders_hook.py 47.82% <33.33%> (ø)
...rithms/common/adapters/mmcv/hooks/workflow_hook.py 50.70% <46.66%> (ø)
... and 27 more

... and 4 files with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@supersoob supersoob merged commit 0e26106 into openvinotoolkit:releases/1.1.0 Mar 23, 2023
goodsong81 added a commit that referenced this pull request Mar 28, 2023
@goodsong81 @yunchu
@harimkang @eunwoosh @chuneuny-emily @sungmanc @cih9088 @jaegukhyun @JihwanEom @supersoob @GalyaZalesskaya
Merge back changes in release 1.1.0 (#1947)
f8e31db 
* 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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JihwanEom JihwanEom JihwanEom approved these changes

@goodsong81 goodsong81 goodsong81 approved these changes

@harimkang harimkang Awaiting requested review from harimkang

@jaegukhyun jaegukhyun Awaiting requested review from jaegukhyun

@eunwoosh eunwoosh Awaiting requested review from eunwoosh

Assignees
No one assigned
Labels
ALGO Any changes in OTX Algo Tasks implementation DOC Improvements or additions to documentation REFACTOR TEST Any changes in tests
Projects
None yet
Milestone
1.1.0
Development

Successfully merging this pull request may close these issues.
6 participants
@supersoob @codecov-commenter @goodsong81 @JihwanEom @yunchu @eunwoosh