Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
3484a59
Remove unnecessary code in BaseOutputHandler
sadra-barikbin Jan 22, 2022
2c8eed9
Merge branch 'pytorch:master' into master
sadra-barikbin Feb 3, 2022
ccf2364
Add ReduceLROnPlateauScheduler
sadra-barikbin Feb 3, 2022
7f7dae6
Fix indentation issue
sadra-barikbin Feb 3, 2022
896e482
Fix another indentation issue
sadra-barikbin Feb 3, 2022
cbc8d04
Fix PEP8 related issues
sadra-barikbin Feb 3, 2022
47b0622
Fix other PEP8 related issues
sadra-barikbin Feb 3, 2022
91d058e
Fix hopefully the last PEP8 related issue
sadra-barikbin Feb 3, 2022
9fd7d61
Fix hopefully the last PEP8 related issue
sadra-barikbin Feb 3, 2022
b7dc921
Merge branch 'pytorch:master' into master
sadra-barikbin Feb 3, 2022
e0644e3
Merge branch 'master' of https://github.com/sadra-barikbin/ignite
sadra-barikbin Feb 3, 2022
c95a2be
Remove ReduceLROnPlateau's specific params and add link to it
sadra-barikbin Feb 3, 2022
96554d0
Fix state_dict bug and add a test
sadra-barikbin Feb 5, 2022
145dabc
Merge branch 'pytorch:master' into master
sadra-barikbin Feb 9, 2022
0aee28a
Update docs
sadra-barikbin Feb 10, 2022
307803c
Merge branch 'master' into master
vfdev-5 Feb 14, 2022
0129572
Merge branch 'pytorch:master' into master
sadra-barikbin Feb 14, 2022
a17a5b2
Merge branch 'master' of https://github.com/pytorch/ignite
sadra-barikbin Feb 19, 2022
b3ea962
Add doctest and fix typo
sadra-barikbin Feb 20, 2022
e2e6831
Merge branch 'master' of https://github.com/pytorch/ignite
sadra-barikbin Feb 20, 2022
b88c9e1
Merge branch 'master' of https://github.com/pytorch/ignite
sadra-barikbin Feb 20, 2022
8d0ae3c
Merge branch 'master' of https://github.com/sadra-barikbin/ignite
sadra-barikbin Feb 20, 2022
408b271
Merge branch 'master' into master
vfdev-5 Feb 20, 2022
102ba25
Merge branch 'master' of https://github.com/pytorch/ignite
sadra-barikbin Feb 22, 2022
a5d9bab
Merge branch 'master' of https://github.com/pytorch/ignite
sadra-barikbin Mar 12, 2022
8ad4113
Merge branch 'master' of https://github.com/pytorch/ignite
sadra-barikbin Mar 22, 2022
f4ba590
Merge branch 'master' of https://github.com/pytorch/ignite
sadra-barikbin Mar 29, 2022
c594fd7
Merge branch 'master' of https://github.com/pytorch/ignite
sadra-barikbin Mar 29, 2022
52dbb5c
Merge branch 'master' of https://github.com/pytorch/ignite
sadra-barikbin Apr 10, 2022
93ce080
Merge branch 'master' of https://github.com/pytorch/ignite
sadra-barikbin Apr 13, 2022
68bada5
Merge branch 'master' of https://github.com/pytorch/ignite
sadra-barikbin Apr 14, 2022
ceb69a7
Merge branch 'pytorch:master' into master
sadra-barikbin Apr 15, 2022
0f0fca7
Merge branch 'master' of https://github.com/sadra-barikbin/ignite
sadra-barikbin Apr 17, 2022
b8715c6
Merge branch 'master' of https://github.com/pytorch/ignite
sadra-barikbin Apr 17, 2022
0902534
Merge branch 'master' of https://github.com/pytorch/ignite
sadra-barikbin Apr 28, 2022
9529889
Merge branch 'master' of https://github.com/pytorch/ignite
sadra-barikbin May 2, 2022
6f01712
Merge branch 'master' of https://github.com/pytorch/ignite
sadra-barikbin May 2, 2022
00af057
Merge branch 'master' of https://github.com/pytorch/ignite
sadra-barikbin May 4, 2022
2334564
fix bug to use on cuda
sadra-barikbin May 4, 2022
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
6 changes: 3 additions & 3 deletions ignite/metrics/ssim.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ def __init__(

@reinit__is_reduced
def reset(self) -> None:
self._sum_of_ssim = torch.tensor(0.0, device=self._device)
self._sum_of_ssim = torch.tensor(0.0, dtype=torch.float64, device=self._device)
self._num_examples = 0
self._kernel = self._gaussian_or_uniform_kernel(kernel_size=self.kernel_size, sigma=self.sigma)

Expand Down Expand Up @@ -180,7 +180,7 @@ def update(self, output: Sequence[torch.Tensor]) -> None:
self._num_examples += y.shape[0]

@sync_all_reduce("_sum_of_ssim", "_num_examples")
def compute(self) -> torch.Tensor:
def compute(self) -> float:
if self._num_examples == 0:
raise NotComputableError("SSIM must have at least one example before it can be computed.")
return self._sum_of_ssim / self._num_examples
return (self._sum_of_ssim / self._num_examples).item()
8 changes: 3 additions & 5 deletions tests/ignite/metrics/test_ssim.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,8 @@ def test_ssim(device, shape, kernel_size, gaussian, use_sample_covariance):
use_sample_covariance=use_sample_covariance,
)

assert isinstance(ignite_ssim, torch.Tensor)
assert ignite_ssim.dtype == torch.float64
assert ignite_ssim.device.type == torch.device(device).type
assert np.allclose(ignite_ssim.cpu().numpy(), skimg_ssim, atol=7e-5)
assert isinstance(ignite_ssim, float)
assert np.allclose(ignite_ssim, skimg_ssim, atol=7e-5)


def test_ssim_variable_batchsize():
Expand All @@ -125,7 +123,7 @@ def test_ssim_variable_batchsize():
ssim.reset()
ssim.update((torch.cat(y_preds), torch.cat(y_true)))
expected = ssim.compute()
assert torch.allclose(out, expected)
assert np.allclose(out, expected)


def _test_distrib_integration(device, tol=1e-4):
Expand Down