From a777268a5a9e946e28f634a0fdfe31012a80764d Mon Sep 17 00:00:00 2001 From: YunLiu <55491388+KumoLiu@users.noreply.github.com> Date: Tue, 14 Jan 2025 15:52:51 +0800 Subject: [PATCH 1/3] fix #8298 Signed-off-by: YunLiu <55491388+KumoLiu@users.noreply.github.com> --- tests/test_zarr_avg_merger.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/test_zarr_avg_merger.py b/tests/test_zarr_avg_merger.py index de7fad48da..7283a365e5 100644 --- a/tests/test_zarr_avg_merger.py +++ b/tests/test_zarr_avg_merger.py @@ -19,11 +19,16 @@ from torch.nn.functional import pad from monai.inferers import ZarrAvgMerger -from monai.utils import optional_import +from monai.utils import get_package_version, optional_import, version_geq from tests.utils import assert_allclose np.seterr(divide="ignore", invalid="ignore") zarr, has_zarr = optional_import("zarr") +if has_zarr: + if version_geq(f"{get_package_version('zarr')}", "3.0.0"): + directory_store = zarr.storage.LocalStore("test.zarr") + else: + directory_store = zarr.storage.DirectoryStore("test.zarr") numcodecs, has_numcodecs = optional_import("numcodecs") TENSOR_4x4 = torch.randint(low=0, high=255, size=(2, 3, 4, 4), dtype=torch.float32) @@ -154,7 +159,7 @@ # explicit directory store TEST_CASE_10_DIRECTORY_STORE = [ - dict(merged_shape=TENSOR_4x4.shape, store=zarr.storage.DirectoryStore("test.zarr")), + dict(merged_shape=TENSOR_4x4.shape, store=directory_store), [ (TENSOR_4x4[..., :2, :2], (0, 0)), (TENSOR_4x4[..., :2, 2:], (0, 2)), From a35bda8050483fc1cd596c3ddf3c48f40050047b Mon Sep 17 00:00:00 2001 From: YunLiu <55491388+KumoLiu@users.noreply.github.com> Date: Wed, 15 Jan 2025 13:31:05 +0800 Subject: [PATCH 2/3] Update tests/test_zarr_avg_merger.py Co-authored-by: Eric Kerfoot <17726042+ericspod@users.noreply.github.com> Signed-off-by: YunLiu <55491388+KumoLiu@users.noreply.github.com> --- tests/test_zarr_avg_merger.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_zarr_avg_merger.py b/tests/test_zarr_avg_merger.py index 7283a365e5..558d073264 100644 --- a/tests/test_zarr_avg_merger.py +++ b/tests/test_zarr_avg_merger.py @@ -25,7 +25,7 @@ np.seterr(divide="ignore", invalid="ignore") zarr, has_zarr = optional_import("zarr") if has_zarr: - if version_geq(f"{get_package_version('zarr')}", "3.0.0"): + if version_geq(get_package_version('zarr'), "3.0.0"): directory_store = zarr.storage.LocalStore("test.zarr") else: directory_store = zarr.storage.DirectoryStore("test.zarr") From 4919dcf3b40576ad2a70154228992da6ce772cac Mon Sep 17 00:00:00 2001 From: YunLiu <55491388+KumoLiu@users.noreply.github.com> Date: Wed, 15 Jan 2025 13:32:50 +0800 Subject: [PATCH 3/3] address comments Signed-off-by: YunLiu <55491388+KumoLiu@users.noreply.github.com> --- tests/test_zarr_avg_merger.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/test_zarr_avg_merger.py b/tests/test_zarr_avg_merger.py index 558d073264..a52dbceb4c 100644 --- a/tests/test_zarr_avg_merger.py +++ b/tests/test_zarr_avg_merger.py @@ -25,10 +25,12 @@ np.seterr(divide="ignore", invalid="ignore") zarr, has_zarr = optional_import("zarr") if has_zarr: - if version_geq(get_package_version('zarr'), "3.0.0"): + if version_geq(get_package_version("zarr"), "3.0.0"): directory_store = zarr.storage.LocalStore("test.zarr") else: directory_store = zarr.storage.DirectoryStore("test.zarr") +else: + directory_store = None numcodecs, has_numcodecs = optional_import("numcodecs") TENSOR_4x4 = torch.randint(low=0, high=255, size=(2, 3, 4, 4), dtype=torch.float32)