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.

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

Move stages to each algorithms #1938

Merged

Conversation

jaegukhyun
Copy link
Contributor

@jaegukhyun jaegukhyun commented Mar 24, 2023

Summary

This PR is for moving stages in mpa to each algorithms
otx.mpa.cls ==> otx.algorithms.classification.adapters.mmcls.tasks(new folder)
otx.mpa.det ==> otx.algorithms.detection.adapters.mmdet.tasks(new folder)
otx.mpa.seg ==> otx.algorithms.segmentation.adapters.mmseg.tasks(new folder)

Note.

These stages(trainer, inferrer, etc) will be replaced in Phase2 refactoring(removing callstack)

How to test

Normal intg, e2e, unit test

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

@jaegukhyun jaegukhyun requested a review from a team as a code owner March 24, 2023 04:12
@github-actions github-actions bot added ALGO Any changes in OTX Algo Tasks implementation DOC Improvements or additions to documentation TEST Any changes in tests labels Mar 24, 2023
@codecov-commenter
Copy link

codecov-commenter commented Mar 24, 2023

Codecov Report

❗ No coverage uploaded for pull request base (releases/1.1.0@a853c38). Click here to learn what that means.
Patch coverage: 87.39% of modified lines in pull request are covered.

Additional details and impacted files
@@                Coverage Diff                @@
##             releases/1.1.0    #1938   +/-   ##
=================================================
  Coverage                  ?   80.68%           
=================================================
  Files                     ?      482           
  Lines                     ?    33222           
  Branches                  ?        0           
=================================================
  Hits                      ?    26804           
  Misses                    ?     6418           
  Partials                  ?        0           
Impacted Files Coverage Δ
.../algorithms/common/adapters/mmcv/tasks/registry.py 100.00% <ø> (ø)
...x/algorithms/common/adapters/mmcv/tasks/version.py 100.00% <ø> (ø)
...rithms/detection/adapters/mmdet/tasks/explainer.py 22.61% <50.00%> (ø)
...fication/adapters/mmcls/tasks/incremental/stage.py 55.55% <60.00%> (ø)
otx/algorithms/common/adapters/mmcv/tasks/stage.py 84.39% <72.30%> (ø)
...x/algorithms/common/adapters/mmcv/tasks/builder.py 83.33% <75.00%> (ø)
...entation/adapters/mmseg/tasks/incremental/stage.py 94.11% <80.00%> (ø)
...ation/adapters/mmseg/tasks/incremental/inferrer.py 85.71% <85.71%> (ø)
...ction/adapters/mmdet/tasks/incremental/inferrer.py 88.88% <88.88%> (ø)
...ection/adapters/mmdet/tasks/incremental/trainer.py 88.88% <88.88%> (ø)
... and 32 more

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.

harimkang
harimkang previously approved these changes Mar 24, 2023
supersoob
supersoob previously approved these changes Mar 24, 2023
eunwoosh
eunwoosh previously approved these changes Mar 24, 2023
Copy link
Contributor

@eunwoosh eunwoosh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for your work!

@jaegukhyun jaegukhyun added this to the 1.1.0 milestone Mar 24, 2023
jaegukhyun and others added 7 commits March 24, 2023 15:41
…tage.py

Co-authored-by: Eunwoo Shin <eunwoo.shin@intel.com>
Co-authored-by: Eunwoo Shin <eunwoo.shin@intel.com>
Co-authored-by: Eunwoo Shin <eunwoo.shin@intel.com>
Co-authored-by: Eunwoo Shin <eunwoo.shin@intel.com>
Co-authored-by: Eunwoo Shin <eunwoo.shin@intel.com>
@jaegukhyun jaegukhyun dismissed stale reviews from eunwoosh, supersoob, and harimkang via 21ad6e0 March 24, 2023 06:41
harimkang
harimkang previously approved these changes Mar 24, 2023
eunwoosh
eunwoosh previously approved these changes Mar 24, 2023
@jaegukhyun jaegukhyun dismissed stale reviews from eunwoosh and harimkang via 3be662d March 24, 2023 08:10
@jaegukhyun jaegukhyun merged commit e654199 into openvinotoolkit:releases/1.1.0 Mar 24, 2023
goodsong81 added a commit that referenced this pull request Mar 28, 2023
* 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>
@jaegukhyun jaegukhyun deleted the origin/move-stages branch June 2, 2023 01:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ALGO Any changes in OTX Algo Tasks implementation DOC Improvements or additions to documentation TEST Any changes in tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants