Skip to content

Commit 19a9f05

Browse files
authored
Revert "1568 Enhance tests to use self random state (#1599)" (#1607)
This reverts commit 181f633. Signed-off-by: Wenqi Li <[email protected]>
1 parent 181f633 commit 19a9f05

File tree

3 files changed

+6
-30
lines changed

3 files changed

+6
-30
lines changed

tests/test_rand_rotate.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def test_correct_results(self, degrees, keep_size, mode, padding_mode, align_cor
5252
self.imt[0, 0], -np.rad2deg(angle), (0, 1), not keep_size, order=_order, mode=_mode, prefilter=False
5353
)
5454
expected = np.stack(expected).astype(np.float32)
55-
np.testing.assert_allclose(expected, rotated[0], rtol=1e-2, atol=1)
55+
np.testing.assert_allclose(expected, rotated[0])
5656

5757

5858
class TestRandRotate3D(NumpyImageTestCase3D):

tests/test_rand_rotated.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def test_correct_results(self, degrees, keep_size, mode, padding_mode, align_cor
5454
self.imt[0, 0], -np.rad2deg(angle), (0, 1), not keep_size, order=_order, mode=_mode, prefilter=False
5555
)
5656
expected = np.stack(expected).astype(np.float32)
57-
self.assertTrue(np.allclose(expected, rotated["img"][0], rtol=1e-2, atol=1))
57+
self.assertTrue(np.allclose(expected, rotated["img"][0]))
5858

5959

6060
class TestRandRotated3D(NumpyImageTestCase3D):

tests/utils.py

Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030

3131
from monai.config.deviceconfig import USE_COMPILED
3232
from monai.data import create_test_image_2d, create_test_image_3d
33-
from monai.transforms import Randomizable
3433
from monai.utils import ensure_tuple, optional_import, set_determinism
3534
from monai.utils.module import get_torch_version_tuple
3635

@@ -435,25 +434,14 @@ def _call_original_func(name, module, *args, **kwargs):
435434
return f(*args, **kwargs)
436435

437436

438-
class NumpyImageTestCase2D(unittest.TestCase, Randomizable):
437+
class NumpyImageTestCase2D(unittest.TestCase):
439438
im_shape = (128, 64)
440439
input_channels = 1
441440
output_channels = 4
442441
num_classes = 3
443442

444-
def randomize(self, data=None):
445-
return create_test_image_2d(
446-
width=self.im_shape[0],
447-
height=self.im_shape[1],
448-
num_objs=4,
449-
rad_max=20,
450-
noise_max=0,
451-
num_seg_classes=self.num_classes,
452-
random_state=self.R,
453-
)
454-
455443
def setUp(self):
456-
im, msk = self.randomize()
444+
im, msk = create_test_image_2d(self.im_shape[0], self.im_shape[1], 4, 20, 0, self.num_classes)
457445

458446
self.imt = im[None, None]
459447
self.seg1 = (msk[None, None] > 0).astype(np.float32)
@@ -468,26 +456,14 @@ def setUp(self):
468456
self.segn = torch.tensor(self.segn)
469457

470458

471-
class NumpyImageTestCase3D(unittest.TestCase, Randomizable):
459+
class NumpyImageTestCase3D(unittest.TestCase):
472460
im_shape = (64, 48, 80)
473461
input_channels = 1
474462
output_channels = 4
475463
num_classes = 3
476464

477-
def randomize(self, data=None):
478-
return create_test_image_3d(
479-
height=self.im_shape[0],
480-
width=self.im_shape[1],
481-
depth=self.im_shape[2],
482-
num_objs=4,
483-
rad_max=20,
484-
noise_max=0,
485-
num_seg_classes=self.num_classes,
486-
random_state=self.R,
487-
)
488-
489465
def setUp(self):
490-
im, msk = self.randomize()
466+
im, msk = create_test_image_3d(self.im_shape[0], self.im_shape[1], self.im_shape[2], 4, 20, 0, self.num_classes)
491467

492468
self.imt = im[None, None]
493469
self.seg1 = (msk[None, None] > 0).astype(np.float32)

0 commit comments

Comments
 (0)