[Fix] Fix binary segmentation when num_classes==1
#2016
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
Codecov ReportBase: 89.08% // Head: 89.10% // Increases project coverage by
Additional details and impacted files@@ Coverage Diff @@
## master #2016 +/- ##
==========================================
+ Coverage 89.08% 89.10% +0.02%
==========================================
Files 145 145
Lines 8691 8711 +20
Branches 1463 1470 +7
==========================================
+ Hits 7742 7762 +20
Misses 707 707
Partials 242 242
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. |
MeowZheng
reviewed
Sep 8, 2022
| @@ -245,7 +245,10 @@ def inference(self, img, img_meta, rescale): | |||
| seg_logit = self.slide_inference(img, img_meta, rescale) | |||
| else: | |||
| seg_logit = self.whole_inference(img, img_meta, rescale) | |||
| output = F.softmax(seg_logit, dim=1) | |||
| if self.num_classes == 1: | |||
There was a problem hiding this comment.
Suggested change
| if self.num_classes == 1: | |
| if self.out_channels == 1: |
It would be better to use out_channels to define the output channels or post-processes rather than num classes
MeowZheng
reviewed
Sep 8, 2022
| @@ -260,7 +263,11 @@ def inference(self, img, img_meta, rescale): | |||
| def simple_test(self, img, img_meta, rescale=True): | |||
| """Simple test with single image.""" | |||
| seg_logit = self.inference(img, img_meta, rescale) | |||
| seg_pred = seg_logit.argmax(dim=1) | |||
| if self.num_classes == 1: | |||
MeowZheng
reviewed
Sep 8, 2022
| @@ -283,7 +290,11 @@ def aug_test(self, imgs, img_metas, rescale=True): | |||
| cur_seg_logit = self.inference(imgs[i], img_metas[i], rescale) | |||
| seg_logit += cur_seg_logit | |||
| seg_logit /= len(imgs) | |||
| seg_pred = seg_logit.argmax(dim=1) | |||
| if self.num_classes == 1: | |||
MeowZheng
reviewed
Sep 8, 2022
Comment on lines
94
to
98
| if self.num_classes == 2 and self.out_channels is None: | ||
| warnings.warn('set out_channels to 1 to reduce the number of model\ | ||
| parameters') | ||
| elif self.num_classes == 2 and self.out_channels == 1: | ||
| self.num_classes = 1 |
There was a problem hiding this comment.
if self. out_channels is None:
out_channels = num_classes
if num_classes == 2:
warning.warn('For binary segmentation, we suggest using `out_channels = 1` to define the output channels of segmentor', and use `threshold` to convert seg_logist into a prediction applying a threshold
if out_channels == 1 and threshold is None:
threshold = 0.3
warning.warn('threshold is not defined for binary, and defaults to 0.3)
self.num_classes = num_classes
self.out_channels = out_channels
self.threshold=threshold
I suggest don't change num_classes value and tell user the default threshold is 0.3
MeowZheng
reviewed
Sep 8, 2022
Comment on lines
22
to
23
| threshold (float): Threshold for binary segmentation in the case of | ||
| `num_classes==1`. Default: 0.3. |
There was a problem hiding this comment.
threshold default to None.
MeowZheng
reviewed
Sep 8, 2022
Comment on lines
83
to
84
| self.out_channels = out_channels | ||
| self.threshold = threshold |
There was a problem hiding this comment.
Suggested change
| self.out_channels = out_channels | |
| self.threshold = threshold |
MeowZheng
reviewed
Sep 8, 2022
| @@ -56,6 +59,8 @@ def __init__(self, | |||
| channels, | |||
| *, | |||
| num_classes, | |||
| out_channels=None, | |||
| threshold=0.3, | |||
Closed
MeowZheng
reviewed
Sep 8, 2022
| if out_channels != num_classes and out_channels != 1: | ||
| raise ValueError( | ||
| 'out_channels should be equal to num_classes,' | ||
| 'except out_channels == 1 and num_classes == 2, but got' |
There was a problem hiding this comment.
Suggested change
| 'except out_channels == 1 and num_classes == 2, but got' | |
| 'except binary segmentation set out_channels == 1 and num_classes == 2, but got' |
MeowZheng
approved these changes
Sep 8, 2022
This was referenced Sep 28, 2022
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
Fix issue #1774
Modification
thresholdandout_channelsparameters todecode_headnum_classes==1BC-breaking (Optional)
None