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

Semantic segmentation #100

Merged
merged 131 commits into from Sep 28, 2021
Merged

Semantic segmentation #100

merged 131 commits into from Sep 28, 2021

Conversation

mtzelepi
Copy link
Collaborator

Semantic segmentation tool

@mtzelepi
Update target.py
00050e9
@mtzelepi
Add files via upload
8dc1cd3
@mtzelepi
Delete src/opendr/perception/semantic_segmentation/bisenet/algorithm/…
035ab97 
…__pycache__ directory
@mtzelepi
Delete src/opendr/perception/semantic_segmentation/bisenet/algorithm/…
af2f4c8 
…model/__pycache__ directory
@mtzelepi
Add files via upload
175b347
@mtzelepi
Add files via upload
76af295
@mtzelepi
Add files via upload
cb7401b
@mtzelepi
Update dependencies.ini
cf84d82
@mtzelepi
Update dependencies.ini
a1fd5f6
@mtzelepi
Add files via upload
a98927a
@mtzelepi
Add files via upload
2bcf8de
@mtzelepi
Add files via upload
db03e21
@mtzelepi
Delete src/opendr/perception/semantic_segmentation/bisenet/algorithm …
b272762 
…directory
@mtzelepi
Add files via upload
8151aa2
@mtzelepi
Update target.py
9b0f52c
@mtzelepi
Delete src/opendr/perception/semantic_segmentation/bisenet/datasets d…
5b07fbc 
…irectory
@mtzelepi
Add files via upload
8fd3503
@mtzelepi
Delete bisenet_learner.py
d60aaf2
@mtzelepi
Delete src/opendr/perception/semantic_segmentation/bisenet/temp direc…
696ea3d 
…tory
@mtzelepi
Add files via upload
80290e5
@mtzelepi
Add files via upload
552acc4
@mtzelepi
Update test_license.py
4ab8dbf
@mtzelepi
Add files via upload
36ae900
@mtzelepi mtzelepi added enhancement New feature or request test sources Run style checks test tools Test the toolkit methods labels Jun 28, 2021
stefaniapedrazzi
stefaniapedrazzi previously requested changes Sep 15, 2021
View reviewed changes
Copy link
Collaborator

@stefaniapedrazzi stefaniapedrazzi left a comment

Choose a reason for hiding this comment

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

Personally, I would better explain what are the modifications applied to the original BiSeNet algorithms.
But this PR is fine for me.

Can you please just update the documentation index and add a link to the new documentation page you will just add:
https://github.com/tasostefas/opendr_internal/blob/master/docs/reference/index.md

src/opendr/perception/semantic_segmentation/bisenet/algorithm/README.md Outdated Show resolved Hide resolved
src/opendr/perception/semantic_segmentation/bisenet/algorithm/README.md Outdated Show resolved Hide resolved
passalis
passalis reviewed Sep 24, 2021
View reviewed changes
Copy link
Collaborator

@passalis passalis left a comment

Choose a reason for hiding this comment

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

Thank you! Seems fine to me, I have two minor comments to be addressed.

src/opendr/perception/semantic_segmentation/bisenet/bisenet_learner.py Show resolved Hide resolved
src/opendr/perception/semantic_segmentation/bisenet/bisenet_learner.py Outdated Show resolved Hide resolved
passalis
passalis previously approved these changes Sep 24, 2021
View reviewed changes
Copy link
Collaborator

@passalis passalis left a comment

Choose a reason for hiding this comment

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

Thank you!

@mtzelepi
Copy link
Collaborator Author

I have addressed the comments. Could either @stefaniapedrazzi or @ad-daniel check this?

ad-daniel
ad-daniel requested changes Sep 27, 2021
View reviewed changes
Copy link
Collaborator

@ad-daniel ad-daniel left a comment

Choose a reason for hiding this comment

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

Only minor details from my side

