Skip to content

Commit 03a8372

Browse files
authored
[DLMED] update int method (#2696)
Signed-off-by: Nic Ma <[email protected]>
1 parent f6ad4ba commit 03a8372

File tree

3 files changed

+13
-9
lines changed

3 files changed

+13
-9
lines changed

monai/transforms/spatial/array.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
"""
1515

1616
import warnings
17-
from math import ceil
1817
from typing import Any, List, Optional, Sequence, Tuple, Union
1918

2019
import numpy as np
@@ -403,7 +402,7 @@ def __call__(
403402
if not isinstance(self.spatial_size, int):
404403
raise ValueError("spatial_size must be an int number if size_mode is 'longest'.")
405404
scale = self.spatial_size / max(img_size)
406-
spatial_size_ = tuple(ceil(s * scale) for s in img_size)
405+
spatial_size_ = tuple(int(round(s * scale)) for s in img_size)
407406
resized = torch.nn.functional.interpolate( # type: ignore
408407
input=torch.as_tensor(np.ascontiguousarray(img), dtype=torch.float).unsqueeze(0),
409408
size=spatial_size_,

tests/test_resize.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
from monai.transforms import Resize
1919
from tests.utils import NumpyImageTestCase2D
2020

21-
TEST_CASE_0 = [{"spatial_size": 15}, (6, 11, 15)]
21+
TEST_CASE_0 = [{"spatial_size": 15}, (6, 10, 15)]
2222

23-
TEST_CASE_1 = [{"spatial_size": 15, "mode": "area"}, (6, 11, 15)]
23+
TEST_CASE_1 = [{"spatial_size": 15, "mode": "area"}, (6, 10, 15)]
2424

25-
TEST_CASE_2 = [{"spatial_size": 6, "mode": "trilinear", "align_corners": True}, (3, 5, 6)]
25+
TEST_CASE_2 = [{"spatial_size": 6, "mode": "trilinear", "align_corners": True}, (2, 4, 6)]
2626

2727

2828
class TestResize(NumpyImageTestCase2D):
@@ -63,6 +63,11 @@ def test_longest_shape(self, input_param, expected_shape):
6363
result = Resize(**input_param)(input_data)
6464
np.testing.assert_allclose(result.shape[1:], expected_shape)
6565

66+
def test_longest_infinite_decimals(self):
67+
resize = Resize(spatial_size=1008, size_mode="longest", mode="bilinear", align_corners=False)
68+
ret = resize(np.random.randint(0, 2, size=[1, 2544, 3032]))
69+
self.assertTupleEqual(ret.shape, (1, 846, 1008))
70+
6671

6772
if __name__ == "__main__":
6873
unittest.main()

tests/test_resized.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818
from monai.transforms import Resized
1919
from tests.utils import NumpyImageTestCase2D
2020

21-
TEST_CASE_0 = [{"keys": "img", "spatial_size": 15}, (6, 11, 15)]
21+
TEST_CASE_0 = [{"keys": "img", "spatial_size": 15}, (6, 10, 15)]
2222

23-
TEST_CASE_1 = [{"keys": "img", "spatial_size": 15, "mode": "area"}, (6, 11, 15)]
23+
TEST_CASE_1 = [{"keys": "img", "spatial_size": 15, "mode": "area"}, (6, 10, 15)]
2424

25-
TEST_CASE_2 = [{"keys": "img", "spatial_size": 6, "mode": "trilinear", "align_corners": True}, (3, 5, 6)]
25+
TEST_CASE_2 = [{"keys": "img", "spatial_size": 6, "mode": "trilinear", "align_corners": True}, (2, 4, 6)]
2626

2727
TEST_CASE_3 = [
2828
{"keys": ["img", "label"], "spatial_size": 6, "mode": ["trilinear", "nearest"], "align_corners": [True, None]},
29-
(3, 5, 6),
29+
(2, 4, 6),
3030
]
3131

3232

0 commit comments

Comments
 (0)