From c040d855640bb15b84ccb3b3159ab219427875ef Mon Sep 17 00:00:00 2001 From: Nicolas Kaenzig Date: Wed, 19 Feb 2025 16:03:52 +0100 Subject: [PATCH 1/7] removed from transform functions --- monai/transforms/utility/array.py | 14 ++------------ .../transforms/utils_pytorch_numpy_unification.py | 6 ++---- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/monai/transforms/utility/array.py b/monai/transforms/utility/array.py index 2963c8a2f8..8491e4739c 100644 --- a/monai/transforms/utility/array.py +++ b/monai/transforms/utility/array.py @@ -66,7 +66,6 @@ optional_import, ) from monai.utils.enums import TransformBackends -from monai.utils.misc import is_module_ver_at_least from monai.utils.type_conversion import convert_to_dst_type, get_dtype_string, get_equivalent_dtype PILImageImage, has_pil = optional_import("PIL.Image", name="Image") @@ -939,19 +938,10 @@ def __call__( data = img[[*select_labels]] else: where: Callable = np.where if isinstance(img, np.ndarray) else torch.where # type: ignore - if isinstance(img, np.ndarray) or is_module_ver_at_least(torch, (1, 8, 0)): - data = where(in1d(img, select_labels), True, False).reshape(img.shape) - # pre pytorch 1.8.0, need to use 1/0 instead of True/False - else: - data = where( - in1d(img, select_labels), torch.tensor(1, device=img.device), torch.tensor(0, device=img.device) - ).reshape(img.shape) + data = where(in1d(img, select_labels), True, False).reshape(img.shape) if merge_channels or self.merge_channels: - if isinstance(img, np.ndarray) or is_module_ver_at_least(torch, (1, 8, 0)): - return data.any(0)[None] - # pre pytorch 1.8.0 compatibility - return data.to(torch.uint8).any(0)[None].to(bool) # type: ignore + return data.any(0)[None] return data diff --git a/monai/transforms/utils_pytorch_numpy_unification.py b/monai/transforms/utils_pytorch_numpy_unification.py index 365bd1eab5..8f22d00674 100644 --- a/monai/transforms/utils_pytorch_numpy_unification.py +++ b/monai/transforms/utils_pytorch_numpy_unification.py @@ -18,7 +18,6 @@ import torch from monai.config.type_definitions import NdarrayOrTensor, NdarrayTensor -from monai.utils.misc import is_module_ver_at_least from monai.utils.type_conversion import convert_data_type, convert_to_dst_type __all__ = [ @@ -215,10 +214,9 @@ def floor_divide(a: NdarrayOrTensor, b) -> NdarrayOrTensor: Element-wise floor division between two arrays/tensors. """ if isinstance(a, torch.Tensor): - if is_module_ver_at_least(torch, (1, 8, 0)): - return torch.div(a, b, rounding_mode="floor") return torch.floor_divide(a, b) - return np.floor_divide(a, b) + else: + return np.floor_divide(a, b) def unravel_index(idx, shape) -> NdarrayOrTensor: From c9de5fc63ec6d86c4aab52430fc45945679d6d8e Mon Sep 17 00:00:00 2001 From: Nicolas Kaenzig Date: Wed, 19 Feb 2025 16:26:53 +0100 Subject: [PATCH 2/7] DCO Signed-off-by: Nicolas Kaenzig --- monai/utils/misc.py | 1 + 1 file changed, 1 insertion(+) diff --git a/monai/utils/misc.py b/monai/utils/misc.py index b96a48ad7e..b204e236d2 100644 --- a/monai/utils/misc.py +++ b/monai/utils/misc.py @@ -599,6 +599,7 @@ def is_module_ver_at_least(module, version): `True` if module is the given version or newer. """ test_ver = ".".join(map(str, version)) + return module.__version__ != test_ver and version_leq(test_ver, module.__version__) From 69498ccbc8b9600772d5e4b0ac90ccb0aeb6ca22 Mon Sep 17 00:00:00 2001 From: Nicolas Kaenzig Date: Wed, 19 Feb 2025 16:27:25 +0100 Subject: [PATCH 3/7] DCO Signed-off-by: Nicolas Kaenzig --- monai/utils/misc.py | 1 - 1 file changed, 1 deletion(-) diff --git a/monai/utils/misc.py b/monai/utils/misc.py index b204e236d2..b96a48ad7e 100644 --- a/monai/utils/misc.py +++ b/monai/utils/misc.py @@ -599,7 +599,6 @@ def is_module_ver_at_least(module, version): `True` if module is the given version or newer. """ test_ver = ".".join(map(str, version)) - return module.__version__ != test_ver and version_leq(test_ver, module.__version__) From 33e1c669106a01951239beb1dc141d46983f7ae5 Mon Sep 17 00:00:00 2001 From: Nicolas Kaenzig Date: Wed, 19 Feb 2025 16:29:44 +0100 Subject: [PATCH 4/7] DCO --- monai/utils/misc.py | 1 + 1 file changed, 1 insertion(+) diff --git a/monai/utils/misc.py b/monai/utils/misc.py index b96a48ad7e..b204e236d2 100644 --- a/monai/utils/misc.py +++ b/monai/utils/misc.py @@ -599,6 +599,7 @@ def is_module_ver_at_least(module, version): `True` if module is the given version or newer. """ test_ver = ".".join(map(str, version)) + return module.__version__ != test_ver and version_leq(test_ver, module.__version__) From 4f54f95287a447f78929c93f30288fcbf98a24dd Mon Sep 17 00:00:00 2001 From: Nicolas Kaenzig Date: Wed, 19 Feb 2025 16:29:59 +0100 Subject: [PATCH 5/7] DCO Remediation Commit for Nicolas Kaenzig I, Nicolas Kaenzig , hereby add my Signed-off-by to this commit: c040d855640bb15b84ccb3b3159ab219427875ef Signed-off-by: Nicolas Kaenzig --- monai/utils/misc.py | 1 - 1 file changed, 1 deletion(-) diff --git a/monai/utils/misc.py b/monai/utils/misc.py index b204e236d2..b96a48ad7e 100644 --- a/monai/utils/misc.py +++ b/monai/utils/misc.py @@ -599,7 +599,6 @@ def is_module_ver_at_least(module, version): `True` if module is the given version or newer. """ test_ver = ".".join(map(str, version)) - return module.__version__ != test_ver and version_leq(test_ver, module.__version__) From 597f912571929d04668812df26983ae8f931b7be Mon Sep 17 00:00:00 2001 From: Nicolas Kaenzig Date: Wed, 19 Feb 2025 16:33:03 +0100 Subject: [PATCH 6/7] DCO Signed-off-by: Nicolas Kaenzig --- monai/utils/misc.py | 1 + 1 file changed, 1 insertion(+) diff --git a/monai/utils/misc.py b/monai/utils/misc.py index b96a48ad7e..b204e236d2 100644 --- a/monai/utils/misc.py +++ b/monai/utils/misc.py @@ -599,6 +599,7 @@ def is_module_ver_at_least(module, version): `True` if module is the given version or newer. """ test_ver = ".".join(map(str, version)) + return module.__version__ != test_ver and version_leq(test_ver, module.__version__) From 7eee64d6d86582ddc403695043e632521d8a8ed6 Mon Sep 17 00:00:00 2001 From: Nicolas Kaenzig Date: Wed, 19 Feb 2025 16:33:35 +0100 Subject: [PATCH 7/7] DCO Remediation Commit for Nicolas Kaenzig I, Nicolas Kaenzig , hereby add my Signed-off-by to this commit: 33e1c669106a01951239beb1dc141d46983f7ae5 Signed-off-by: Nicolas Kaenzig --- monai/utils/misc.py | 1 - 1 file changed, 1 deletion(-) diff --git a/monai/utils/misc.py b/monai/utils/misc.py index b204e236d2..b96a48ad7e 100644 --- a/monai/utils/misc.py +++ b/monai/utils/misc.py @@ -599,7 +599,6 @@ def is_module_ver_at_least(module, version): `True` if module is the given version or newer. """ test_ver = ".".join(map(str, version)) - return module.__version__ != test_ver and version_leq(test_ver, module.__version__)