Skip to content

Commit 98e8275

Browse files
committed
remove apply same flag from test and remove redundant test, fix type annotations
Signed-off-by: Fabian Klopfer <[email protected]>
1 parent 99bc993 commit 98e8275

File tree

2 files changed

+4
-18
lines changed

2 files changed

+4
-18
lines changed

monai/transforms/utility/dictionary.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1478,7 +1478,7 @@ def __init__(self, keys: KeysCollection, name: str, allow_missing_keys: bool = F
14781478

14791479
self.trans = TorchIO(name, *args, **kwargs)
14801480

1481-
def __call__(self, data: Mapping[NdarrayOrTensor]) -> dict[NdarrayOrTensor]:
1481+
def __call__(self, data: Mapping[Hashable, NdarrayOrTensor]) -> dict[Hashable, NdarrayOrTensor]:
14821482
return self.trans(dict(data))
14831483

14841484

@@ -1508,7 +1508,7 @@ def __init__(self, keys: KeysCollection, name: str, allow_missing_keys: bool = F
15081508

15091509
self.trans = TorchIO(name, *args, **kwargs)
15101510

1511-
def __call__(self, data: Mapping[NdarrayOrTensor]) -> dict[NdarrayOrTensor]:
1511+
def __call__(self, data: Mapping[Hashable, NdarrayOrTensor]) -> dict[Hashable, NdarrayOrTensor]:
15121512
return self.trans(dict(data))
15131513

15141514

tests/test_torchiod.py

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import unittest
1515
from unittest import skipUnless
1616

17-
import numpy as np
1817
import torch
1918
from parameterized import parameterized
2019

@@ -33,13 +32,7 @@
3332
((TEST_TENSOR - TEST_TENSOR.min()) / (TEST_TENSOR.max() - TEST_TENSOR.min())) * 42,
3433
]
3534
]
36-
TEST2 = [
37-
[
38-
{"keys": ["img1", "img2"], "name": "RandomAffine", "apply_same_transform": True},
39-
{"img1": TEST_TENSOR, "img2": TEST_TENSOR},
40-
]
41-
]
42-
TEST3 = [[{"keys": ["img1", "img2"], "name": "RandomAffine"}, {"img1": TEST_TENSOR, "img2": TEST_TENSOR}]]
35+
TEST2 = [[{"keys": ["img1", "img2"], "name": "RandomAffine"}, {"img1": TEST_TENSOR, "img2": TEST_TENSOR}]]
4336

4437

4538
@skipUnless(has_torchio, "Requires torchio")
@@ -52,18 +45,11 @@ def test_value(self, input_param, input_data, expected_value):
5245
assert_allclose(result["img"], expected_value, atol=1e-4, rtol=1e-4, type_test=False)
5346

5447
@parameterized.expand(TEST2)
55-
def test_common_random_transform(self, input_param, input_data):
48+
def test_random_transform(self, input_param, input_data):
5649
set_determinism(seed=0)
5750
result = TorchIOd(**input_param)(input_data)
5851
assert_allclose(result["img1"], result["img2"], atol=1e-4, rtol=1e-4, type_test=False)
5952

60-
@parameterized.expand(TEST3)
61-
def test_different_random_transform(self, input_param, input_data):
62-
set_determinism(seed=0)
63-
result = TorchIOd(**input_param)(input_data)
64-
equal = np.allclose(result["img1"], result["img2"], atol=1e-4, rtol=1e-4)
65-
self.assertFalse(equal)
66-
6753

6854
if __name__ == "__main__":
6955
unittest.main()

0 commit comments

Comments
 (0)