docs/reference/semantic-segmentation.md Outdated Show resolved Hide resolved
docs/reference/semantic-segmentation.md Show resolved Hide resolved
docs/reference/semantic-segmentation.md Outdated Show resolved Hide resolved
src/opendr/perception/semantic_segmentation/bisenet/algorithm/model/build_BiSeNet.py Outdated Show resolved Hide resolved
src/opendr/perception/semantic_segmentation/bisenet/algorithm/model/build_BiSeNet.py Outdated
# build feature fusion module
self.feature_fusion_module = FeatureFusionModule(num_classes, 1024)
else:
print('Error: unspport context_path network \n')
Copy link
Collaborator

Choose a reason for hiding this comment

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

Indeed seems more appropriate to raise an error here. Please note that there is also a typo.

mtzelepi and others added 5 commits September 27, 2021 19:11
@mtzelepi @ad-daniel
Update docs/reference/semantic-segmentation.md
259377e 
Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>
@mtzelepi @ad-daniel
Update docs/reference/semantic-segmentation.md
68cb5c6 
Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>
@mtzelepi @ad-daniel
Update docs/reference/semantic-segmentation.md
77f764b 
Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>
@mtzelepi @ad-daniel
Update src/opendr/perception/semantic_segmentation/bisenet/algorithm/…
2ee1d56 
…model/build_BiSeNet.py

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>
@mtzelepi
Update build_BiSeNet.py
814fce8
@mtzelepi
Copy link
Collaborator Author

@ad-daniel Thank you! I addressed your comments. There is an error on skeleton_based_action_recognition test.

ad-daniel
ad-daniel approved these changes Sep 28, 2021
View reviewed changes
Copy link
Collaborator

@ad-daniel ad-daniel left a comment

Choose a reason for hiding this comment

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

No failures occurred in the tests when the skeleton PR was merged, so it would be odd for it to fail now. So I've re-run the test that was failing here and this time it passed. I think it was just a hiccup of the CI, it happens sometimes.

All good for me, thank you!

passalis
passalis approved these changes Sep 28, 2021
View reviewed changes
Copy link
Collaborator

@passalis passalis left a comment

Choose a reason for hiding this comment

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

Seems fine to me as well, thank you!

@passalis passalis dismissed stale reviews from stefaniapedrazzi and vniclas September 28, 2021 06:19

Comments seems to be addressed, 2 reviews acquired.

