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

Fix packaging errors including cython module build / import issues #1936

Merged
merged 14 commits into from
Mar 28, 2023
Merged

Fix packaging errors including cython module build / import issues #1936

merged 14 commits into from
Mar 28, 2023

Conversation

goodsong81
Copy link

@goodsong81 goodsong81 commented Mar 24, 2023 •
edited
Loading

Summary

  • Avoid Cython compile on not supported platform.
  • Resolve packaging errors
  • Add missing __init__.py

How to 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

@github-actions 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 24, 2023
@goodsong81 goodsong81 changed the title Skip cython compile to make pip install otx work on Windows Fix pip install otx to work on Windows Mar 24, 2023
@goodsong81 goodsong81 marked this pull request as ready for review March 24, 2023 07:45
@github-actions github-actions bot added the ALGO Any changes in OTX Algo Tasks implementation label Mar 24, 2023
@goodsong81 goodsong81 requested a review from a team as a code owner March 24, 2023 07:45
@jaegukhyun jaegukhyun added this to the 1.1.0 milestone Mar 24, 2023
jaegukhyun
jaegukhyun previously approved these changes Mar 24, 2023
View reviewed changes
JihwanEom
JihwanEom previously approved these changes Mar 24, 2023
View reviewed changes
Copy link
Contributor

@JihwanEom JihwanEom left a comment

Choose a reason for hiding this comment

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

Sorry for missing __init__.py for Cython modules..

Songki Choi added 2 commits March 27, 2023 19:24
Include c file for cython package
fbdb22f 
Signed-off-by: Songki Choi <songki.choi@intel.com>
Reverte to ediatble package
4743faf
@codecov-commenter
Copy link

Codecov Report

Patch coverage: 100.00% and no project coverage change.

Comparison is base (46c786a) 80.72% compared to head (4743faf) 80.72%.

Additional details and impacted files 
@@               Coverage Diff               @@
##           releases/1.1.0    #1936   +/-   ##
===============================================
  Coverage           80.72%   80.72%           
===============================================
  Files                 482      482           
  Lines               33220    33220           
===============================================
+ Hits                26816    26818    +2     
+ Misses               6404     6402    -2
Impacted Files Coverage Δ
...mon/adapters/mmcv/pipelines/transforms/augments.py 90.14% <100.00%> (ø)

... and 1 file 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.

@goodsong81 goodsong81 changed the title Fix pip install otx to work on Windows Fix packaging errors including cython module build / import issues Mar 28, 2023
@goodsong81 goodsong81 merged commit 279ab7a into openvinotoolkit:releases/1.1.0 Mar 28, 2023
@goodsong81 goodsong81 deleted the songkich/fix-otx-api-windows branch March 28, 2023 01:38
goodsong81 pushed a commit that referenced this pull request Mar 28, 2023
@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 left review comments

@jaegukhyun jaegukhyun jaegukhyun left review comments

Assignees
No one assigned
Labels
ALGO Any changes in OTX Algo Tasks implementation BUILD DEPENDENCY Any changes in any dependencies (new dep or its version) should be produced via Change Request on PM RELEASE
Projects
None yet
Milestone
1.1.0
Development

Successfully merging this pull request may close these issues.
4 participants
@goodsong81 @codecov-commenter @JihwanEom @jaegukhyun