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

Merge back 1.4.0 to develop #2387

Merged
merged 40 commits into from
Jul 24, 2023
Merged

Merge back 1.4.0 to develop #2387

merged 40 commits into from
Jul 24, 2023

Conversation

yunchu
Copy link
Contributor

@yunchu yunchu commented Jul 21, 2023

Summary

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) 2023 Intel Corporation
# SPDX-License-Identifier: Apache-2.0

yunchu and others added 30 commits July 7, 2023 22:41
@yunchu
Update base.txt
c13a79d 
updated dependency version of datumaro
@yunchu
Update __init__.py
228a8ed 
update version string
@yunchu
Update requirements.txt
5dfd5fd
@sungchul2
Temporarily skip visual prompting openvino integration test (#2323)
e67d261
@vinnamkim
Fix import dm.DatasetSubset (#2324)
344f526 
Signed-off-by: Kim, Vinnam <[email protected]>
@negvet @goodsong81
Fix semantic segmentation soft prediction dtype (#2322)
cfd7706 
* Fix semantic segmentation soft prediction dtype

* relax ref sal vals check

---------

Co-authored-by: Songki Choi <[email protected]>
@eunwoosh
Contrain yapf verison lesser than 0.40.0 (#2328)
c3dd4aa 
contrain_yapf_version
@jaegukhyun
Fix detection e2e tests (#2327)
19477a3 
Fix for detection
@sungmanc @goodsong81
Mergeback: Label addtion/deletion 1.2.4 --> 1.4.0 (#2326)
6b51ba0 
* Make black happy

* Fix conflicts

* Merge-back: add test datasets and edit the test code

* Make black happy

* Fix mis-merge

* Make balck happy

* Fix typo

* Fix typoi

---------

Co-authored-by: Songki Choi <[email protected]>
@yunchu
Bump datumaro up to 1.4.0rc2 (#2332)
b47ebf3 
bump datumaro up to 1.4.0rc2
@eugene123tw
Tiling Doc for releases 1.4.0 (#2333)
3a0fff0 
* Add tiling documentation
@yunchu
Bump otx version to 1.4.0rc2 (#2341)
91ad751
@sungchul2 @wonjuleee
OTX deploy for visual prompting task (#2311)
85bf95e 
* Enable `otx deploy`

* (WIP) integration test

* Docstring

* Update args for create_model

* Manually set image embedding layout

* Enable to use model api for preprocessing
- `fit_to_window` doesn't work expectedly, so newly implemented `VisualPromptingOpenvinoAdapter` to use new resize function

* Remove skipped test

* Updated

* Update unit tests on model wrappers

* Update

* Update configuration

* Fix not to patch pretrained path

* pylint & update model api version in docstring

---------

Co-authored-by: Wonju Lee <[email protected]>
@djdameln
Bump albumentations version in anomaly requirements (#2350)
bb3ab4c 
increment albumentations version
@jaegukhyun
Update action detection (#2346)
a8c6658 
* Remove skip mark for PTQ test of action detection

* Update action detection documentation
@jaegukhyun
Fix e2e (#2348)
225ddf1 
* Change classification dataset from dummy to toy

* Revert test changes

* Change label name for multilabel dataset

* Revert e2e test changes

* Change ov test cases' threshold

* Add parent's label
@sovrasov
Update ModelAPI in 1.4 release (#2347)
603efca 
* Upgrade model API

* Update otx in exportable code

* Fix unit tests

* Fix black

* Fix detection inference

* Fix det tiling

* Fix mypy

* Fix demo

* Fix visualizer in demo

* Fix black
@sungchul2
Add OTX optimize for visual prompting task (#2318)
4a8b079 
* Initial commit

* Update block

* (WIP) otx optimize

* Fix

* WIP

* Update configs & exported outputs

* Remove unused modules for torch

* Add unit tests

* pre-commit

* Update CHANGELOG
@jaegukhyun @eunwoosh
Update detection docs (#2335)
06142b6 
* Update detection docs

* Revert template id changes

* Fix wrong template id

* Update docs/source/guide/explanation/algorithms/object_detection/object_detection.rst

Co-authored-by: Eunwoo Shin <[email protected]>

* Update docs/source/guide/explanation/algorithms/object_detection/object_detection.rst

Co-authored-by: Eunwoo Shin <[email protected]>

---------

Co-authored-by: Eunwoo Shin <[email protected]>
@sungchul2
Add visual prompting documentation (#2354)
7924b5a 
* (WIP) write docs

* Add visual prompting documentation

* Update CHANGELOG

---------

Co-authored-by: sungchul.kim <sungchul@ikvensx010>
@sungchul2
Remove custom modelapi patch in visual prompting (#2359)
ca5f74d 
* Remove custom modelapi patch

* Update test
@goodsong81
Fix graph metric order and label issues (#2356)
a123ca7 
* Fix graph metric going backward issue
* Add license notice
* Fix pre-commit issue
* Add rename items & logic for metric
---------
Signed-off-by: Songki Choi <[email protected]>
@sungmanc
Update multi-label document and conversion script (#2358)
5ca24e1 
Update docs, label convert script
@yunchu
Update third party programs (#2365)
c1c0463
@djdameln
Make anomaly task compatible with older albumentations versions (#2363)
895bd36 
* fix transforms export in metadata

* wrap transform dict

* add todo for updating to_dict call
@negvet
Fixing detection saliency map for one class case (#2368)
3d157ab 
* fix softmax

* fix validity tests
@sungchul2 @jaegukhyun
Add e2e test for visual prompting (#2360)
edd1a8c 
* (WIP) otx optimize

* pre-commit

* (WIP) set e2e

* Remove nncf config

* Add visual prompting requirement

* Add visual prompting in tox

* Add visual prompting in setup.py

* Fix typo

* Delete unused configuration.yaml

* Edit test_name

* Add to limit activation range

* Update from `vp` to `visprompt`

* Fix about no returning the first label

* pre-commit

* (WIP) otx optimize

* pre-commit

* (WIP) set e2e

* Remove nncf config

* Add visual prompting requirement

* Add visual prompting in tox

* Add visual prompting in setup.py

* Fix typo

* pre-commit

* Add actions

* Update tests/e2e/cli/visual_prompting/test_visual_prompting.py

Co-authored-by: Jaeguk Hyun <[email protected]>

* Skip PTQ e2e test

* Change task name

* Remove skipped tc

---------

Co-authored-by: Jaeguk Hyun <[email protected]>
@jaegukhyun @GalyaZalesskaya
Fix e2e (#2366)
66e8a67 
* Change e2e reference name

* Update openvino eval threshold for multiclass classification

* Change comment message

* Fix tiling e2e tests

---------

Co-authored-by: GalyaZalesskaya <[email protected]>
@jaegukhyun
Add Dino head unit tests (#2344)
d0e864c 
Recover DINO head unit tests
@yunchu @jaegukhyun
Update for release 1.4.0rc2 (#2370)
c28c612 
* update for release 1.4.0rc2

* Add skip mark for unstable unit tests

---------

Co-authored-by: jaegukhyun <[email protected]>
sovrasov and others added 9 commits July 19, 2023 09:58
@sovrasov
Fix NNCF training on CPU (#2373)
0c4be3c
@eunwoosh
Align label order between Geti and OTX (#2369)
85bfe9f 
* align label order

* align with pre-commit

* update CHANGELOG.md

* deal with edge case

* update type hint
@sungmanc
Remove CenterCrop from Classification test pipeline and editing missi…
43eb838 
…ng docs link (#2375)

* Fix missing link for docs and removing centercrop for classification data pipeline

* Revert the test threshold
@sungmanc
Fix H-label classification (#2377)
0906811 
* Fix h-labelissue

* Update unit tests

* Make black happy

* Fix unittests

* Make black happy

* Fix update heades information func

* Update the logic: consider the loss per batch
@yunchu @goodsong81
Update for release 1.4 (#2380)
f1234d2 
* updated for 1.4.0rc3

* update changelog & release note

* bump datumaro version up

---------

Co-authored-by: Songki Choi <[email protected]>
@sovrasov
Switch to PTQ for sseg (#2374)
7319b20 
* Switch to PTQ for sseg

* Update log messages
@harimkang
Fix invalid import structures in otx.api (#2383)
22aaf2a 
Update tiler.py
@yunchu
Update for 1.4.0rc4 (#2385)
8690bf9 
update for release 1.4.0rc4
@yunchu
Merge branch 'releases/1.4.0' into infra/mergeback-1.4.0
22fe24c
@github-actions github-actions bot added DEPENDENCY Any changes in any dependencies (new dep or its version) should be produced via Change Request on PM API Any changes in OTX API CLI Any changes in OTE CLI ALGO Any changes in OTX Algo Tasks implementation TEST Any changes in tests BUILD DOC Improvements or additions to documentation labels Jul 21, 2023
@codecov-commenter
Copy link

codecov-commenter commented Jul 21, 2023 •
edited
Loading

Codecov Report

Patch coverage: 89.35% and project coverage change: -0.03 ⚠️

Comparison is base (5053957) 79.67% compared to head (5c26143) 79.65%.

Additional details and impacted files 
@@             Coverage Diff             @@
##           develop    #2387      +/-   ##
===========================================
- Coverage    79.67%   79.65%   -0.03%     
===========================================
  Files          510      511       +1     
  Lines        38035    38217     +182     
===========================================
+ Hits         30305    30440     +135     
- Misses        7730     7777      +47
Flag Coverage Δ
py310 79.61% <89.35%> (-0.06%) ⬇️
py38 79.62% <89.35%> (-0.04%) ⬇️
py39 79.59% <89.35%> (-0.07%) ⬇️

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

Impacted Files Coverage Δ
src/otx/algorithms/anomaly/tasks/inference.py 24.57% <ø> (ø)
src/otx/algorithms/anomaly/tasks/openvino.py 27.14% <0.00%> (ø)
...c/otx/algorithms/classification/utils/cls_utils.py 98.43% <ø> (ø)
...classification/utils/convert_coco_to_multilabel.py 69.44% <ø> (ø)
.../ocr_lite_hrnet_18_mod2/ptq_optimization_config.py 100.00% <ø> (ø)
...s/ocr_lite_hrnet_s_mod2/ptq_optimization_config.py 0.00% <ø> (ø)
...s/ocr_lite_hrnet_x_mod3/ptq_optimization_config.py 0.00% <ø> (ø)
...pting/configs/sam_vit_b/ptq_optimization_config.py 0.00% <0.00%> (ø)
...e_code/demo/demo_package/executors/asynchronous.py 0.00% <0.00%> (ø)
...portable_code/demo/demo_package/model_container.py 0.00% <0.00%> (ø)
... and 26 more

... and 2 files with indirect coverage changes

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

@yunchu yunchu marked this pull request as ready for review July 21, 2023 10:52
@yunchu yunchu requested a review from a team as a code owner July 21, 2023 10:52
eunwoosh
eunwoosh reviewed Jul 24, 2023
View reviewed changes
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.

When I checked my changes, they're applied well. Thanks.
By the way, there is a code conflict. Could you check it?

sungmanc
sungmanc approved these changes Jul 24, 2023
View reviewed changes
Copy link
Contributor

@sungmanc sungmanc left a comment

Choose a reason for hiding this comment

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

LGTM

@yunchu yunchu merged commit 6662f48 into develop Jul 24, 2023
@yunchu yunchu deleted the infra/mergeback-1.4.0 branch July 24, 2023 04:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eunwoosh eunwoosh eunwoosh left review comments

@sungmanc sungmanc sungmanc approved these changes

@goodsong81 goodsong81 goodsong81 approved these changes

Assignees
No one assigned
Labels
ALGO Any changes in OTX Algo Tasks implementation API Any changes in OTX API BUILD CLI Any changes in OTE CLI DEPENDENCY Any changes in any dependencies (new dep or its version) should be produced via Change Request on PM DOC Improvements or additions to documentation TEST Any changes in tests
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.