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

Multiclass-jaccard: fix off-by-one issue when ignore_index = num_classes + 1 #1860

Merged
merged 6 commits into from
Jun 28, 2023
Merged

Multiclass-jaccard: fix off-by-one issue when ignore_index = num_classes + 1 #1860

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8178cac
fix off-by-one issue when ignore_index = num_classes + 1
martinmeinke Jun 27, 2023
2a6f73c
Merge branch 'master' into bugfix/multiclass_jaccard_ignore_off_by_1
SkafteNicki Jun 28, 2023
1704137
Merge branch 'master' into bugfix/multiclass_jaccard_ignore_off_by_1
mergify[bot] Jun 28, 2023
b0844eb
chlog
Borda Jun 28, 2023
d906e4e
Merge branch 'bugfix/multiclass_jaccard_ignore_off_by_1' of https://g…
Borda Jun 28, 2023
9ea35fb
Merge branch 'master' into bugfix/multiclass_jaccard_ignore_off_by_1
mergify[bot] Jun 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/torchmetrics/functional/classification/jaccard.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ def _jaccard_index_reduce(
if average == "binary":
return confmat[1, 1] / (confmat[0, 1] + confmat[1, 0] + confmat[1, 1])

ignore_index_cond = ignore_index is not None and 0 <= ignore_index <= confmat.shape[0]
ignore_index_cond = ignore_index is not None and 0 <= ignore_index < confmat.shape[0]
multilabel = confmat.ndim == 3
if multilabel:
num = confmat[:, 1, 1]
Expand Down
2 changes: 1 addition & 1 deletion tests/unittests/classification/test_jaccard.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ def _sklearn_jaccard_index_multiclass(preds, target, ignore_index=None, average=
preds = preds.flatten()
target = target.flatten()
target, preds = remove_ignore_index(target, preds, ignore_index)
if ignore_index is not None and 0 <= ignore_index <= NUM_CLASSES:
if ignore_index is not None and 0 <= ignore_index < NUM_CLASSES:
labels = [i for i in range(NUM_CLASSES) if i != ignore_index]
res = sk_jaccard_index(y_true=target, y_pred=preds, average=average, labels=labels)
return np.insert(res, ignore_index, 0.0) if average is None else res
Expand Down