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.2.3 -> 1.3.1 #2192

Merged
merged 20 commits into from
Jun 1, 2023
Merged

Merge back 1.2.3 -> 1.3.1 #2192

merged 20 commits into from
Jun 1, 2023

Conversation

goodsong81
Copy link
Contributor

@goodsong81 goodsong81 commented May 24, 2023 •
edited
Loading

Summary

  • Apply the optimization & bug fixes in tiling in release/1.2.1~2

How to test

  • CI tests

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

sungmanc and others added 4 commits May 24, 2023 23:21
@sungmanc @jaegukhyun
@eugene123tw @goodsong81
Optimize counting train & inference speed and memory consumption (#2172)
c6298ab 
* Add sampling tiling dataset method

* Add unit test

* update

* update

* update configs

* update

* Update

* Fix configuration for deployment

* Add experimental script

* Fix smallthing in exp.sh

* Change default labels type from list to np.array

* Revert resolution, num_workers

* Fix typo

* Skip mask if its confidence is under threshold

* Add prediction with user defined confidence threshold

* Update exp.sh

* support multi-batch in tile classifier

* polygon sampling

* exclude full image in training

* Add

* Refine adaptive tile params

- Use size rather than area
- 32 pixels as min detectable size
- Default object_tile_ratio = 32 / 1024 = 0.03

* Tune params

* Fix tile on the edge

* Fix IR overlap ratio according to IR scale factor

Signed-off-by: Songki Choi <songki.choi@intel.com>

* Set default object_tile_ratio = 0.06 (32/512)

* Add tile_deployment

* Keep aspect ratio for tiling

* Fix tile patching

* Fix adaptive tile logic for robustness

* Delete useless file

* Cleansing

* Update exp.sh

* Fix precommit

* Refine adaptive tile params

- Use size rather than area
- 32 pixels as min detectable size
- Default object_tile_ratio = 32 / 1024 = 0.03

* Tune params

* Set default object_tile_ratio = 0.06 (32/512)

* Keep aspect ratio for tiling

* Fix tile patching

* Fix adaptive tile logic for robustness

* Remove useless line

* Apply comments

* Remove some comments

* make black happy

* Update default value of object tile ratio

* Fix polygon append

* Fix polygon append

* Fix merge error, revert temp tox change

* Fix precommit, remove exp.sh

* Remove 20 points sampling

* Fix mypy issue

* Modify way to change subset type of _infer_model dataset & Add confidence threshold filter for openvino eval

* Remove breakpoint

* Update config param description, expose ellipse option

* Fix unit test

* Fix deploy patch bug (w,h) -> (h,w)

* Fix iseg intg test

* Revert tiling-ins-seg intg test

* Fix for det tiling intg test

---------

Signed-off-by: Songki Choi <songki.choi@intel.com>
Co-authored-by: jaegukhyun <jaeguk.hyun@intel.com>
Co-authored-by: Eugene Liu <eugene.liu@intel.com>
Co-authored-by: sungmanc <sungmanc@intel.com>
Co-authored-by: Songki Choi <songki.choi@intel.com>
@goodsong81
Release 1.2.1rc7
cc995f5 
Signed-off-by: Songki Choi <songki.choi@intel.com>
@eugene123tw @goodsong81
Do not skip full img tile classifier + Fix Sequencial Export Issue (#…
f1d1292 
…2174)

* add fixes

* quality checks

* fix mypy issue

* fix test

* fix bug

* fix sequencial export issue

* fix export bug

* add quality check

* fix nncf bug

* add fixes

* quality checks

* fix mypy issue

* fix test

* fix bug

* fix sequencial export issue

* fix export bug

* add quality check

* fix nncf bug

* fix nncf test
@goodsong81
Release 1.2.1
1dc0517 
Signed-off-by: Songki Choi <songki.choi@intel.com>
@goodsong81 goodsong81 added FIX defect fix RELEASE labels May 24, 2023
@github-actions github-actions bot added ALGO Any changes in OTX Algo Tasks implementation API Any changes in OTX API CLI Any changes in OTE CLI DOC Improvements or additions to documentation TEST Any changes in tests labels May 24, 2023
@goodsong81 goodsong81 added this to the 1.3.0 milestone May 24, 2023
goodsong81 added 2 commits May 24, 2023 23:57
@goodsong81
Add mem info log @ train start
5db5901
@goodsong81
Fix pre-commit
efb79c0 
Signed-off-by: Songki Choi <songki.choi@intel.com>
@github-actions github-actions bot removed the CLI Any changes in OTE CLI label May 24, 2023
@codecov-commenter
Copy link

codecov-commenter commented May 24, 2023 •
edited
Loading

Codecov Report

Patch coverage: 63.40% and project coverage change: -0.05 ⚠️

Comparison is base (34ff412) 80.21% compared to head (9894389) 80.16%.

Additional details and impacted files 
@@                Coverage Diff                 @@
##           releases/1.3.1    #2192      +/-   ##
==================================================
- Coverage           80.21%   80.16%   -0.05%     
==================================================
  Files                 466      467       +1     
  Lines               34900    35058     +158     
==================================================
+ Hits                27995    28105     +110     
- Misses               6905     6953      +48
Flag Coverage Δ
py310 80.16% <63.40%> (-0.05%) ⬇️
py38 80.15% <63.40%> (?)
py39 80.15% <63.40%> (-0.06%) ⬇️

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

Impacted Files Coverage Δ
...e_code/demo/demo_package/executors/asynchronous.py 0.00% <0.00%> (ø)
..._code/demo/demo_package/executors/sync_pipeline.py 0.00% <0.00%> (ø)
...le_code/demo/demo_package/executors/synchronous.py 0.00% <0.00%> (ø)
...secases/exportable_code/demo/demo_package/utils.py 0.00% <0.00%> (ø)
...models/detectors/custom_maskrcnn_tile_optimized.py 35.60% <10.00%> (-1.90%) ⬇️
.../algorithms/common/adapters/mmcv/tasks/exporter.py 82.22% <12.50%> (-15.08%) ⬇️
...lgorithms/detection/adapters/mmdet/nncf/builder.py 86.23% <14.28%> (-4.94%) ⬇️
...ortable_code/prediction_to_annotation_converter.py 72.76% <45.71%> (-1.55%) ⬇️
otx/algorithms/detection/task.py 75.36% <72.72%> (+0.43%) ⬆️
otx/algorithms/detection/adapters/openvino/task.py 74.30% <75.00%> (-0.21%) ⬇️
... and 11 more

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

@jaegukhyun
Copy link
Contributor

I thought this might go to 1.3.1. Am I wrong?

@goodsong81
Bump up 1.3.1
cf8e31e 
Signed-off-by: Songki Choi <songki.choi@intel.com>
@goodsong81 goodsong81 changed the base branch from releases/1.3.0 to releases/1.3.1 May 25, 2023 02:08
@goodsong81 goodsong81 changed the title Merge back 1.2.1 -> 1.3.0 Merge back 1.2.1 -> 1.3.1 May 25, 2023
goodsong81 and others added 2 commits May 26, 2023 22:59
@goodsong81
Merge remote-tracking branch 'upstream/releases/1.3.1' into songkich/…
884da95 
…merge-back-1.2.1-1.3.0
@eugene123tw @goodsong81
Add warning message to tiling parameter (#2193)
0b4fb45 
* add warning to tiling parameter

* add changelog and change requirement
@goodsong81 goodsong81 changed the title Merge back 1.2.1 -> 1.3.1 Merge back 1.2.2 -> 1.3.1 May 26, 2023
jaegukhyun and others added 5 commits May 30, 2023 17:30
@jaegukhyun
Change the way to pad for instance-segmentation
46af1ad
@goodsong81
Hotfix: use 0 confidence threshold when computing best threshold base…
b2c135e 
…d on F1

Signed-off-by: Songki Choi <songki.choi@intel.com>
@goodsong81
Fix pre-commit
61c8ecb 
Signed-off-by: Songki Choi <songki.choi@intel.com>
@goodsong81
Release 1.2.3
ac6c644 
Signed-off-by: Songki Choi <songki.choi@intel.com>
@goodsong81
Merge remote-tracking branch 'upstream/releases/1.3.1' into songkich/…
ebf621d 
…merge-back-1.2.1-1.3.0
@sovrasov
Copy link
Contributor

Please, consider adding #2212 as well

sovrasov and others added 2 commits June 1, 2023 01:56
@sovrasov @goodsong81
Fix possible bw issue in exportable code (#2212)
3646727 
* Fix backward compatibility of exportable code

* Update exportable code reqs

* Fix black
@goodsong81
Merge remote-tracking branch 'upstream/releases/1.3.1' into merge-bac…
ae71c94 
…k-1.2.1-1.3.0
@goodsong81 goodsong81 marked this pull request as ready for review June 1, 2023 05:57
@goodsong81 goodsong81 requested a review from a team as a code owner June 1, 2023 05:57
@goodsong81 goodsong81 marked this pull request as draft June 1, 2023 06:05
@goodsong81 goodsong81 changed the title Merge back 1.2.2 -> 1.3.1 Merge back 1.2.3 -> 1.3.1 Jun 1, 2023
@sungmanc @goodsong81
Fix ellipse load (#2214)
ed3f736 
* Fix ellipse load
@goodsong81 goodsong81 marked this pull request as ready for review June 1, 2023 12:01
@goodsong81 goodsong81 merged commit 2274cea into releases/1.3.1 Jun 1, 2023
@goodsong81 goodsong81 deleted the songkich/merge-back-1.2.1-1.3.0 branch June 1, 2023 12:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
ALGO Any changes in OTX Algo Tasks implementation API Any changes in OTX API DOC Improvements or additions to documentation FIX defect fix RELEASE TEST Any changes in tests
Projects
None yet
Milestone
1.3.0
Development

Successfully merging this pull request may close these issues.
6 participants
@goodsong81 @codecov-commenter @jaegukhyun @sovrasov @sungmanc @eugene123tw