monai-weekly 1.4.dev2439__py3-none-any.whl → 1.4.dev2441__py3-none-any.whl

monai/__init__.py

@@ -136,4 +136,4 @@ except BaseException:
 
     if MONAIEnvVars.debug():
         raise
-__commit_id__ = "8546be098daaf6841c39a2748412bbda83929c92"
+__commit_id__ = "796271ccd4ee48065af3b2afd56bf46960a53112"

monai/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2024-09-29T02:29:04+0000",
+ "date": "2024-10-13T02:28:40+0000",
  "dirty": false,
  "error": null,
- "full-revisionid": "1bac3a18df3d8aac051ac832fc0d7d3d3c50e350",
- "version": "1.4.dev2439"
+ "full-revisionid": "cf815ed4e44a5b8ce67e894ab0bc2765279a1a59",
+ "version": "1.4.dev2441"
 }
 '''  # END VERSION_JSON
 

monai/apps/deepgrow/transforms.py

@@ -803,6 +803,14 @@ class RestoreLabeld(MapTransform):
         original_shape_key: key that records original shape for foreground.
         cropped_shape_key: key that records cropped shape for foreground.
         allow_missing_keys: don't raise exception if key is missing.
+        restore_resizing: used to enable or disable resizing restoration, default is True.
+            If True, the transform will resize the items back to its original shape.
+        restore_cropping: used to enable or disable cropping restoration, default is True.
+            If True, the transform will restore the items to its uncropped size.
+        restore_spacing: used to enable or disable spacing restoration, default is True.
+            If True, the transform will resample the items back to the spacing it had before being altered.
+        restore_slicing: used to enable or disable slicing restoration, default is True.
+            If True, the transform will reassemble the full volume by restoring the slices to their original positions.
     """
 
     def __init__(
@@ -819,6 +827,10 @@ class RestoreLabeld(MapTransform):
         original_shape_key: str = "foreground_original_shape",
         cropped_shape_key: str = "foreground_cropped_shape",
         allow_missing_keys: bool = False,
+        restore_resizing: bool = True,
+        restore_cropping: bool = True,
+        restore_spacing: bool = True,
+        restore_slicing: bool = True,
     ) -> None:
         super().__init__(keys, allow_missing_keys)
         self.ref_image = ref_image
@@ -833,6 +845,10 @@ class RestoreLabeld(MapTransform):
         self.end_coord_key = end_coord_key
         self.original_shape_key = original_shape_key
         self.cropped_shape_key = cropped_shape_key
+        self.restore_resizing = restore_resizing
+        self.restore_cropping = restore_cropping
+        self.restore_spacing = restore_spacing
+        self.restore_slicing = restore_slicing
 
     def __call__(self, data: Any) -> dict:
         d = dict(data)
@@ -842,38 +858,45 @@ class RestoreLabeld(MapTransform):
             image = d[key]
 
             # Undo Resize
-            current_shape = image.shape
-            cropped_shape = meta_dict[self.cropped_shape_key]
-            if np.any(np.not_equal(current_shape, cropped_shape)):
-                resizer = Resize(spatial_size=cropped_shape[1:], mode=mode)
-                image = resizer(image, mode=mode, align_corners=align_corners)
+            if self.restore_resizing:
+                current_shape = image.shape
+                cropped_shape = meta_dict[self.cropped_shape_key]
+                if np.any(np.not_equal(current_shape, cropped_shape)):
+                    resizer = Resize(spatial_size=cropped_shape[1:], mode=mode)
+                    image = resizer(image, mode=mode, align_corners=align_corners)
 
             # Undo Crop
-            original_shape = meta_dict[self.original_shape_key]
-            result = np.zeros(original_shape, dtype=np.float32)
-            box_start = meta_dict[self.start_coord_key]
-            box_end = meta_dict[self.end_coord_key]
-
-            spatial_dims = min(len(box_start), len(image.shape[1:]))
-            slices = tuple(
-                [slice(None)] + [slice(s, e) for s, e in zip(box_start[:spatial_dims], box_end[:spatial_dims])]
-            )
-            result[slices] = image
+            if self.restore_cropping:
+                original_shape = meta_dict[self.original_shape_key]
+                result = np.zeros(original_shape, dtype=np.float32)
+                box_start = meta_dict[self.start_coord_key]
+                box_end = meta_dict[self.end_coord_key]
+
+                spatial_dims = min(len(box_start), len(image.shape[1:]))
+                slices = tuple(
+                    [slice(None)] + [slice(s, e) for s, e in zip(box_start[:spatial_dims], box_end[:spatial_dims])]
+                )
+                result[slices] = image
+            else:
+                result = image
 
             # Undo Spacing
-            current_size = result.shape[1:]
-            # change spatial_shape from HWD to DHW
-            spatial_shape = list(np.roll(meta_dict["spatial_shape"], 1))
-            spatial_size = spatial_shape[-len(current_size) :]
+            if self.restore_spacing:
+                current_size = result.shape[1:]
+                # change spatial_shape from HWD to DHW
+                spatial_shape = list(np.roll(meta_dict["spatial_shape"], 1))
+                spatial_size = spatial_shape[-len(current_size) :]
 
-            if np.any(np.not_equal(current_size, spatial_size)):
-                resizer = Resize(spatial_size=spatial_size, mode=mode)
-                result = resizer(result, mode=mode, align_corners=align_corners)  # type: ignore
+                if np.any(np.not_equal(current_size, spatial_size)):
+                    resizer = Resize(spatial_size=spatial_size, mode=mode)
+                    result = resizer(result, mode=mode, align_corners=align_corners)  # type: ignore
 
             # Undo Slicing
             slice_idx = meta_dict.get("slice_idx")
             final_result: NdarrayOrTensor
-            if slice_idx is None or self.slice_only:
+            if not self.restore_slicing:  # do nothing if restore slicing isn't requested
+                final_result = result
+            elif slice_idx is None or self.slice_only:
                 final_result = result if len(result.shape) <= 3 else result[0]
             else:
                 slice_idx = meta_dict["slice_idx"][0]

monai/config/__init__.py

@@ -14,6 +14,7 @@ from __future__ import annotations
 from .deviceconfig import (
     USE_COMPILED,
     USE_META_DICT,
+    IgniteInfo,
     get_config_values,
     get_gpu_info,
     get_optional_config_values,

monai/config/deviceconfig.py

@@ -23,6 +23,8 @@ import numpy as np
 import torch
 
 import monai
+from monai.utils.deprecate_utils import deprecated
+from monai.utils.enums import IgniteInfo as _IgniteInfo
 from monai.utils.module import OptionalImportError, get_package_version, optional_import
 
 try:
@@ -45,6 +47,7 @@ __all__ = [
     "print_debug_info",
     "USE_COMPILED",
     "USE_META_DICT",
+    "IgniteInfo",
 ]
 
 
@@ -260,5 +263,12 @@ def print_debug_info(file: TextIO = sys.stdout) -> None:
     print_gpu_info(file)
 
 
+@deprecated(since="1.4.0", removed="1.6.0", msg_suffix="Please use `monai.utils.enums.IgniteInfo` instead.")
+class IgniteInfo:
+    """Deprecated Import of IgniteInfo enum, which was moved to `monai.utils.enums.IgniteInfo`."""
+
+    OPT_IMPORT_VERSION = _IgniteInfo.OPT_IMPORT_VERSION
+
+
 if __name__ == "__main__":
     print_debug_info()

monai/utils/enums.py

@@ -727,7 +727,7 @@ class IgniteInfo(StrEnum):
 
     """
 
-    OPT_IMPORT_VERSION = "0.4.4"
+    OPT_IMPORT_VERSION = "0.4.11"
 
 
 if TYPE_CHECKING:

{monai_weekly-1.4.dev2439.dist-info → monai_weekly-1.4.dev2441.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: monai-weekly
-Version: 1.4.dev2439
+Version: 1.4.dev2441
 Summary: AI Toolkit for Healthcare Imaging
 Home-page: https://monai.io/
 Author: MONAI Consortium

{monai_weekly-1.4.dev2439.dist-info → monai_weekly-1.4.dev2441.dist-info}/RECORD

@@ -1,5 +1,5 @@
-monai/__init__.py,sha256=CmkgY5g-rxGpBMHr6uWjyQrAbg8kqEIBMmfRy0M5nRA,4095
-monai/_version.py,sha256=NNobIKI9e8RMOS96iH0hSWqMTzcTLl2Vv0qCGKdkDlk,503
+monai/__init__.py,sha256=0V-ca1Bt9VxdrUBijK2gfQswTYDXWtBA9PBHIs9oSZ0,4095
+monai/_version.py,sha256=pfNb_sO0WbswtIrF1esHnac1VUqYKHVs5ovDRsLId8w,503
 monai/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 monai/_extensions/__init__.py,sha256=NEBPreRhQ8H9gVvgrLr_y52_TmqB96u_u4VQmeNT93I,642
 monai/_extensions/loader.py,sha256=7SiKw36q-nOzH8CRbBurFrz7GM40GCu7rc93Tm8XpnI,3643
@@ -26,7 +26,7 @@ monai/apps/deepedit/transforms.py,sha256=Udj35m10Irek5Gtqo6Hgv6Lt7S6jSo-z0NuyVbs
 monai/apps/deepgrow/__init__.py,sha256=s9djSd6kvViPnFvMR11Dgd30Lv4oY6FaPJr4ZZJZLq0,573
 monai/apps/deepgrow/dataset.py,sha256=W0wv1QujA4sZgrAcBS64dl3OBbDBM2cF4RK0fDCQnRU,10054
 monai/apps/deepgrow/interaction.py,sha256=-smtOl93i_SDEo_Yo8DE5U3FnDrUcdJWeP14nCq5GS4,3748
-monai/apps/deepgrow/transforms.py,sha256=MQ3WPGfqagXoN6ySccpPFWOQAcxKOX4VUeQ0Zybx45I,41873
+monai/apps/deepgrow/transforms.py,sha256=RmKMoN4sqhT84ognTJt55t6UtkL_OpkzRcP5VPseSss,43349
 monai/apps/detection/__init__.py,sha256=s9djSd6kvViPnFvMR11Dgd30Lv4oY6FaPJr4ZZJZLq0,573
 monai/apps/detection/metrics/__init__.py,sha256=s9djSd6kvViPnFvMR11Dgd30Lv4oY6FaPJr4ZZJZLq0,573
 monai/apps/detection/metrics/coco.py,sha256=bpF6hAAMKsBNLfat-Fzh0CR-0swDsAAVcwTaZ-lo1_g,26618
@@ -117,8 +117,8 @@ monai/bundle/reference_resolver.py,sha256=aBw3ML7B_YsiFUNl_mcRYPry1UbrEIK0R39A0z
 monai/bundle/scripts.py,sha256=ziTH32hd2A00c1wzXzAe2cttCEQtZoDqDx1bCDI1TR0,89136
 monai/bundle/utils.py,sha256=t-22uFvLn7Yy-dr1v1U33peNOxgAmU4TJiGAbsBrUKs,10108
 monai/bundle/workflows.py,sha256=KADIppCZY6jCDvyCH2PmJm0Q-6xwCnB7x7KjFfRP8LY,24655
-monai/config/__init__.py,sha256=x7Had67mmng8xKkLDKrrJwqFW3ohlhrJ7iJ_rdvewX8,1032
-monai/config/deviceconfig.py,sha256=T-slMfnvHmXYZqcQJcqXxTz1DYFGD3mKnnAUZSVa6C0,10172
+monai/config/__init__.py,sha256=CN28CfTdsp301gv8YXfVvkbztCfbAqrLKrJi_C8oP9s,1048
+monai/config/deviceconfig.py,sha256=f3Xa0OL9kNqdsbZ0PfUEvm6NZivAPh454_VCE8BmsWE,10582
 monai/config/type_definitions.py,sha256=0fAuI-_uX2Ac_33bgDVXKmBSl-fJNFcsOqBqYV16fhk,3485
 monai/data/__init__.py,sha256=loDwAMF14hb4HS04SwukoIchIfU6iGY-xPrJVGyVwBo,5167
 monai/data/box_utils.py,sha256=YbG6lOoYwUGmwcNmoKzq2xnNTbYA4LMkHmfsqteopCg,50102
@@ -399,7 +399,7 @@ monai/utils/component_store.py,sha256=VMF7CtPu5Wi_eX_qFtm9iWo5kvoWFuCUIxdRzk90zZ
 monai/utils/decorators.py,sha256=YRK5iEMdbc2INrWnBNDSMTaHge_0ezRf2b9yJGL-opg,3129
 monai/utils/deprecate_utils.py,sha256=gKeEV4MsI51qeQ5gci2me_C-0e-tDwa3VZzd3XPQqLk,14759
 monai/utils/dist.py,sha256=QUVRusnAdiySK_dnTrDWqxNMl4XU4pwzvlMaGsvVE3Y,8644
-monai/utils/enums.py,sha256=ihvq2X9Z_cjmDKXhgHFLDcTJzWbi1AtLbbYSZC9iezI,19512
+monai/utils/enums.py,sha256=orCV7SGDajYtl3DhTTjbLDbayr6WxkMSw_bZ6yeGGTY,19513
 monai/utils/jupyter_utils.py,sha256=kQqfLTLAre3TLzXTt091X_XeWy5K0QKAcTuYlJ8BOag,15650
 monai/utils/misc.py,sha256=4KCY-Kmlzjup3KE2bgJsjIItKdDMxXwA0_rH1ghHONE,31410
 monai/utils/module.py,sha256=ICsVqQMV-069FuVwjCHm3d3hyvIOx9El17IXZ-2sfQk,24319
@@ -416,8 +416,8 @@ monai/visualize/img2tensorboard.py,sha256=NnMcyfIFqX-jD7TBO3Rn02zt5uug79d_7pIIaV
 monai/visualize/occlusion_sensitivity.py,sha256=OQHEJLyIhB8zWqQsfKaX-1kvCjWFVYtLfS4dFC0nKFI,18160
 monai/visualize/utils.py,sha256=B-MhTVs7sQbIqYS3yPnpBwPw2K82rE2PBtGIfpwZtWM,9894
 monai/visualize/visualizer.py,sha256=qckyaMZCbezYUwE20k5yc-Pb7UozVavMDbrmyQwfYHY,1377
-monai_weekly-1.4.dev2439.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-monai_weekly-1.4.dev2439.dist-info/METADATA,sha256=P2ERflLdl70ZUYCzPV3aJB53ToRiUSYgnLWVeXJAr3k,11172
-monai_weekly-1.4.dev2439.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-monai_weekly-1.4.dev2439.dist-info/top_level.txt,sha256=UaNwRzLGORdus41Ip446s3bBfViLkdkDsXDo34J2P44,6
-monai_weekly-1.4.dev2439.dist-info/RECORD,,
+monai_weekly-1.4.dev2441.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+monai_weekly-1.4.dev2441.dist-info/METADATA,sha256=VPKdbi178DBdGodZ-DsfUHOc13tPT-58VDGTFXdV_DE,11172
+monai_weekly-1.4.dev2441.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+monai_weekly-1.4.dev2441.dist-info/top_level.txt,sha256=UaNwRzLGORdus41Ip446s3bBfViLkdkDsXDo34J2P44,6
+monai_weekly-1.4.dev2441.dist-info/RECORD,,