@mtzelepi mtzelepi merged commit d12a621 into master Sep 28, 2021
vniclas added a commit that referenced this pull request Oct 11, 2021
@vniclas @stefaniapedrazzi @ad-daniel
Add EfficientPS for panoptic segmentation (#96)
f612cbd 
* Initial commit efficientPS

* Add efficientNet

* Add mmdetection

* Add heatmap to OpenDR engine

* Format efficientNet with yapf

* Format mmdetection with yapf

* Fix flake8 issues in mmdetection

* Fix flake8 issues in efficientNet

* Update readme

* Add link to arxiv paper

* Undo fixing F401 and F403

* Add evaluation for Cityscapes

* Remove need to store json files

* Add training code [WIP]

* Sample usage for training, evaluation, and inference

* Adapt interfaces and add in-line documentation

* Convert raw Cityscapes dataset

* Add readme for datasets

* Add placeholder for downloading trained model weights

* Add KITTI dataset

* Format with yapf

* Fix pre-checks in KITTI dataset

* Add license files of original repos

* Move files

* Modify paths in example usage

* Add documentation for heatmap class

* Add documentation for EfficientPsLearner class

* Add unit tests

* Point download URLs to OpenDR server

* Change image readers from mmcv to cv2 in example usage and test

* Update dependencies

* Fix PEP8 errors and warnings

* Format with clang

* Do not run tests on 3rd part code: fixed everthing except license and PEP8 F401, F403

* Squashed commit of the following:

commit 1930c74
Merge: dc37a2d b5b8465
Author: jovaroo <joonas.roos@tuni.fi>
Date:   Tue Jul 13 19:42:35 2021 +0300

    Merge pull request #88 from tasostefas/fix-edgespeechnets-tests

    Fix EdgeSpeechNets target class and test

commit b5b8465
Merge: 9c98e52 dc37a2d
Author: jovaroo <joonas.roos@tuni.fi>
Date:   Tue Jul 13 18:21:43 2021 +0300

    Merge branch 'master' into fix-edgespeechnets-tests

commit dc37a2d
Merge: 24bc9c8 bb59879
Author: Nikolaos Passalis <passalis@users.noreply.github.com>
Date:   Tue Jul 13 18:15:20 2021 +0300

    Merge pull request #97 from tasostefas/readme_update

    Development notice in README.md

commit bb59879
Merge: 4185a2a 24bc9c8
Author: Nikolaos Passalis <passalis@users.noreply.github.com>
Date:   Mon Jul 12 23:46:16 2021 +0300

    Merge branch 'master' into readme_update

commit 24bc9c8
Merge: 12bd0b0 dbbc51c
Author: Lukas Hedegaard <lukasxhedegaard@gmail.com>
Date:   Mon Jul 12 21:14:53 2021 +0200

    Merge pull request #105 from tasostefas/fix-103

    Fix issue 103

commit 4185a2a
Merge: c54c9a8 12bd0b0
Author: Stefania Pedrazzi <stefaniapedrazzi@users.noreply.github.com>
Date:   Mon Jul 12 16:54:42 2021 +0200

    Merge branch 'master' into readme_update

commit dbbc51c
Author: LukasHedegaard <lh@eng.au.dk>
Date:   Sun Jul 11 19:39:58 2021 +0200

    Loosen confidence in test_(co)x3d_learner

commit 12bd0b0
Merge: 20e2e26 852b061
Author: Lukas Hedegaard <lukasxhedegaard@gmail.com>
Date:   Sun Jul 11 18:56:36 2021 +0200

    Merge pull request #85 from tasostefas/demos-activity-recognition

    Add online activity recognition demo

commit 852b061
Merge: b1da38d 20e2e26
Author: Lukas Hedegaard <lukasxhedegaard@gmail.com>
Date:   Fri Jul 2 17:01:34 2021 +0200

    Merge branch 'master' into demos-activity-recognition

commit b1da38d
Merge: f54588b 55b60c4
Author: Lukas Hedegaard <lukasxhedegaard@gmail.com>
Date:   Wed Jun 30 17:12:06 2021 +0200

    Merge branch 'master' into demos-activity-recognition

commit c54c9a8
Author: Nikolaos Passalis <passalis@users.noreply.github.com>
Date:   Wed Jun 30 08:45:04 2021 +0300

    Update README.md

commit 4ae886b
Author: Nikolaos Passalis <passalis@users.noreply.github.com>
Date:   Wed Jun 30 08:44:41 2021 +0300

    Fix broken url

    Co-authored-by: Stefania Pedrazzi <stefaniapedrazzi@users.noreply.github.com>

commit f54588b
Merge: af12c3e 94f6bc0
Author: Lukas Hedegaard <lukasxhedegaard@gmail.com>
Date:   Tue Jun 29 14:10:21 2021 +0200

    Merge branch 'master' into demos-activity-recognition

commit af12c3e
Author: LukasHedegaard <lh@eng.au.dk>
Date:   Tue Jun 29 14:08:20 2021 +0200

    Delete obsolete comments

commit 21d17b7
Author: LukasHedegaard <lh@eng.au.dk>
Date:   Tue Jun 29 14:07:32 2021 +0200

    Delete redundant Licence file

commit 9c98e52
Merge: 898c3f6 94f6bc0
Author: jovaroo <joonas.roos@hotmail.com>
Date:   Mon Jun 28 14:49:34 2021 +0300

    Merge branch 'master' into fix-edgespeechnets-tests

commit 898c3f6
Author: Joonas Roos <joonas.roos@hotmail.com>
Date:   Mon Jun 28 12:33:33 2021 +0300

    Remove unused documentation

commit 327e944
Author: Nikolaos Passalis <passalis@users.noreply.github.com>
Date:   Sun Jun 27 18:13:28 2021 +0300

    Update README.md

commit 1d0b475
Author: Nikolaos Passalis <passalis@users.noreply.github.com>
Date:   Sun Jun 27 18:09:08 2021 +0300

    Update README.md

commit 20c847f
Merge: 0661e11 d38045d
Author: Lukas Hedegaard <lukasxhedegaard@gmail.com>
Date:   Wed Jun 23 14:02:06 2021 +0200

    Merge branch 'master' into demos-activity-recognition

commit 0661e11
Author: LukasHedegaard <lh@eng.au.dk>
Date:   Tue Jun 8 13:32:44 2021 +0200

    Add code for online activity recognition demo

commit 71ac6f0
Author: Joonas Roos <joonas.roos@hotmail.com>
Date:   Mon Jun 7 15:21:05 2021 +0300

    Remove unused SpeechCommand class

commit 84cb8cf
Author: Joonas Roos <joonas.roos@hotmail.com>
Date:   Mon Jun 7 15:20:20 2021 +0300

    Change target class to Category

commit 59ef9e3
Author: Joonas Roos <joonas.roos@hotmail.com>
Date:   Mon Jun 7 15:18:17 2021 +0300

    Disable Deprecationwarning printing

* Revert "Squashed commit of the following:"

This reverts commit 8bfad6a.

* Manually merge master

* Replace algorithm with submodule

* Adjust dependencies

* Correct previous faulty merge with master

* Checkout submodules during workflow

* Skip style check in submodule

* Skip license test

* Change path to local dependencies

* Change path to local dependencies

* Fix parsing of dependency files when passing pip flags

* Expand environment variables when parsing dependency files and explicitly close file after writing

* Allow flags when installing pip dependencies

* Allow flags when installing pip dependencies

* Include updates from PR #98

* Install CUDA in CI

* Fix syntax error

* Install CUDA in CI

* Install CUDA in CI

* Install CUDA via marketplace action

* Install Pytorch CPU version in CI

* Disable object_tracking_2d tests

* Remove editable installation

* Force cuda compilation for mmdet

* Merge heatmap implementation of PR #100

* Undo changes to installation process to merge with master

* Add pytorch as python prerequisite

* Revert unnecessary changes

* Add visualization method

* Skip installation of dependencies if not GPU is available

* Add visualization usage to readme

* Fix PEP8 errors

* Add doc file to index

* Fix minor bugs

* Remove image with filename

* Change save/load to OpenDR specifications

* Adjust tests to previous changes

* Merge branch 'master' into panoptic-segmentation

* Revert "Adjust tests to previous changes"

This reverts commit 6887e1b.

* Revert "Merge branch 'master' into panoptic-segmentation"

This reverts commit 34924c9.

* Adjust tests to previous changes

* Fix PEP8 errors

* Fix type error

* Include minor improvements

* Return training statistics

* Expose learner and dataset classes (issue #132)

* Fix PEP8 errors

* Ignore PEP8 F841 in demo

* Correct default paths

* Add year to license header

* Address various PR comments

* Add default parameters to documentation

Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>

* Reference datasets' readme in documentation

Co-authored-by: Stefania Pedrazzi <stefaniapedrazzi@users.noreply.github.com>
Co-authored-by: Stefania Pedrazzi <stefania.pedrazzi@cyberbotics.com>
Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com>
@stefaniapedrazzi stefaniapedrazzi deleted the semantic_segmentation branch June 6, 2023 08:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@passalis passalis passalis approved these changes

@ad-daniel ad-daniel ad-daniel approved these changes

@stefaniapedrazzi stefaniapedrazzi stefaniapedrazzi left review comments

@vniclas vniclas vniclas left review comments

@lukicdarkoo lukicdarkoo Awaiting requested review from lukicdarkoo

@omichel omichel Awaiting requested review from omichel omichel is a code owner

Assignees
No one assigned
Labels
enhancement New feature or request test sources Run style checks test tools Test the toolkit methods
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@mtzelepi @vniclas @stefaniapedrazzi @passalis @ad-daniel