monai-weekly 1.4.dev2430__py3-none-any.whl → 1.4.dev2431__py3-none-any.whl

monai/__init__.py

@@ -93,4 +93,4 @@ except BaseException:
 
     if MONAIEnvVars.debug():
         raise
-__commit_id__ = "2e53df78e580131046dc8db7f7638063db1f5045"
+__commit_id__ = "56ee32e36c5c0c7a5cb10afa4ec5589c81171e6b"

monai/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2024-07-28T02:19:22+0000",
+ "date": "2024-08-04T02:19:41+0000",
  "dirty": false,
  "error": null,
- "full-revisionid": "9dd92b4a07706d4b80edace3d39fe008dc805d5a",
- "version": "1.4.dev2430"
+ "full-revisionid": "951a77d7a7737a3108afa94623a50b87d21eb4a7",
+ "version": "1.4.dev2431"
 }
 '''  # END VERSION_JSON
 

monai/bundle/config_parser.py

@@ -118,7 +118,7 @@ class ConfigParser:
         self.ref_resolver = ReferenceResolver()
         if config is None:
             config = {self.meta_key: {}}
-        self.set(config=config)
+        self.set(config=self.ref_resolver.normalize_meta_id(config))
 
     def __repr__(self):
         return f"{self.config}"
@@ -221,7 +221,7 @@ class ConfigParser:
                 if isinstance(conf_, dict) and k not in conf_:
                     conf_[k] = {}
                 conf_ = conf_[k if isinstance(conf_, dict) else int(k)]
-        self[ReferenceResolver.normalize_id(id)] = config
+        self[ReferenceResolver.normalize_id(id)] = self.ref_resolver.normalize_meta_id(config)
 
     def update(self, pairs: dict[str, Any]) -> None:
         """

monai/bundle/reference_resolver.py

@@ -17,7 +17,7 @@ from collections.abc import Sequence
 from typing import Any, Iterator
 
 from monai.bundle.config_item import ConfigComponent, ConfigExpression, ConfigItem
-from monai.bundle.utils import ID_REF_KEY, ID_SEP_KEY
+from monai.bundle.utils import DEPRECATED_ID_MAPPING, ID_REF_KEY, ID_SEP_KEY
 from monai.utils import allow_missing_reference, look_up_option
 
 __all__ = ["ReferenceResolver"]
@@ -202,6 +202,23 @@ class ReferenceResolver:
         """
         return str(id).replace("#", cls.sep)  # backward compatibility `#` is the old separator
 
+    def normalize_meta_id(self, config: Any) -> Any:
+        """
+        Update deprecated identifiers in `config` using `DEPRECATED_ID_MAPPING`.
+        This will replace names that are marked as deprecated with their replacement.
+
+        Args:
+            config: input config to be updated.
+        """
+        if isinstance(config, dict):
+            for _id, _new_id in DEPRECATED_ID_MAPPING.items():
+                if _id in config.keys():
+                    warnings.warn(
+                        f"Detected deprecated name '{_id}' in configuration file, replacing with '{_new_id}'."
+                    )
+                    config[_new_id] = config.pop(_id)
+        return config
+
     @classmethod
     def split_id(cls, id: str | int, last: bool = False) -> list[str]:
         """

monai/bundle/scripts.py

@@ -217,10 +217,15 @@ def _remove_ngc_prefix(name: str, prefix: str = "monai_") -> str:
 
 
 def _download_from_ngc(
-    download_path: Path, filename: str, version: str, remove_prefix: str | None, progress: bool
+    download_path: Path,
+    filename: str,
+    version: str,
+    prefix: str = "monai_",
+    remove_prefix: str | None = "monai_",
+    progress: bool = True,
 ) -> None:
     # ensure prefix is contained
-    filename = _add_ngc_prefix(filename)
+    filename = _add_ngc_prefix(filename, prefix=prefix)
     url = _get_ngc_bundle_url(model_name=filename, version=version)
     filepath = download_path / f"{filename}_v{version}.zip"
     if remove_prefix:
@@ -231,10 +236,16 @@ def _download_from_ngc(
 
 
 def _download_from_ngc_private(
-    download_path: Path, filename: str, version: str, remove_prefix: str | None, repo: str, headers: dict | None = None
+    download_path: Path,
+    filename: str,
+    version: str,
+    repo: str,
+    prefix: str = "monai_",
+    remove_prefix: str | None = "monai_",
+    headers: dict | None = None,
 ) -> None:
     # ensure prefix is contained
-    filename = _add_ngc_prefix(filename)
+    filename = _add_ngc_prefix(filename, prefix=prefix)
     request_url = _get_ngc_private_bundle_url(model_name=filename, version=version, repo=repo)
     if has_requests:
         headers = {} if headers is None else headers
@@ -491,7 +502,7 @@ def download(
         url: url to download the data. If not `None`, data will be downloaded directly
             and `source` will not be checked.
             If `name` is `None`, filename is determined by `monai.apps.utils._basename(url)`.
-        remove_prefix: This argument is used when `source` is "ngc". Currently, all ngc bundles
+        remove_prefix: This argument is used when `source` is "ngc" or "ngc_private". Currently, all ngc bundles
             have the ``monai_`` prefix, which is not existing in their model zoo contrasts. In order to
             maintain the consistency between these two sources, remove prefix is necessary.
             Therefore, if specified, downloaded folder name will remove the prefix.

monai/bundle/utils.py

@@ -36,7 +36,7 @@ DEFAULT_METADATA = {
     "monai_version": _conf_values["MONAI"],
     "pytorch_version": str(_conf_values["Pytorch"]).split("+")[0].split("a")[0],  # 1.9.0a0+df837d0 or 1.13.0+cu117
     "numpy_version": _conf_values["Numpy"],
-    "optional_packages_version": {},
+    "required_packages_version": {},
     "task": "Describe what the network predicts",
     "description": "A longer description of what the network does, use context, inputs, outputs, etc.",
     "authors": "Your Name Here",
@@ -157,6 +157,8 @@ DEFAULT_MLFLOW_SETTINGS = {
 
 DEFAULT_EXP_MGMT_SETTINGS = {"mlflow": DEFAULT_MLFLOW_SETTINGS}  # default experiment management settings
 
+DEPRECATED_ID_MAPPING = {"optional_packages_version": "required_packages_version"}
+
 
 def load_bundle_config(bundle_path: str, *config_names: str, **load_kw_args: Any) -> Any:
     """

monai/networks/nets/spade_autoencoderkl.py

@@ -59,7 +59,7 @@ class SPADEResBlock(nn.Module):
             label_nc=label_nc,
             norm_nc=in_channels,
             norm="GROUP",
-            norm_params={"num_groups": norm_num_groups, "affine": False},
+            norm_params={"num_groups": norm_num_groups, "affine": False, "eps": norm_eps},
             hidden_channels=spade_intermediate_channels,
             kernel_size=3,
             spatial_dims=spatial_dims,
@@ -77,7 +77,7 @@ class SPADEResBlock(nn.Module):
             label_nc=label_nc,
             norm_nc=out_channels,
             norm="GROUP",
-            norm_params={"num_groups": norm_num_groups, "affine": False},
+            norm_params={"num_groups": norm_num_groups, "affine": False, "eps": norm_eps},
             hidden_channels=spade_intermediate_channels,
             kernel_size=3,
             spatial_dims=spatial_dims,

monai/transforms/post/array.py

@@ -211,7 +211,8 @@ class AsDiscrete(Transform):
             raise ValueError("`to_onehot=True/False` is deprecated, please use `to_onehot=num_classes` instead.")
         img = convert_to_tensor(img, track_meta=get_track_meta())
         img_t, *_ = convert_data_type(img, torch.Tensor)
-        if argmax or self.argmax:
+        argmax = self.argmax if argmax is None else argmax
+        if argmax:
             img_t = torch.argmax(img_t, dim=self.kwargs.get("dim", 0), keepdim=self.kwargs.get("keepdim", True))
 
         to_onehot = self.to_onehot if to_onehot is None else to_onehot

{monai_weekly-1.4.dev2430.dist-info → monai_weekly-1.4.dev2431.dist-info}/METADATA

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

{monai_weekly-1.4.dev2430.dist-info → monai_weekly-1.4.dev2431.dist-info}/RECORD

@@ -1,5 +1,5 @@
-monai/__init__.py,sha256=_QozTiwyy6qpqJ5oX2PSxYbqUoXKRgnQnkEAk33lkjA,2722
-monai/_version.py,sha256=N95fYvfNA1LI8sPj8gCsJWWoY4Vuyz0MBqeedb7l354,503
+monai/__init__.py,sha256=dXBm2eh5DsP3pasuxDuHHGRAwh3K_BrVq4EybgqpOQg,2722
+monai/_version.py,sha256=fHOVhDg9cUEScqRJF52042X5Hjis0bgHRM4yagWLeUg,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
@@ -109,11 +109,11 @@ monai/auto3dseg/utils.py,sha256=zEicEO_--6-1kzT5HlmhAAd575gnl2AFmW8O3FnIznE,1867
 monai/bundle/__init__.py,sha256=xvYgiAzq9fiyMkCRo0vwn41ZSzj0udyvF0jmySnqBRI,1443
 monai/bundle/__main__.py,sha256=RiAn6raPUvPMfXvd03irAhB3nkIAgG1lf8GE34PG4Js,952
 monai/bundle/config_item.py,sha256=rMjXSGkjJZdi04BwSHwCcIwzIb_TflmC3xDhC3SVJRs,16151
-monai/bundle/config_parser.py,sha256=IewIX0HnjzL5nZYdcSdWGzc7Z4xqUaOTb9wa6wjZ4Y8,22895
+monai/bundle/config_parser.py,sha256=euPLLd9An2HYV7RoO-z0UDCbna-Gaq9tm_lIK3Ay1OM,22969
 monai/bundle/properties.py,sha256=iN3K4FVmN9ny1Hw9p5j7_ULcCdSD8PmrR7qXxbNz49k,11582
-monai/bundle/reference_resolver.py,sha256=1qdz732zl1dwSWyKaW6JOs1YqoCrXu7NBi5jz3zjqxA,15747
-monai/bundle/scripts.py,sha256=ipS7CDKx01ySmAQlrHBhpmgqksAOzYxK1ARbgHo9fxg,88619
-monai/bundle/utils.py,sha256=Heob15Gf_dVpt-Gcts4sycoUny0nr7RvevNVSKe6sqc,8950
+monai/bundle/reference_resolver.py,sha256=aBw3ML7B_YsiFUNl_mcRYPry1UbrEIK0R39A0zFw8kI,16463
+monai/bundle/scripts.py,sha256=itzeju2vTSaof1UomzXmIVJHt7NnHjeKXO9KOnfASmk,88789
+monai/bundle/utils.py,sha256=wzYtp2MuzKyq_zv-cwNqz_81BlDUTubqtyDAF8-bgOA,9034
 monai/bundle/workflows.py,sha256=VMuBTkk6DGsnGRLFzNfVUzgy8UqUReluUlIPUaxODPQ,24765
 monai/config/__init__.py,sha256=CN28CfTdsp301gv8YXfVvkbztCfbAqrLKrJi_C8oP9s,1048
 monai/config/deviceconfig.py,sha256=3EU1Zi6yD_bxEAeHfzjbslEjq6vOvxNG6o9dxKUiEvc,10315
@@ -313,7 +313,7 @@ monai/networks/nets/resnet.py,sha256=oo1MCA9hccBVwDcMrZNpVmbDSRn3dOEkrn3DbKW2WZk
 monai/networks/nets/segresnet.py,sha256=xNkSIvdk7kAyc3eVn-U_gGj8MoGVc5nklFKc_fkgOUs,13994
 monai/networks/nets/segresnet_ds.py,sha256=01R-t-cIvAoVEsqTRPC2sHVYGyiVfcvy8hng53X-6yQ,15703
 monai/networks/nets/senet.py,sha256=gulqPMYmSABbMbN39NElGzSU1TKGviJas7EPTBaZ60A,19289
-monai/networks/nets/spade_autoencoderkl.py,sha256=4PVlLjKEMHYEmmsGcRhsDBNy9I0gXOTTowmTpeZYylw,18243
+monai/networks/nets/spade_autoencoderkl.py,sha256=lu4uPsNWIXKhzaVQ4iplTQ9g3eeViIHMXLH0nOaNanc,18277
 monai/networks/nets/spade_diffusion_model_unet.py,sha256=JQJRMX96jLHPPUmetpCpy5ZPm4qjoO-NoI4dfnWNaPI,36785
 monai/networks/nets/spade_network.py,sha256=GguYucjIRyT_rZa9DrvUmv00FtqXHZtY1VfJM9Rygns,16479
 monai/networks/nets/swin_unetr.py,sha256=H7cjCHZJmZoXDcVFYXJM5iPfQbHZGt1AES2-UoNsGo4,44849
@@ -368,7 +368,7 @@ monai/transforms/lazy/utils.py,sha256=dtLRJlIpp5Seh8hyb5fcN88-SH7Vsg5uLK1p3ftQdP
 monai/transforms/meta_utility/__init__.py,sha256=s9djSd6kvViPnFvMR11Dgd30Lv4oY6FaPJr4ZZJZLq0,573
 monai/transforms/meta_utility/dictionary.py,sha256=YqbYeZOi4cFEmEPmrw2VIpOIwre6wxYB2UGZSrf-MoM,4896
 monai/transforms/post/__init__.py,sha256=s9djSd6kvViPnFvMR11Dgd30Lv4oY6FaPJr4ZZJZLq0,573
-monai/transforms/post/array.py,sha256=Btv9zElhzHpGAJSGp6N49mXZCI_DeVlB3gXY0Ue00_k,44998
+monai/transforms/post/array.py,sha256=06Dfd_6cf-VJneet7WwbxFFlJEhYh365xu3fkcvGTws,45042
 monai/transforms/post/dictionary.py,sha256=pq4Oh3GoDcS6sjUkLvHzYmySxuxzVW7grjogFuRsUsA,43042
 monai/transforms/regularization/__init__.py,sha256=s9djSd6kvViPnFvMR11Dgd30Lv4oY6FaPJr4ZZJZLq0,573
 monai/transforms/regularization/array.py,sha256=yJbvs0-ElS7uK8jEZzYOL-nW2wizXvwni77s1pR7qvk,8036
@@ -409,8 +409,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.dev2430.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-monai_weekly-1.4.dev2430.dist-info/METADATA,sha256=NGO426YBM0t6l0tAR8nzoxySiy59z7D8s9J8LYc_ZQ8,10953
-monai_weekly-1.4.dev2430.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
-monai_weekly-1.4.dev2430.dist-info/top_level.txt,sha256=UaNwRzLGORdus41Ip446s3bBfViLkdkDsXDo34J2P44,6
-monai_weekly-1.4.dev2430.dist-info/RECORD,,
+monai_weekly-1.4.dev2431.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+monai_weekly-1.4.dev2431.dist-info/METADATA,sha256=RQqh6NocBMeoO3k6i4D9NlwSrif431KY-e92S9I174k,10953
+monai_weekly-1.4.dev2431.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+monai_weekly-1.4.dev2431.dist-info/top_level.txt,sha256=UaNwRzLGORdus41Ip446s3bBfViLkdkDsXDo34J2P44,6
+monai_weekly-1.4.dev2431.dist-info/RECORD,,

{monai_weekly-1.4.dev2430.dist-info → monai_weekly-1.4.dev2431.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (71.1.0)
+Generator: setuptools (72.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any