From 64686c181cb90668191a38f6c90e2d5a3c1ae700 Mon Sep 17 00:00:00 2001 From: Nic Ma Date: Thu, 12 Aug 2021 00:28:55 +0800 Subject: [PATCH 1/3] [DLMED] fix continuously run Signed-off-by: Nic Ma --- monai/data/thread_buffer.py | 7 +++---- tests/test_thread_buffer.py | 2 ++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/monai/data/thread_buffer.py b/monai/data/thread_buffer.py index 8ea71e3555..2b799b0a69 100644 --- a/monai/data/thread_buffer.py +++ b/monai/data/thread_buffer.py @@ -87,8 +87,7 @@ class ThreadDataLoader(DataLoader): def __init__(self, dataset: Dataset, num_workers: int = 0, **kwargs): super().__init__(dataset, num_workers, **kwargs) - # ThreadBuffer will use the inherited __iter__ instead of the one defined below - self.buffer = ThreadBuffer(super().__iter__()) - def __iter__(self): - yield from self.buffer + # ThreadBuffer will use the inherited __iter__ instead of the one defined below + buffer = ThreadBuffer(super().__iter__()) + yield from buffer diff --git a/tests/test_thread_buffer.py b/tests/test_thread_buffer.py index 1b3ebb910d..d5eeb1f6ed 100644 --- a/tests/test_thread_buffer.py +++ b/tests/test_thread_buffer.py @@ -48,6 +48,8 @@ def test_dataloader(self): for d in dataloader: self.assertEqual(d["image"][0], "spleen_19.nii.gz") self.assertEqual(d["image"][1], "spleen_31.nii.gz") + + for d in dataloader: self.assertEqual(d["label"][0], "spleen_label_19.nii.gz") self.assertEqual(d["label"][1], "spleen_label_31.nii.gz") From bf3f43180ea5db3091050ce9c51bf52234e83bb3 Mon Sep 17 00:00:00 2001 From: monai-bot Date: Wed, 11 Aug 2021 16:34:38 +0000 Subject: [PATCH 2/3] [MONAI] python code formatting Signed-off-by: monai-bot --- tests/test_thread_buffer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_thread_buffer.py b/tests/test_thread_buffer.py index d5eeb1f6ed..507b6909be 100644 --- a/tests/test_thread_buffer.py +++ b/tests/test_thread_buffer.py @@ -48,7 +48,7 @@ def test_dataloader(self): for d in dataloader: self.assertEqual(d["image"][0], "spleen_19.nii.gz") self.assertEqual(d["image"][1], "spleen_31.nii.gz") - + for d in dataloader: self.assertEqual(d["label"][0], "spleen_label_19.nii.gz") self.assertEqual(d["label"][1], "spleen_label_31.nii.gz") From ce7bf090ed9bef26636dff926fb526266d376b60 Mon Sep 17 00:00:00 2001 From: Nic Ma Date: Fri, 13 Aug 2021 15:41:09 +0800 Subject: [PATCH 3/3] [DLMED] remove out-date comment Signed-off-by: Nic Ma --- monai/data/thread_buffer.py | 1 - 1 file changed, 1 deletion(-) diff --git a/monai/data/thread_buffer.py b/monai/data/thread_buffer.py index 2b799b0a69..2901335bd5 100644 --- a/monai/data/thread_buffer.py +++ b/monai/data/thread_buffer.py @@ -88,6 +88,5 @@ def __init__(self, dataset: Dataset, num_workers: int = 0, **kwargs): super().__init__(dataset, num_workers, **kwargs) def __iter__(self): - # ThreadBuffer will use the inherited __iter__ instead of the one defined below buffer = ThreadBuffer(super().__iter__()) yield from buffer