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 XPU/Opt related PRs from releases2.0 to develop #3295

Merged
merged 23 commits into from
Apr 16, 2024
Merged

Conversation

kprokofi
Copy link
Collaborator

@kprokofi kprokofi commented Apr 9, 2024

Summary

Merge back #3218 and #3094 from releases to develop

How to test

Checklist

  • I have added unit tests to cover my changes.​
  • I have added integration tests to cover my changes.​
  • I have added e2e tests for validation.
  • I have added the description of my changes into CHANGELOG in my target branch (e.g., CHANGELOG in develop).​
  • I have updated the documentation in my target branch accordingly (e.g., documentation in develop).
  • I have linked related issues.

License

  • I submit my code changes under the same Apache 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) 2024 Intel Corporation
# SPDX-License-Identifier: Apache-2.0

kprokofi and others added 2 commits April 10, 2024 06:34
* add raising an error when metric is None

* added accelerators

* fix packages

* fix assigning model

* debug on MAX

* change precision

* update MixedPrecisionXPUPlugin

* debug

* added monkey patching

* minor

* minor

* added patch for mmengine

* fix OD and IS

* benchmark debug

* change device

* quick fix for instance seg

* fix pre-commit

* fix pre-commit

* clean the code

* added additional flag for mmcv

* added unit tests

* fixed unit test

* fix linter

* added unit tests and replied comments

* fix pre-commit

* minor fix

* added documentation

* fix unit test

* add workaround for semantic segmentation

* remove RoiAlignTest due to unstability

* minor

* remove strategy back

* try to patch SingleDeviceStrategy

* added auto xpu configuration

* patch strategy

* small fix

* reply to comments

* move patching xpu packages to accelerator

* fix test_xpu test

* remove do-not-install-mmcv

* fix pre-commit

* remove torch.xpu.optimize for segmentation

---------

Co-authored-by: Emily <[email protected]>
* added unit tests. Need to clean up

* move tests

* fix pre-commit

* return demo back

* minor

* delete unnecessery comments
jaegukhyun
jaegukhyun previously approved these changes Apr 11, 2024
Copy link

codecov bot commented Apr 11, 2024

Codecov Report

Attention: Patch coverage is 76.41026% with 46 lines in your changes are missing coverage. Please review.

Project coverage is 77.48%. Comparing base (fb69fcb) to head (b98bb4b).
Report is 2 commits behind head on develop.

Files Patch % Lines
src/otx/algo/plugins/xpu_precision.py 73.07% 14 Missing ⚠️
src/otx/algo/accelerators/xpu.py 73.46% 13 Missing ⚠️
src/otx/algo/detection/utils/mmcv_patched_ops.py 86.84% 5 Missing ⚠️
src/otx/engine/engine.py 44.44% 5 Missing ⚠️
src/otx/algo/strategies/xpu_single.py 86.66% 4 Missing ⚠️
...e_code/demo/demo_package/visualizers/visualizer.py 0.00% 3 Missing ⚠️
...le_code/demo/demo_package/visualizers/vis_utils.py 0.00% 1 Missing ⚠️
src/otx/utils/utils.py 90.00% 1 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #3295      +/-   ##
===========================================
+ Coverage    77.02%   77.48%   +0.46%     
===========================================
  Files          194      198       +4     
  Lines        16633    16930     +297     
===========================================
+ Hits         12812    13119     +307     
+ Misses        3821     3811      -10     
Flag Coverage Δ
py310 77.48% <76.41%> (+0.46%) ⬆️
py311 77.48% <76.41%> (+0.45%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@kprokofi kprokofi requested a review from jaegukhyun April 11, 2024 21:57
jaegukhyun
jaegukhyun previously approved these changes Apr 12, 2024
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! I left some comments. Please take a look.

src/otx/engine/engine.py Outdated Show resolved Hide resolved
src/otx/algo/strategies/xpu_single.py Outdated Show resolved Hide resolved
eunwoosh
eunwoosh previously approved these changes Apr 12, 2024
@kprokofi kprokofi requested review from jaegukhyun and eunwoosh April 12, 2024 08:28
eunwoosh
eunwoosh previously approved these changes Apr 12, 2024
@kprokofi
Copy link
Collaborator Author

seems like tox is broken. pytest works well

@kprokofi kprokofi requested review from eunwoosh and harimkang April 15, 2024 22:32
@kprokofi kprokofi enabled auto-merge (squash) April 15, 2024 22:32
@kprokofi kprokofi merged commit 255be7a into develop Apr 16, 2024
14 of 15 checks passed
@kprokofi kprokofi deleted the kp/move_xpu_prs branch April 16, 2024 06:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
TEST Any changes in tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants