Backward merge #2535 from 1.x into dev-1.x
#2546
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Merge MMSegmentation 1.x development branch dev-1.x to main branch 1.x for v1.0.0rc2
## Motivation A few functions in the following files: - `decode_head.py` - `encoder_decoder.py` - `cascade_encoder_decoder.py` have a return type annotation as `List[Tensor]` whereas their actual return type is `Tensor`. This can be seen by following the trace of what each functions return internally, which eventually leads to `seg_logits: Tensor`. This type annotation is misleading and confusing when a user is trying to read and understand the code. ## Modification 1. Fix type annotations from `List[Tensor]` to `Tensor`. 2. Make a return type more specific from `list` to `SampleList`. ## Checklist - [x] Pre-commit or other linting tools are used to fix the potential lint issues. - _I've fixed all linting/pre-commit errors._ - [x] The modification is covered by complete unit tests. If not, please add more unit test to ensure the correctness. - _This involves only changing type annotations, so there is no need for tests._ - [x] If the modification has potential influence on downstream projects, this PR should be tested with downstream projects, like MMDet or MMDet3D. - _I don't think this change affects MMDet or MMDet3D._ - [ ] The documentation has been modified accordingly, like docstring or example tutorials. - _This change fixes existing type annotations, so it may require a change in the documentation/docstring that I don't have access to._
Codecov ReportBase: 83.33% // Head: 83.32% // Decreases project coverage by
Additional details and impacted files@@ Coverage Diff @@
## dev-1.x #2546 +/- ##
===========================================
- Coverage 83.33% 83.32% -0.02%
===========================================
Files 143 145 +2
Lines 8127 8510 +383
Branches 1211 1274 +63
===========================================
+ Hits 6773 7091 +318
- Misses 1165 1208 +43
- Partials 189 211 +22
Flags with carried forward coverage won't be shown. Click here to find out more.
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. ☔ View full report at Codecov. |
|
Thanks a lot! I should have reviewed the pr more carefully |
MeowZheng
approved these changes
Feb 1, 2023
aravind-h-v
pushed a commit
to aravind-h-v/mmsegmentation
that referenced
this pull request
Mar 27, 2023
nahidnazifi87
pushed a commit
to nahidnazifi87/mmsegmentation_playground
that referenced
this pull request
Apr 5, 2024
…2546) ## Motivation This is essentially open-mmlab#2535 that I had intended to submit to the `dev-1.x` branch but accidentally submitted it directly to the `1.x` branch (apologies!). This also got approved possibly because the core devs also didn't realize this. The problem is that now `1.x` and `dev-1.x` are out of sync -- the changes introduced by open-mmlab#2535 will never be reflected in `dev-1.x`. ## Modification I'm proposing this "backward-merge" so that `1.x` and `dev-1.x` can be in sync again. If you look at "files changed", they are exactly the changes introduced by open-mmlab#2535. Co-authored-by: MeowZheng <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation
This is essentially #2535 that I had intended to submit to the
dev-1.xbranch but accidentally submitted it directly to the1.xbranch (apologies!). This also got approved possibly because the core devs also didn't realize this.The problem is that now
1.xanddev-1.xare out of sync -- the changes introduced by #2535 will never be reflected indev-1.x.Modification
I'm proposing this "backward-merge" so that
1.xanddev-1.xcan be in sync again. If you look at "files changed", they are exactly the changes introduced by #2535.