Integrate new ignored loss in semantic segmentation #2055

supersoob · 2023-04-24T02:39:10Z

Summary

This PR includes new ignored cross entropy loss for semantic segmentation.

Optimization for segmentation

(DONE) sampler change
(DONE) MaskCompose remove
(DONE) repeated ckpt loading remove
(In review) Ignored loss function - this PR is handling this
(TODO) refactoring + unit test
(TODO) head aggregator change

Results

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

…kit#2011) Revert segmentation ignore=True

* prevent timeout during init phase

* Edit regression tests * Change the dataset root * Miss typo * Fix pre-commit

) Remove init import for Tiler to prevent OpenVINO import

* Add missing __init__.py * Change license

…oolkit#2023) * Add workaround solution * Fix minor * Remove str int

fix: change default to configdict Signed-off-by: Inhyuk Andy Cho <andy.inhyuk.jo@intel.com>

* Update cls, det datsets * Remove useless files * Change action datasets * Edit action dataset * change dir * Add xml files * Remove useless * Edite tets * Fix tests * Fix tests * Remove ptc * Remove * Fix precommit * Update dataset, fix cls bug * Remove useless dataset * Edit drop_last * Fix missed part * Change threshold values to unifying * bugfix: squeezing to 1 dimenetion * Change threshold for deployment * Fix multi-gpu issue, e2e tests * Decrease num_workers for tiling test and tiling processes * Revert num_workers for tests * Fix datsets --------- Co-authored-by: eunwoosh <eunwoo.shin@intel.com>

…emantic segmentation (openvinotoolkit#2020)

…_extensions into seg-ignore-loss-integration

eunwoosh · 2023-04-24T04:26:04Z

Could you change the PR as a draft if it's in progress?

supersoob · 2023-04-24T05:38:30Z

I'm ready to review. Let me add related unit tests in other PR.

jaegukhyun

Overall codes look good to me. Thank you for your effort. Could you check my comments. I want you to add type-hint for new classes.

otx/algorithms/segmentation/adapters/mmseg/models/heads/custom_fcn_head.py

otx/algorithms/segmentation/adapters/mmseg/models/losses/cross_entropy_loss_with_ignore.py

otx/algorithms/segmentation/adapters/mmseg/models/heads/custom_fcn_head.py

otx/algorithms/segmentation/adapters/mmseg/models/losses/cross_entropy_loss_with_ignore.py

sungmanc

Thanks a lot for your hard work and quick implmentation :)

goodsong81

LGTM! The test cases look enough for the sanity check. Thank you :)

…2055) * HOT-FIX: Revert segmentation model's ignore mode in CLI (openvinotoolkit#2011) Revert segmentation ignore=True * Improve tiling preprocess (openvinotoolkit#2013) * prevent timeout during init phase * Fix reg tests (openvinotoolkit#2008) * Edit regression tests * Change the dataset root * Miss typo * Fix pre-commit * Fix openvino import error due to Tiler init import (openvinotoolkit#2015) Remove init import for Tiler to prevent OpenVINO import * Bump up version to 1.2.0 (openvinotoolkit#2017) * Set the python version to "3.10" for code-scan workflow * Add missing __init__.py (openvinotoolkit#2019) * Add missing __init__.py * Change license * Release 1.2.0rc1 * Fix issue that str2bool not being applied in certain cases (openvinotoolkit#2023) * Add workaround solution * Fix minor * Remove str int * Fix default dict (openvinotoolkit#2025) fix: change default to configdict Signed-off-by: Inhyuk Andy Cho <andy.inhyuk.jo@intel.com> * Convert dummy datasets to toy datasets (openvinotoolkit#1988) * Update cls, det datsets * Remove useless files * Change action datasets * Edit action dataset * change dir * Add xml files * Remove useless * Edite tets * Fix tests * Fix tests * Remove ptc * Remove * Fix precommit * Update dataset, fix cls bug * Remove useless dataset * Edit drop_last * Fix missed part * Change threshold values to unifying * bugfix: squeezing to 1 dimenetion * Change threshold for deployment * Fix multi-gpu issue, e2e tests * Decrease num_workers for tiling test and tiling processes * Revert num_workers for tests * Fix datsets --------- Co-authored-by: eunwoosh <eunwoo.shin@intel.com> * Fix E2E tests (openvinotoolkit#2032) * Optimize data preprocessing time and enhance overall performance in semantic segmentation (openvinotoolkit#2020) * add unit test * exp * intg agg * implement ignore label * no update in model.py * ignore in label * only updated ignored loss * final * final * exp * refactor * refactor ignore loss * revert * default mode is ignore false * unit test revised * model update * revise detcon * fix error in intg test * test case revised * make run in semisl * add type hints * update docs * test case added --------- Signed-off-by: Inhyuk Andy Cho <andy.inhyuk.jo@intel.com> Co-authored-by: Harim Kang <harim.kang@intel.com> Co-authored-by: Eugene Liu <eugene.liu@intel.com> Co-authored-by: Sungman Cho <sungman.cho@intel.com> Co-authored-by: Songki Choi <songki.choi@intel.com> Co-authored-by: Yunchu Lee <yunchu.lee@intel.com> Co-authored-by: Jaeguk Hyun <jaeguk.hyun@intel.com> Co-authored-by: Inhyuk Cho <andy.inhyuk.jo@intel.com> Co-authored-by: eunwoosh <eunwoo.shin@intel.com> Co-authored-by: Lee, Soobee <soobeele@intel.com>

