monai-weekly 1.4.dev2437__tar.gz → 1.4.dev2439__tar.gz

{monai_weekly-1.4.dev2437/monai_weekly.egg-info → monai_weekly-1.4.dev2439}/PKG-INFO

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

{monai_weekly-1.4.dev2437 → monai_weekly-1.4.dev2439}/monai/__init__.py

@@ -79,6 +79,7 @@ if sys.version_info.major != PY_REQUIRED_MAJOR or sys.version_info.minor < PY_RE
         category=RuntimeWarning,
     )
 
+
 from .utils.module import load_submodules  # noqa: E402
 
 # handlers_* have some external decorators the users may not have installed
@@ -135,4 +136,4 @@ except BaseException:
 
     if MONAIEnvVars.debug():
         raise
-__commit_id__ = "64eee8cb9cfad9ef5bd3eaf597fef0fbe85144b4"
+__commit_id__ = "8546be098daaf6841c39a2748412bbda83929c92"

{monai_weekly-1.4.dev2437 → monai_weekly-1.4.dev2439}/monai/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2024-09-15T02:27:58+0000",
+ "date": "2024-09-29T02:29:04+0000",
  "dirty": false,
  "error": null,
- "full-revisionid": "1d72a6bbc4db84d507147fb422f9f54a939640b5",
- "version": "1.4.dev2437"
+ "full-revisionid": "1bac3a18df3d8aac051ac832fc0d7d3d3c50e350",
+ "version": "1.4.dev2439"
 }
 '''  # END VERSION_JSON
 

{monai_weekly-1.4.dev2437 → monai_weekly-1.4.dev2439}/monai/bundle/scripts.py

@@ -34,7 +34,7 @@ from monai.bundle.config_item import ConfigComponent
 from monai.bundle.config_parser import ConfigParser
 from monai.bundle.utils import DEFAULT_INFERENCE, DEFAULT_METADATA, merge_kv
 from monai.bundle.workflows import BundleWorkflow, ConfigWorkflow
-from monai.config import IgniteInfo, PathLike
+from monai.config import PathLike
 from monai.data import load_net_with_metadata, save_net_with_metadata
 from monai.networks import (
     convert_to_onnx,
@@ -45,6 +45,7 @@ from monai.networks import (
     save_state,
 )
 from monai.utils import (
+    IgniteInfo,
     check_parent_dir,
     deprecated_arg,
     ensure_tuple,

{monai_weekly-1.4.dev2437 → monai_weekly-1.4.dev2439}/monai/bundle/workflows.py

@@ -26,7 +26,7 @@ from monai.bundle.config_parser import ConfigParser
 from monai.bundle.properties import InferProperties, MetaProperties, TrainProperties
 from monai.bundle.utils import DEFAULT_EXP_MGMT_SETTINGS, EXPR_KEY, ID_REF_KEY, ID_SEP_KEY
 from monai.config import PathLike
-from monai.utils import BundleProperty, BundlePropertyConfig, deprecated_arg, deprecated_arg_default, ensure_tuple
+from monai.utils import BundleProperty, BundlePropertyConfig, deprecated_arg, ensure_tuple
 
 __all__ = ["BundleWorkflow", "ConfigWorkflow"]
 
@@ -43,7 +43,7 @@ class BundleWorkflow(ABC):
         workflow_type: specifies the workflow type: "train" or "training" for a training workflow,
             or "infer", "inference", "eval", "evaluation" for a inference workflow,
             other unsupported string will raise a ValueError.
-            default to `None` for common workflow.
+            default to `train` for train workflow.
         workflow: specifies the workflow type: "train" or "training" for a training workflow,
             or "infer", "inference", "eval", "evaluation" for a inference workflow,
             other unsupported string will raise a ValueError.
@@ -274,7 +274,6 @@ class ConfigWorkflow(BundleWorkflow):
         new_name="workflow_type",
         msg_suffix="please use `workflow_type` instead.",
     )
-    @deprecated_arg_default("workflow_type", None, "train", since="1.2", replaced="1.4")
     def __init__(
         self,
         config_file: str | Sequence[str],
@@ -284,7 +283,7 @@ class ConfigWorkflow(BundleWorkflow):
         run_id: str = "run",
         final_id: str = "finalize",
         tracking: str | dict | None = None,
-        workflow_type: str | None = None,
+        workflow_type: str | None = "train",
         workflow: str | None = None,
         properties_path: PathLike | None = None,
         **override: Any,

{monai_weekly-1.4.dev2437 → monai_weekly-1.4.dev2439}/monai/config/__init__.py

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

{monai_weekly-1.4.dev2437 → monai_weekly-1.4.dev2439}/monai/config/deviceconfig.py

@@ -45,7 +45,6 @@ __all__ = [
     "print_debug_info",
     "USE_COMPILED",
     "USE_META_DICT",
-    "IgniteInfo",
 ]
 
 
@@ -261,14 +260,5 @@ def print_debug_info(file: TextIO = sys.stdout) -> None:
     print_gpu_info(file)
 
 
-class IgniteInfo:
-    """
-    Config information of the PyTorch ignite package.
-
-    """
-
-    OPT_IMPORT_VERSION = "0.4.4"
-
-
 if __name__ == "__main__":
     print_debug_info()

{monai_weekly-1.4.dev2437 → monai_weekly-1.4.dev2439}/monai/data/image_reader.py

@@ -1359,7 +1359,7 @@ class NrrdReader(ImageReader):
         x, y = direction.shape
         affine_diam = min(x, y) + 1
         affine: np.ndarray = np.eye(affine_diam)
-        affine[:x, :y] = direction
+        affine[:x, :y] = direction.T
         affine[: (affine_diam - 1), -1] = origin  # len origin is always affine_diam - 1
         return affine
 

{monai_weekly-1.4.dev2437 → monai_weekly-1.4.dev2439}/monai/engines/evaluator.py

@@ -17,14 +17,14 @@ from typing import TYPE_CHECKING, Any, Callable, Iterable, Sequence
 import torch
 from torch.utils.data import DataLoader
 
-from monai.config import IgniteInfo, KeysCollection
+from monai.config import KeysCollection
 from monai.data import MetaTensor
 from monai.engines.utils import IterationEvents, default_metric_cmp_fn, default_prepare_batch
 from monai.engines.workflow import Workflow
 from monai.inferers import Inferer, SimpleInferer
 from monai.networks.utils import eval_mode, train_mode
 from monai.transforms import Transform
-from monai.utils import ForwardMode, ensure_tuple, min_version, optional_import
+from monai.utils import ForwardMode, IgniteInfo, ensure_tuple, min_version, optional_import
 from monai.utils.enums import CommonKeys as Keys
 from monai.utils.enums import EngineStatsKeys as ESKeys
 from monai.utils.module import look_up_option, pytorch_after

{monai_weekly-1.4.dev2437 → monai_weekly-1.4.dev2439}/monai/engines/trainer.py

@@ -18,13 +18,12 @@ import torch
 from torch.optim.optimizer import Optimizer
 from torch.utils.data import DataLoader
 
-from monai.config import IgniteInfo
 from monai.data import MetaTensor
 from monai.engines.utils import IterationEvents, default_make_latent, default_metric_cmp_fn, default_prepare_batch
 from monai.engines.workflow import Workflow
 from monai.inferers import Inferer, SimpleInferer
 from monai.transforms import Transform
-from monai.utils import AdversarialIterationEvents, AdversarialKeys, GanKeys, min_version, optional_import
+from monai.utils import AdversarialIterationEvents, AdversarialKeys, GanKeys, IgniteInfo, min_version, optional_import
 from monai.utils.enums import CommonKeys as Keys
 from monai.utils.enums import EngineStatsKeys as ESKeys
 from monai.utils.module import pytorch_after

{monai_weekly-1.4.dev2437 → monai_weekly-1.4.dev2439}/monai/engines/utils.py

@@ -18,9 +18,8 @@ from typing import TYPE_CHECKING, Any, Mapping, cast
 import torch
 import torch.nn as nn
 
-from monai.config import IgniteInfo
 from monai.transforms import apply_transform
-from monai.utils import ensure_tuple, min_version, optional_import
+from monai.utils import IgniteInfo, ensure_tuple, min_version, optional_import
 from monai.utils.enums import CommonKeys, GanKeys
 
 if TYPE_CHECKING:

{monai_weekly-1.4.dev2437 → monai_weekly-1.4.dev2439}/monai/engines/workflow.py

@@ -20,10 +20,9 @@ import torch.distributed as dist
 from torch.utils.data import DataLoader
 from torch.utils.data.distributed import DistributedSampler
 
-from monai.config import IgniteInfo
 from monai.engines.utils import IterationEvents, default_metric_cmp_fn, default_prepare_batch
 from monai.transforms import Decollated
-from monai.utils import ensure_tuple, is_scalar, min_version, optional_import
+from monai.utils import IgniteInfo, ensure_tuple, is_scalar, min_version, optional_import
 
 from .utils import engine_apply_transform
 

{monai_weekly-1.4.dev2437 → monai_weekly-1.4.dev2439}/monai/handlers/__init__.py

@@ -20,7 +20,7 @@ from .decollate_batch import DecollateBatch
 from .earlystop_handler import EarlyStopHandler
 from .garbage_collector import GarbageCollector
 from .hausdorff_distance import HausdorffDistance
-from .ignite_metric import IgniteMetric, IgniteMetricHandler
+from .ignite_metric import IgniteMetricHandler
 from .logfile_handler import LogfileHandler
 from .lr_schedule_handler import LrScheduleHandler
 from .mean_dice import MeanDice

{monai_weekly-1.4.dev2437 → monai_weekly-1.4.dev2439}/monai/handlers/checkpoint_loader.py

@@ -17,9 +17,8 @@ from typing import TYPE_CHECKING
 
 import torch
 
-from monai.config import IgniteInfo
 from monai.networks.utils import copy_model_state
-from monai.utils import min_version, optional_import
+from monai.utils import IgniteInfo, min_version, optional_import
 
 Events, _ = optional_import("ignite.engine", IgniteInfo.OPT_IMPORT_VERSION, min_version, "Events")
 Checkpoint, _ = optional_import("ignite.handlers", IgniteInfo.OPT_IMPORT_VERSION, min_version, "Checkpoint")

{monai_weekly-1.4.dev2437 → monai_weekly-1.4.dev2439}/monai/handlers/checkpoint_saver.py

@@ -17,8 +17,7 @@ import warnings
 from collections.abc import Mapping
 from typing import TYPE_CHECKING, Any
 
-from monai.config import IgniteInfo
-from monai.utils import is_scalar, min_version, optional_import
+from monai.utils import IgniteInfo, is_scalar, min_version, optional_import
 
 Events, _ = optional_import("ignite.engine", IgniteInfo.OPT_IMPORT_VERSION, min_version, "Events")
 

{monai_weekly-1.4.dev2437 → monai_weekly-1.4.dev2439}/monai/handlers/classification_saver.py

@@ -18,8 +18,8 @@ from typing import TYPE_CHECKING
 
 import torch
 
-from monai.config import IgniteInfo
 from monai.data import CSVSaver, decollate_batch
+from monai.utils import IgniteInfo
 from monai.utils import ImageMetaKey as Key
 from monai.utils import evenly_divisible_all_gather, min_version, optional_import, string_list_all_gather
 

{monai_weekly-1.4.dev2437 → monai_weekly-1.4.dev2439}/monai/handlers/decollate_batch.py

@@ -13,10 +13,10 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
-from monai.config import IgniteInfo, KeysCollection
+from monai.config import KeysCollection
 from monai.engines.utils import IterationEvents
 from monai.transforms import Decollated
-from monai.utils import min_version, optional_import
+from monai.utils import IgniteInfo, min_version, optional_import
 
 Events, _ = optional_import("ignite.engine", IgniteInfo.OPT_IMPORT_VERSION, min_version, "Events")
 if TYPE_CHECKING:

{monai_weekly-1.4.dev2437 → monai_weekly-1.4.dev2439}/monai/handlers/earlystop_handler.py

@@ -14,8 +14,7 @@ from __future__ import annotations
 from collections.abc import Callable
 from typing import TYPE_CHECKING
 
-from monai.config import IgniteInfo
-from monai.utils import min_version, optional_import
+from monai.utils import IgniteInfo, min_version, optional_import
 
 Events, _ = optional_import("ignite.engine", IgniteInfo.OPT_IMPORT_VERSION, min_version, "Events")
 EarlyStopping, _ = optional_import("ignite.handlers", IgniteInfo.OPT_IMPORT_VERSION, min_version, "EarlyStopping")

{monai_weekly-1.4.dev2437 → monai_weekly-1.4.dev2439}/monai/handlers/garbage_collector.py

@@ -14,8 +14,7 @@ from __future__ import annotations
 import gc
 from typing import TYPE_CHECKING
 
-from monai.config import IgniteInfo
-from monai.utils import min_version, optional_import
+from monai.utils import IgniteInfo, min_version, optional_import
 
 if TYPE_CHECKING:
     from ignite.engine import Engine, Events

{monai_weekly-1.4.dev2437 → monai_weekly-1.4.dev2439}/monai/handlers/ignite_metric.py

@@ -18,9 +18,8 @@ from typing import TYPE_CHECKING, Any, cast
 import torch
 from torch.nn.modules.loss import _Loss
 
-from monai.config import IgniteInfo
 from monai.metrics import CumulativeIterationMetric, LossMetric
-from monai.utils import MetricReduction, deprecated, min_version, optional_import
+from monai.utils import IgniteInfo, MetricReduction, min_version, optional_import
 
 idist, _ = optional_import("ignite", IgniteInfo.OPT_IMPORT_VERSION, min_version, "distributed")
 
@@ -153,25 +152,3 @@ class IgniteMetricHandler(Metric):
         self._name = name
         if self.save_details and not hasattr(engine.state, "metric_details"):
             engine.state.metric_details = {}  # type: ignore
-
-
-@deprecated(since="1.2", removed="1.4", msg_suffix="Use IgniteMetricHandler instead of IgniteMetric.")
-class IgniteMetric(IgniteMetricHandler):
-
-    def __init__(
-        self,
-        metric_fn: CumulativeIterationMetric | None = None,
-        loss_fn: _Loss | None = None,
-        output_transform: Callable = lambda x: x,
-        save_details: bool = True,
-        reduction: MetricReduction | str = MetricReduction.MEAN,
-        get_not_nans: bool = False,
-    ) -> None:
-        super().__init__(
-            metric_fn=metric_fn,
-            loss_fn=loss_fn,
-            output_transform=output_transform,
-            save_details=save_details,
-            reduction=reduction,
-            get_not_nans=get_not_nans,
-        )

{monai_weekly-1.4.dev2437 → monai_weekly-1.4.dev2439}/monai/handlers/logfile_handler.py

@@ -15,8 +15,7 @@ import logging
 import os
 from typing import TYPE_CHECKING
 
-from monai.config import IgniteInfo
-from monai.utils import min_version, optional_import
+from monai.utils import IgniteInfo, min_version, optional_import
 
 Events, _ = optional_import("ignite.engine", IgniteInfo.OPT_IMPORT_VERSION, min_version, "Events")
 if TYPE_CHECKING:

{monai_weekly-1.4.dev2437 → monai_weekly-1.4.dev2439}/monai/handlers/lr_schedule_handler.py

@@ -17,8 +17,7 @@ from typing import TYPE_CHECKING, Any
 
 from torch.optim.lr_scheduler import ReduceLROnPlateau, _LRScheduler
 
-from monai.config import IgniteInfo
-from monai.utils import ensure_tuple, min_version, optional_import
+from monai.utils import IgniteInfo, ensure_tuple, min_version, optional_import
 
 Events, _ = optional_import("ignite.engine", IgniteInfo.OPT_IMPORT_VERSION, min_version, "Events")
 if TYPE_CHECKING:

{monai_weekly-1.4.dev2437 → monai_weekly-1.4.dev2439}/monai/handlers/metric_logger.py

@@ -17,8 +17,7 @@ from enum import Enum
 from threading import RLock
 from typing import TYPE_CHECKING, Any
 
-from monai.config import IgniteInfo
-from monai.utils import min_version, optional_import
+from monai.utils import IgniteInfo, min_version, optional_import
 from monai.utils.enums import CommonKeys
 
 Events, _ = optional_import("ignite.engine", IgniteInfo.OPT_IMPORT_VERSION, min_version, "Events")

{monai_weekly-1.4.dev2437 → monai_weekly-1.4.dev2439}/monai/handlers/metrics_saver.py

@@ -14,9 +14,9 @@ from __future__ import annotations
 from collections.abc import Callable, Sequence
 from typing import TYPE_CHECKING
 
-from monai.config import IgniteInfo
 from monai.data import decollate_batch
 from monai.handlers.utils import write_metrics_reports
+from monai.utils import IgniteInfo
 from monai.utils import ImageMetaKey as Key
 from monai.utils import ensure_tuple, min_version, optional_import, string_list_all_gather
 

{monai_weekly-1.4.dev2437 → monai_weekly-1.4.dev2439}/monai/handlers/mlflow_handler.py

@@ -22,8 +22,7 @@ import torch
 from torch.utils.data import Dataset
 
 from monai.apps.utils import get_logger
-from monai.config import IgniteInfo
-from monai.utils import CommonKeys, ensure_tuple, min_version, optional_import
+from monai.utils import CommonKeys, IgniteInfo, ensure_tuple, min_version, optional_import
 
 Events, _ = optional_import("ignite.engine", IgniteInfo.OPT_IMPORT_VERSION, min_version, "Events")
 mlflow, _ = optional_import("mlflow", descriptor="Please install mlflow before using MLFlowHandler.")

{monai_weekly-1.4.dev2437 → monai_weekly-1.4.dev2439}/monai/handlers/nvtx_handlers.py

@@ -16,8 +16,7 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
-from monai.config import IgniteInfo
-from monai.utils import ensure_tuple, min_version, optional_import
+from monai.utils import IgniteInfo, ensure_tuple, min_version, optional_import
 
 _nvtx, _ = optional_import("torch._C._nvtx", descriptor="NVTX is not installed. Are you sure you have a CUDA build?")
 if TYPE_CHECKING:

{monai_weekly-1.4.dev2437 → monai_weekly-1.4.dev2439}/monai/handlers/parameter_scheduler.py

@@ -16,8 +16,7 @@ from bisect import bisect_right
 from collections.abc import Callable
 from typing import TYPE_CHECKING
 
-from monai.config import IgniteInfo
-from monai.utils import min_version, optional_import
+from monai.utils import IgniteInfo, min_version, optional_import
 
 if TYPE_CHECKING:
     from ignite.engine import Engine, Events

{monai_weekly-1.4.dev2437 → monai_weekly-1.4.dev2439}/monai/handlers/postprocessing.py

@@ -14,9 +14,8 @@ from __future__ import annotations
 from collections.abc import Callable
 from typing import TYPE_CHECKING
 
-from monai.config import IgniteInfo
 from monai.engines.utils import IterationEvents, engine_apply_transform
-from monai.utils import min_version, optional_import
+from monai.utils import IgniteInfo, min_version, optional_import
 
 Events, _ = optional_import("ignite.engine", IgniteInfo.OPT_IMPORT_VERSION, min_version, "Events")
 if TYPE_CHECKING:

{monai_weekly-1.4.dev2437 → monai_weekly-1.4.dev2439}/monai/handlers/probability_maps.py

@@ -17,10 +17,10 @@ from typing import TYPE_CHECKING
 
 import numpy as np
 
-from monai.config import DtypeLike, IgniteInfo
+from monai.config import DtypeLike
 from monai.data.folder_layout import FolderLayout
 from monai.utils import ProbMapKeys, min_version, optional_import
-from monai.utils.enums import CommonKeys
+from monai.utils.enums import CommonKeys, IgniteInfo
 
 Events, _ = optional_import("ignite.engine", IgniteInfo.OPT_IMPORT_VERSION, min_version, "Events")
 if TYPE_CHECKING:

{monai_weekly-1.4.dev2437 → monai_weekly-1.4.dev2439}/monai/handlers/smartcache_handler.py

@@ -13,9 +13,8 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
-from monai.config import IgniteInfo
 from monai.data import SmartCacheDataset
-from monai.utils import min_version, optional_import
+from monai.utils import IgniteInfo, min_version, optional_import
 
 Events, _ = optional_import("ignite.engine", IgniteInfo.OPT_IMPORT_VERSION, min_version, "Events")
 if TYPE_CHECKING:

{monai_weekly-1.4.dev2437 → monai_weekly-1.4.dev2439}/monai/handlers/stats_handler.py

@@ -19,8 +19,7 @@ from typing import TYPE_CHECKING, Any
 import torch
 
 from monai.apps import get_logger
-from monai.config import IgniteInfo
-from monai.utils import is_scalar, min_version, optional_import
+from monai.utils import IgniteInfo, is_scalar, min_version, optional_import
 
 Events, _ = optional_import("ignite.engine", IgniteInfo.OPT_IMPORT_VERSION, min_version, "Events")
 if TYPE_CHECKING:

{monai_weekly-1.4.dev2437 → monai_weekly-1.4.dev2439}/monai/handlers/tensorboard_handlers.py

@@ -18,8 +18,7 @@ from typing import TYPE_CHECKING, Any
 import numpy as np
 import torch
 
-from monai.config import IgniteInfo
-from monai.utils import is_scalar, min_version, optional_import
+from monai.utils import IgniteInfo, is_scalar, min_version, optional_import
 from monai.visualize import plot_2d_or_3d_image
 
 Events, _ = optional_import("ignite.engine", IgniteInfo.OPT_IMPORT_VERSION, min_version, "Events")

{monai_weekly-1.4.dev2437 → monai_weekly-1.4.dev2439}/monai/handlers/trt_handler.py

@@ -13,9 +13,8 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
-from monai.config import IgniteInfo
 from monai.networks import trt_compile
-from monai.utils import min_version, optional_import
+from monai.utils import IgniteInfo, min_version, optional_import
 
 Events, _ = optional_import("ignite.engine", IgniteInfo.OPT_IMPORT_VERSION, min_version, "Events")
 if TYPE_CHECKING:

{monai_weekly-1.4.dev2437 → monai_weekly-1.4.dev2439}/monai/handlers/utils.py

@@ -19,8 +19,8 @@ from typing import TYPE_CHECKING, Any
 import numpy as np
 import torch
 
-from monai.config import IgniteInfo, KeysCollection, PathLike
-from monai.utils import ensure_tuple, look_up_option, min_version, optional_import
+from monai.config import KeysCollection, PathLike
+from monai.utils import IgniteInfo, ensure_tuple, look_up_option, min_version, optional_import
 
 idist, _ = optional_import("ignite", IgniteInfo.OPT_IMPORT_VERSION, min_version, "distributed")
 if TYPE_CHECKING:

{monai_weekly-1.4.dev2437 → monai_weekly-1.4.dev2439}/monai/handlers/validation_handler.py

@@ -13,9 +13,8 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
-from monai.config import IgniteInfo
 from monai.engines.evaluator import Evaluator
-from monai.utils import min_version, optional_import
+from monai.utils import IgniteInfo, min_version, optional_import
 
 Events, _ = optional_import("ignite.engine", IgniteInfo.OPT_IMPORT_VERSION, min_version, "Events")
 if TYPE_CHECKING:

{monai_weekly-1.4.dev2437 → monai_weekly-1.4.dev2439}/monai/losses/dice.py

@@ -24,7 +24,7 @@ from torch.nn.modules.loss import _Loss
 from monai.losses.focal_loss import FocalLoss
 from monai.losses.spatial_mask import MaskedLoss
 from monai.networks import one_hot
-from monai.utils import DiceCEReduction, LossReduction, Weight, deprecated_arg, look_up_option, pytorch_after
+from monai.utils import DiceCEReduction, LossReduction, Weight, look_up_option, pytorch_after
 
 
 class DiceLoss(_Loss):
@@ -646,9 +646,6 @@ class DiceCELoss(_Loss):
 
     """
 
-    @deprecated_arg(
-        "ce_weight", since="1.2", removed="1.4", new_name="weight", msg_suffix="please use `weight` instead."
-    )
     def __init__(
         self,
         include_background: bool = True,
@@ -662,7 +659,6 @@ class DiceCELoss(_Loss):
         smooth_nr: float = 1e-5,
         smooth_dr: float = 1e-5,
         batch: bool = False,
-        ce_weight: torch.Tensor | None = None,
         weight: torch.Tensor | None = None,
         lambda_dice: float = 1.0,
         lambda_ce: float = 1.0,
@@ -712,7 +708,6 @@ class DiceCELoss(_Loss):
         """
         super().__init__()
         reduction = look_up_option(reduction, DiceCEReduction).value
-        weight = ce_weight if ce_weight is not None else weight
         dice_weight: torch.Tensor | None
         if weight is not None and not include_background:
             dice_weight = weight[1:]
@@ -825,9 +820,6 @@ class DiceFocalLoss(_Loss):
 
     """
 
-    @deprecated_arg(
-        "focal_weight", since="1.2", removed="1.4", new_name="weight", msg_suffix="please use `weight` instead."
-    )
     def __init__(
         self,
         include_background: bool = True,
@@ -842,7 +834,6 @@ class DiceFocalLoss(_Loss):
         smooth_dr: float = 1e-5,
         batch: bool = False,
         gamma: float = 2.0,
-        focal_weight: Sequence[float] | float | int | torch.Tensor | None = None,
         weight: Sequence[float] | float | int | torch.Tensor | None = None,
         lambda_dice: float = 1.0,
         lambda_focal: float = 1.0,
@@ -885,7 +876,6 @@ class DiceFocalLoss(_Loss):
                 [0, 1]. Defaults to None.
         """
         super().__init__()
-        weight = focal_weight if focal_weight is not None else weight
         self.dice = DiceLoss(
             include_background=include_background,
             to_onehot_y=False,
@@ -994,9 +984,6 @@ class GeneralizedDiceFocalLoss(_Loss):
         ValueError: if either `lambda_gdl` or `lambda_focal` is less than 0.
     """
 
-    @deprecated_arg(
-        "focal_weight", since="1.2", removed="1.4", new_name="weight", msg_suffix="please use `weight` instead."
-    )
     def __init__(
         self,
         include_background: bool = True,
@@ -1010,7 +997,6 @@ class GeneralizedDiceFocalLoss(_Loss):
         smooth_dr: float = 1e-5,
         batch: bool = False,
         gamma: float = 2.0,
-        focal_weight: Sequence[float] | float | int | torch.Tensor | None = None,
         weight: Sequence[float] | float | int | torch.Tensor | None = None,
         lambda_gdl: float = 1.0,
         lambda_focal: float = 1.0,
@@ -1028,7 +1014,6 @@ class GeneralizedDiceFocalLoss(_Loss):
             smooth_dr=smooth_dr,
             batch=batch,
         )
-        weight = focal_weight if focal_weight is not None else weight
         self.focal = FocalLoss(
             include_background=include_background,
             to_onehot_y=to_onehot_y,

{monai_weekly-1.4.dev2437 → monai_weekly-1.4.dev2439}/monai/networks/blocks/patchembedding.py

@@ -21,7 +21,7 @@ from torch.nn import LayerNorm
 
 from monai.networks.blocks.pos_embed_utils import build_sincos_position_embedding
 from monai.networks.layers import Conv, trunc_normal_
-from monai.utils import deprecated_arg, ensure_tuple_rep, optional_import
+from monai.utils import ensure_tuple_rep, optional_import
 from monai.utils.module import look_up_option
 
 Rearrange, _ = optional_import("einops.layers.torch", name="Rearrange")
@@ -42,9 +42,6 @@ class PatchEmbeddingBlock(nn.Module):
 
     """
 
-    @deprecated_arg(
-        name="pos_embed", since="1.2", removed="1.4", new_name="proj_type", msg_suffix="please use `proj_type` instead."
-    )
     def __init__(
         self,
         in_channels: int,
@@ -52,7 +49,6 @@ class PatchEmbeddingBlock(nn.Module):
         patch_size: Sequence[int] | int,
         hidden_size: int,
         num_heads: int,
-        pos_embed: str = "conv",
         proj_type: str = "conv",
         pos_embed_type: str = "learnable",
         dropout_rate: float = 0.0,
@@ -69,8 +65,6 @@ class PatchEmbeddingBlock(nn.Module):
             pos_embed_type: position embedding layer type.
             dropout_rate: fraction of the input units to drop.
             spatial_dims: number of spatial dimensions.
-        .. deprecated:: 1.4
-            ``pos_embed`` is deprecated in favor of ``proj_type``.
         """
 
         super().__init__()

{monai_weekly-1.4.dev2437 → monai_weekly-1.4.dev2439}/monai/networks/nets/hovernet.py

@@ -43,7 +43,7 @@ from monai.networks.blocks import UpSample
 from monai.networks.layers.factories import Conv, Dropout
 from monai.networks.layers.utils import get_act_layer, get_norm_layer
 from monai.utils.enums import HoVerNetBranch, HoVerNetMode, InterpolateMode, UpsampleMode
-from monai.utils.module import export, look_up_option
+from monai.utils.module import look_up_option
 
 __all__ = ["HoVerNet", "Hovernet", "HoVernet", "HoVerNet"]
 
@@ -409,7 +409,6 @@ class _DecoderBranch(nn.ModuleList):
         return x
 
 
-@export("monai.networks.nets")
 class HoVerNet(nn.Module):
     """HoVerNet model
 

{monai_weekly-1.4.dev2437 → monai_weekly-1.4.dev2439}/monai/networks/nets/unet.py

@@ -20,13 +20,10 @@ import torch.nn as nn
 from monai.networks.blocks.convolutions import Convolution, ResidualUnit
 from monai.networks.layers.factories import Act, Norm
 from monai.networks.layers.simplelayers import SkipConnection
-from monai.utils import alias, export
 
 __all__ = ["UNet", "Unet"]
 
 
-@export("monai.networks.nets")
-@alias("Unet")
 class UNet(nn.Module):
     """
     Enhanced version of UNet which has residual units implemented with the ResidualUnit class.