Skip to content

improve decollate test for set_determinism #1736

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rijobro merged 3 commits into from
Mar 10, 2021
Merged

improve decollate test for set_determinism #1736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6437c13
improve decollate test for set_determinism
rijobro Mar 10, 2021
31c1ef6
undo change
rijobro Mar 10, 2021
452ccfa
fixes https://github.com/Project-MONAI/MONAI/pull/1736/checks\?check_…
wyli Mar 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 6 additions & 15 deletions tests/test_decollate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down Expand Up @@ -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"),
Expand All @@ -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)
Expand Down
13 changes: 8 additions & 5 deletions tests/test_thread_buffer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

import sys
import time
import unittest

Expand Down Expand Up @@ -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__":
Expand Down