harimkang and others added 25 commits April 14, 2023 17:58

HOT-FIX: Revert segmentation model's ignore mode in CLI (openvinotool…

16e1c2e

…kit#2011) Revert segmentation ignore=True

Improve tiling preprocess (openvinotoolkit#2013)

22429d2

* prevent timeout during init phase

Fix reg tests (openvinotoolkit#2008)

cbce4e1

* Edit regression tests * Change the dataset root * Miss typo * Fix pre-commit

Fix openvino import error due to Tiler init import (openvinotoolkit#2015

823a66b

) Remove init import for Tiler to prevent OpenVINO import

Bump up version to 1.2.0 (openvinotoolkit#2017)

1a4f0fc

Set the python version to "3.10" for code-scan workflow

af9c460

Add missing __init__.py (openvinotoolkit#2019)

f275a63

* Add missing __init__.py * Change license

Release 1.2.0rc1

e22e52a

Fix issue that str2bool not being applied in certain cases (openvinot…

4000c7d

…oolkit#2023) * Add workaround solution * Fix minor * Remove str int

Fix default dict (openvinotoolkit#2025)

861157a

fix: change default to configdict Signed-off-by: Inhyuk Andy Cho <andy.inhyuk.jo@intel.com>

Fix E2E tests (openvinotoolkit#2032)

d2c1dfe

Optimize data preprocessing time and enhance overall performance in s…

d2acd51

…emantic segmentation (openvinotoolkit#2020)

add unit test

3598e58

exp

03458a4

intg agg

11b77ac

implement ignore label

c958db7

no update in model.py

fe5822d

ignore in label

e01dbd8

only updated ignored loss

6310535

final

2b80095

final

f5225b8

exp

9fd6b96

Merge branch 'develop' of https://github.com/openvinotoolkit/training…

adc65dd

…_extensions into seg-ignore-loss-integration

refactor

34f6652

github-actions bot added ALGO Any changes in OTX Algo Tasks implementation TEST Any changes in tests labels Apr 24, 2023

supersoob added the FEATURE New feature & functionality label Apr 24, 2023

supersoob added this to the 1.3.0 milestone Apr 24, 2023

supersoob added the REFACTOR label Apr 24, 2023

supersoob marked this pull request as ready for review April 24, 2023 04:18

supersoob requested a review from a team as a code owner April 24, 2023 04:18

supersoob added 3 commits April 24, 2023 13:44

unit test revised

d2715a6

model update

4f13e81

revise detcon

b3926ff

JihwanEom previously approved these changes Apr 24, 2023

View reviewed changes

supersoob added 2 commits April 24, 2023 14:45

fix error in intg test

04ba9ac

test case revised

f92bfbb

supersoob dismissed JihwanEom’s stale review via 04ba9ac April 24, 2023 06:08

make run in semisl

40bd088

jaegukhyun reviewed Apr 24, 2023

View reviewed changes

add type hints

6176d27

jaegukhyun previously approved these changes Apr 24, 2023

View reviewed changes

supersoob requested a review from JihwanEom April 24, 2023 07:24

sungmanc reviewed Apr 24, 2023

View reviewed changes

otx/algorithms/segmentation/adapters/mmseg/models/heads/custom_fcn_head.py Show resolved Hide resolved

otx/algorithms/segmentation/adapters/mmseg/models/losses/cross_entropy_loss_with_ignore.py Outdated Show resolved Hide resolved

update docs

ee0a27c

supersoob dismissed jaegukhyun’s stale review via ee0a27c April 24, 2023 08:44

jaegukhyun previously approved these changes Apr 24, 2023

View reviewed changes

sungmanc previously approved these changes Apr 24, 2023

View reviewed changes

test case added

14abdbd

supersoob dismissed stale reviews from sungmanc and jaegukhyun via 14abdbd April 25, 2023 02:52

goodsong81 approved these changes Apr 25, 2023

View reviewed changes

sungmanc approved these changes Apr 25, 2023

View reviewed changes

sungmanc merged commit 919ac9e into openvinotoolkit:develop Apr 25, 2023

supersoob mentioned this pull request Apr 25, 2023

Integrate new ignored loss in semantic segmentation #2065

Merged

8 tasks

cih9088 mentioned this pull request May 8, 2023

Clean up CustomStepLrUpdateHook #2111

Merged

8 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Integrate new ignored loss in semantic segmentation #2055

Integrate new ignored loss in semantic segmentation #2055

supersoob commented Apr 24, 2023 •

edited

Loading

eunwoosh commented Apr 24, 2023

supersoob commented Apr 24, 2023

jaegukhyun left a comment

sungmanc left a comment

goodsong81 left a comment

Integrate new ignored loss in semantic segmentation #2055

Integrate new ignored loss in semantic segmentation #2055

Conversation

supersoob commented Apr 24, 2023 • edited Loading

Summary

How to test

Checklist

License

eunwoosh commented Apr 24, 2023

supersoob commented Apr 24, 2023

jaegukhyun left a comment

Choose a reason for hiding this comment

sungmanc left a comment

Choose a reason for hiding this comment

goodsong81 left a comment

Choose a reason for hiding this comment

supersoob commented Apr 24, 2023 •

edited

Loading