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

Fixing detection saliency map for one class case #2368

Merged
merged 3 commits into from
Jul 17, 2023
Merged

Fixing detection saliency map for one class case #2368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f09f1fd
fix softmax
negvet Jul 17, 2023
8be71f8
Merge branch 'releases/1.4.0' into et/det_sal_map_norm_fix
negvet Jul 17, 2023
9b4d8a1
fix validity tests
negvet Jul 13, 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/otx/algorithms/detection/adapters/mmdet/hooks/det_class_probability_map_hook.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ def func(

# Don't use softmax for tiles in tiling detection, if the tile doesn't contain objects,
# it would highlight one of the class maps as a background class
if self.use_cls_softmax:
if self.use_cls_softmax and self._num_cls_out_channels > 1:
cls_scores = [torch.softmax(t, dim=1) for t in cls_scores]

batch_size, _, height, width = cls_scores[-1].size()
Expand Down
4 changes: 3 additions & 1 deletion tests/unit/algorithms/classification/test_xai_classification_validity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,6 @@ def test_saliency_map_cls(self, template):
assert len(saliency_maps) == 2
assert saliency_maps[0].ndim == 3
assert saliency_maps[0].shape == (1000, 7, 7)
assert np.all(np.abs(saliency_maps[0][0][0] - self.ref_saliency_vals_cls[template.name]) <= 1)
actual_sal_vals = saliency_maps[0][0][0].astype(np.int8)
ref_sal_vals = self.ref_saliency_vals_cls[template.name].astype(np.int8)
assert np.all(np.abs(actual_sal_vals - ref_sal_vals) <= 1)
4 changes: 3 additions & 1 deletion tests/unit/algorithms/detection/test_xai_detection_validity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,9 @@ def test_saliency_map_det(self, template):
assert len(saliency_maps) == 2
assert saliency_maps[0].ndim == 3
assert saliency_maps[0].shape == self.ref_saliency_shapes[template.name]
assert np.all(np.abs(saliency_maps[0][0][0] - self.ref_saliency_vals_det[template.name]) <= 1)
actual_sal_vals = saliency_maps[0][0][0].astype(np.int8)
ref_sal_vals = self.ref_saliency_vals_det[template.name].astype(np.int8)
assert np.all(np.abs(actual_sal_vals - ref_sal_vals) <= 1)

@e2e_pytest_unit
@pytest.mark.parametrize("template", templates_det, ids=templates_det_ids)
Expand Down