From 77c41a8ae88d3d044884dad2c4c9da3d1cd45e23 Mon Sep 17 00:00:00 2001 From: Liam Chalcroft Date: Thu, 6 Apr 2023 13:46:50 +0100 Subject: [PATCH 1/4] Restore 'src_affine' for repeated inverse --- monai/transforms/spatial/array.py | 1 + 1 file changed, 1 insertion(+) diff --git a/monai/transforms/spatial/array.py b/monai/transforms/spatial/array.py index 2b61b1f61a..f263e89152 100644 --- a/monai/transforms/spatial/array.py +++ b/monai/transforms/spatial/array.py @@ -230,6 +230,7 @@ def inverse(self, data: torch.Tensor) -> torch.Tensor: with self.trace_transform(False): # we can't use `self.__call__` in case a child class calls this inverse. out: torch.Tensor = SpatialResample.__call__(self, data, **kw_args) + kw_args["src_affine"] = kw_args.get("dst_affine") return out From 7dd614642078b5b36a58179a289ce1043223a37b Mon Sep 17 00:00:00 2001 From: Liam Chalcroft Date: Thu, 6 Apr 2023 13:47:02 +0100 Subject: [PATCH 2/4] Add split to dtype string for unwanted prefix --- monai/utils/type_conversion.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monai/utils/type_conversion.py b/monai/utils/type_conversion.py index c5dd3a797c..463871b75a 100644 --- a/monai/utils/type_conversion.py +++ b/monai/utils/type_conversion.py @@ -45,7 +45,7 @@ def get_numpy_dtype_from_string(dtype: str) -> np.dtype: """Get a numpy dtype (e.g., `np.float32`) from its string (e.g., `"float32"`).""" - return np.empty([], dtype=dtype).dtype + return np.empty([], dtype=str(dtype).split('.')[-1]).dtype def get_torch_dtype_from_string(dtype: str) -> torch.dtype: From f06d0e51b48efdbbfe32457eda6cc65877750787 Mon Sep 17 00:00:00 2001 From: Liam Chalcroft Date: Thu, 6 Apr 2023 14:06:46 +0100 Subject: [PATCH 3/4] Fix to match formatting in type_conversion --- monai/utils/type_conversion.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monai/utils/type_conversion.py b/monai/utils/type_conversion.py index 463871b75a..734d8a2b17 100644 --- a/monai/utils/type_conversion.py +++ b/monai/utils/type_conversion.py @@ -45,7 +45,7 @@ def get_numpy_dtype_from_string(dtype: str) -> np.dtype: """Get a numpy dtype (e.g., `np.float32`) from its string (e.g., `"float32"`).""" - return np.empty([], dtype=str(dtype).split('.')[-1]).dtype + return np.empty([], dtype=str(dtype).split(".")[-1]).dtype def get_torch_dtype_from_string(dtype: str) -> torch.dtype: From 59e6dad036ad8b4107125b2fb9179b508fd1c282 Mon Sep 17 00:00:00 2001 From: Liam Chalcroft Date: Thu, 6 Apr 2023 15:19:54 +0100 Subject: [PATCH 4/4] DCO Remediation Commit for Liam Chalcroft I, Liam Chalcroft , hereby add my Signed-off-by to this commit: 77c41a8ae88d3d044884dad2c4c9da3d1cd45e23 I, Liam Chalcroft , hereby add my Signed-off-by to this commit: 7dd614642078b5b36a58179a289ce1043223a37b I, Liam Chalcroft , hereby add my Signed-off-by to this commit: f06d0e51b48efdbbfe32457eda6cc65877750787 Signed-off-by: Liam Chalcroft