From ade1fec73819030473c6c8efe993a5cf026b745f Mon Sep 17 00:00:00 2001 From: puhuk Date: Mon, 5 Sep 2022 14:58:59 +0900 Subject: [PATCH 1/3] Update test__base.py --- tests/ignite/contrib/metrics/regression/test__base.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/ignite/contrib/metrics/regression/test__base.py b/tests/ignite/contrib/metrics/regression/test__base.py index ba94da6fd63b..d469ac374191 100644 --- a/tests/ignite/contrib/metrics/regression/test__base.py +++ b/tests/ignite/contrib/metrics/regression/test__base.py @@ -54,11 +54,11 @@ def test_torch_median_numpy(size, device: Optional[str] = None): @pytest.mark.parametrize("size", [101, (31, 3)]) def test_torch_median_quantile(size, device: Optional[str] = None): data = torch.rand(size).to(device) - assert _torch_median(data) == torch.quantile(data, 0.5, interpolation="midpoint") + assert _torch_median(data) == torch.quantile(data, 0.5, interpolation="midpoint").item() size = 101 data = torch.rand(size=(size,)) - assert _torch_median(data) == torch.median(data) + assert _torch_median(data) == torch.median(data).item() @pytest.mark.tpu From c6744d8eccdf1edf2788eb5680d2bf2e7ecba8f4 Mon Sep 17 00:00:00 2001 From: puhuk Date: Mon, 5 Sep 2022 18:23:15 +0900 Subject: [PATCH 2/3] Update test__base.py --- .../contrib/metrics/regression/test__base.py | 30 +------------------ 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/tests/ignite/contrib/metrics/regression/test__base.py b/tests/ignite/contrib/metrics/regression/test__base.py index d469ac374191..3258407710ae 100644 --- a/tests/ignite/contrib/metrics/regression/test__base.py +++ b/tests/ignite/contrib/metrics/regression/test__base.py @@ -4,6 +4,7 @@ import pytest import torch +from packaging.version import Version import ignite.distributed as idist @@ -51,16 +52,6 @@ def test_torch_median_numpy(size, device: Optional[str] = None): assert _torch_median(data) == np.median(data.cpu().numpy()) -@pytest.mark.parametrize("size", [101, (31, 3)]) -def test_torch_median_quantile(size, device: Optional[str] = None): - data = torch.rand(size).to(device) - assert _torch_median(data) == torch.quantile(data, 0.5, interpolation="midpoint").item() - - size = 101 - data = torch.rand(size=(size,)) - assert _torch_median(data) == torch.median(data).item() - - @pytest.mark.tpu @pytest.mark.parametrize("size", [100, 101, (30, 3), (31, 3)]) @pytest.mark.skipif(not idist.has_xla_support, reason="Skip if no PyTorch XLA package") @@ -78,22 +69,3 @@ def test_on_even_size_gpu(size): @pytest.mark.parametrize("size", [100, 101, (30, 3), (31, 3)]) def test_create_even_size_cpu(size): test_torch_median_numpy(size, device="cpu") - - -@pytest.mark.tpu -@pytest.mark.parametrize("size", [101, (31, 3)]) -@pytest.mark.skipif(not idist.has_xla_support, reason="Skip if no PyTorch XLA package") -def test_on_odd_size_xla(size): - device = "xla" - test_torch_median_quantile(size, device=device) - - -@pytest.mark.parametrize("size", [101, (31, 3)]) -@pytest.mark.skipif(not torch.cuda.is_available(), reason="Skip if no GPU") -def test_on_odd_size_gpu(size): - test_torch_median_quantile(size, device="cuda") - - -@pytest.mark.parametrize("size", [101, (31, 3)]) -def test_create_odd_size_cpu(size): - test_torch_median_quantile(size, device="cpu") From 65975f4dc2abe5b4356c33d53bf5ebac0dffda66 Mon Sep 17 00:00:00 2001 From: puhuk Date: Mon, 5 Sep 2022 18:26:12 +0900 Subject: [PATCH 3/3] Update test__base.py --- tests/ignite/contrib/metrics/regression/test__base.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/ignite/contrib/metrics/regression/test__base.py b/tests/ignite/contrib/metrics/regression/test__base.py index 3258407710ae..ca7c71a79e6d 100644 --- a/tests/ignite/contrib/metrics/regression/test__base.py +++ b/tests/ignite/contrib/metrics/regression/test__base.py @@ -4,7 +4,6 @@ import pytest import torch -from packaging.version import Version import ignite.distributed as idist