diff --git a/tests/test_decollate.py b/tests/test_decollate.py index 24a34482b5..4ed8de6bbb 100644 --- a/tests/test_decollate.py +++ b/tests/test_decollate.py @@ -15,7 +15,6 @@ import numpy as np import torch -from parameterized import parameterized from monai.data import CacheDataset, DataLoader, create_test_image_2d from monai.data.utils import decollate_batch @@ -27,17 +26,6 @@ _, has_nib = optional_import("nibabel") -IM_2D = create_test_image_2d(100, 101)[0] -DATA_2D = {"image": make_nifti_image(IM_2D) if has_nib else IM_2D} - -TESTS = [] -TESTS.append( - ( - "2D", - [DATA_2D for _ in range(6)], - ) -) - class TestDeCollate(unittest.TestCase): def setUp(self) -> None: @@ -67,8 +55,11 @@ def check_match(self, in1, in2): else: raise RuntimeError(f"Not sure how to compare types. type(in1): {type(in1)}, type(in2): {type(in2)}") - @parameterized.expand(TESTS) - def test_decollation(self, _, data, batch_size=2, num_workers=2): + def test_decollation(self, batch_size=2, num_workers=2): + + im = create_test_image_2d(100, 101)[0] + data = [{"image": make_nifti_image(im) if has_nib else im} for _ in range(6)] + transforms = Compose( [ AddChanneld("image"), @@ -82,7 +73,7 @@ def test_decollation(self, _, data, batch_size=2, num_workers=2): transforms = Compose([LoadImaged("image"), transforms]) dataset = CacheDataset(data, transforms, progress=False) - loader = DataLoader(dataset, batch_size=batch_size, shuffle=True, num_workers=num_workers) + loader = DataLoader(dataset, batch_size=batch_size, shuffle=False, num_workers=num_workers) for b, batch_data in enumerate(loader): decollated_1 = decollate_batch(batch_data) diff --git a/tests/test_thread_buffer.py b/tests/test_thread_buffer.py index 07e5a779ca..d139b44c85 100644 --- a/tests/test_thread_buffer.py +++ b/tests/test_thread_buffer.py @@ -9,6 +9,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import sys import time import unittest @@ -57,11 +58,13 @@ def test_time(self): time.sleep(0.5) # while "computation" is happening the next batch is being generated, saving 0.4 s buffered_time = pc.total_time - - self.assertTrue( - buffered_time < unbuffered_time, - f"Buffered time {buffered_time} should be less than unbuffered time {unbuffered_time}", - ) + if sys.platform == "darwin": # skip macOS measure + print(f"darwin: Buffered time {buffered_time} vs unbuffered time {unbuffered_time}") + else: + self.assertTrue( + buffered_time < unbuffered_time, + f"Buffered time {buffered_time} should be less than unbuffered time {unbuffered_time}", + ) if __name__ == "__main__":