monai-weekly 1.4.dev2438__tar.gz → 1.4.dev2440__tar.gz

{monai_weekly-1.4.dev2438/monai_weekly.egg-info → monai_weekly-1.4.dev2440}/PKG-INFO

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

{monai_weekly-1.4.dev2438 → monai_weekly-1.4.dev2440}/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__ = "fa1c1af79ef5387434f2a76744f75b5aaca09f0b"
+__commit_id__ = "76ef9f40c8da626928238c91eacddc789b0b4530"

{monai_weekly-1.4.dev2438 → monai_weekly-1.4.dev2440}/monai/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2024-09-22T02:28:25+0000",
+ "date": "2024-10-06T02:29:02+0000",
  "dirty": false,
  "error": null,
- "full-revisionid": "d85038e6acf92febeacfc53463a7e70e35d82670",
- "version": "1.4.dev2438"
+ "full-revisionid": "c2bfe29203f3a82b689d3f1d5334e484f6fbb1a6",
+ "version": "1.4.dev2440"
 }
 '''  # END VERSION_JSON
 

{monai_weekly-1.4.dev2438 → monai_weekly-1.4.dev2440}/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.dev2438 → monai_weekly-1.4.dev2440}/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:
@@ -261,13 +263,11 @@ 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:
-    """
-    Config information of the PyTorch ignite package.
-
-    """
+    """Deprecated Import of IgniteInfo enum, which was moved to `monai.utils.enums.IgniteInfo`."""
 
-    OPT_IMPORT_VERSION = "0.4.4"
+    OPT_IMPORT_VERSION = _IgniteInfo.OPT_IMPORT_VERSION
 
 
 if __name__ == "__main__":

{monai_weekly-1.4.dev2438 → monai_weekly-1.4.dev2440}/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.dev2438 → monai_weekly-1.4.dev2440}/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.dev2438 → monai_weekly-1.4.dev2440}/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.dev2438 → monai_weekly-1.4.dev2440}/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.dev2438 → monai_weekly-1.4.dev2440}/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.dev2438 → monai_weekly-1.4.dev2440}/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.dev2438 → monai_weekly-1.4.dev2440}/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.dev2438 → monai_weekly-1.4.dev2440}/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.dev2438 → monai_weekly-1.4.dev2440}/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.dev2438 → monai_weekly-1.4.dev2440}/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.dev2438 → monai_weekly-1.4.dev2440}/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, 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")
 

{monai_weekly-1.4.dev2438 → monai_weekly-1.4.dev2440}/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.dev2438 → monai_weekly-1.4.dev2440}/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.dev2438 → monai_weekly-1.4.dev2440}/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.dev2438 → monai_weekly-1.4.dev2440}/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.dev2438 → monai_weekly-1.4.dev2440}/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.dev2438 → monai_weekly-1.4.dev2440}/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.dev2438 → monai_weekly-1.4.dev2440}/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.dev2438 → monai_weekly-1.4.dev2440}/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.dev2438 → monai_weekly-1.4.dev2440}/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.dev2438 → monai_weekly-1.4.dev2440}/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.dev2438 → monai_weekly-1.4.dev2440}/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.dev2438 → monai_weekly-1.4.dev2440}/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.dev2438 → monai_weekly-1.4.dev2440}/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.dev2438 → monai_weekly-1.4.dev2440}/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.dev2438 → monai_weekly-1.4.dev2440}/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.dev2438 → monai_weekly-1.4.dev2440}/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.dev2438 → monai_weekly-1.4.dev2440}/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.

{monai_weekly-1.4.dev2438 → monai_weekly-1.4.dev2440}/monai/networks/nets/voxelmorph.py

@@ -21,13 +21,10 @@ from monai.networks.blocks.convolutions import Convolution
 from monai.networks.blocks.upsample import UpSample
 from monai.networks.blocks.warp import DVF2DDF, Warp
 from monai.networks.layers.simplelayers import SkipConnection
-from monai.utils import alias, export
 
 __all__ = ["VoxelMorphUNet", "voxelmorphunet", "VoxelMorph", "voxelmorph"]
 
 
-@export("monai.networks.nets")
-@alias("voxelmorphunet")
 class VoxelMorphUNet(nn.Module):
     """
     The backbone network used in VoxelMorph. See :py:class:`monai.networks.nets.VoxelMorph` for more details.
@@ -340,8 +337,6 @@ class VoxelMorphUNet(nn.Module):
 voxelmorphunet = VoxelMorphUNet
 
 
-@export("monai.networks.nets")
-@alias("voxelmorph")
 class VoxelMorph(nn.Module):
     """
     A re-implementation of VoxelMorph framework for medical image registration as described in

{monai_weekly-1.4.dev2438 → monai_weekly-1.4.dev2440}/monai/transforms/adaptors.py

@@ -125,12 +125,9 @@ from __future__ import annotations
 
 from typing import Callable
 
-from monai.utils import export as _monai_export
-
 __all__ = ["adaptor", "apply_alias", "to_kwargs", "FunctionSignature"]
 
 
-@_monai_export("monai.transforms")
 def adaptor(function, outputs, inputs=None):
 
     def must_be_types_or_none(variable_name, variable, types):
@@ -215,7 +212,6 @@ def adaptor(function, outputs, inputs=None):
     return _inner
 
 
-@_monai_export("monai.transforms")
 def apply_alias(fn, name_map):
 
     def _inner(data):
@@ -236,7 +232,6 @@ def apply_alias(fn, name_map):
     return _inner
 
 
-@_monai_export("monai.transforms")
 def to_kwargs(fn):
 
     def _inner(data):

{monai_weekly-1.4.dev2438 → monai_weekly-1.4.dev2440}/monai/transforms/intensity/array.py

@@ -1411,7 +1411,7 @@ class ScaleIntensityRangePercentiles(Transform):
         else:
             img_t = self._normalize(img=img_t)
 
-        return convert_to_dst_type(img_t, dst=img)[0]
+        return convert_to_dst_type(img_t, dst=img, dtype=self.dtype)[0]
 
 
 class MaskIntensity(Transform):

{monai_weekly-1.4.dev2438 → monai_weekly-1.4.dev2440}/monai/utils/__init__.py

@@ -11,8 +11,6 @@
 
 from __future__ import annotations
 
-# have to explicitly bring these in here to resolve circular import issues
-from .aliases import alias, resolve_name
 from .component_store import ComponentStore
 from .decorators import MethodReplacer, RestartGenerator
 from .deprecate_utils import DeprecatedError, deprecated, deprecated_arg, deprecated_arg_default
@@ -40,6 +38,7 @@ from .enums import (
     GridSamplePadMode,
     HoVerNetBranch,
     HoVerNetMode,
+    IgniteInfo,
     InterpolateMode,
     JITMetadataKeys,
     LazyAttr,
@@ -109,7 +108,6 @@ from .module import (
     allow_missing_reference,
     damerau_levenshtein_distance,
     exact_version,
-    export,
     get_full_type_name,
     get_package_version,
     get_torch_version_tuple,
@@ -153,3 +151,5 @@ from .type_conversion import (
     get_numpy_dtype_from_string,
     get_torch_dtype_from_string,
 )
+
+# have to explicitly bring these in here to resolve circular import issues

{monai_weekly-1.4.dev2438 → monai_weekly-1.4.dev2440}/monai/utils/dist.py

@@ -24,7 +24,7 @@ from typing import overload
 import torch
 import torch.distributed as dist
 
-from monai.config import IgniteInfo
+from monai.utils.enums import IgniteInfo
 from monai.utils.module import min_version, optional_import
 
 idist, has_ignite = optional_import("ignite", IgniteInfo.OPT_IMPORT_VERSION, min_version, "distributed")

{monai_weekly-1.4.dev2438 → monai_weekly-1.4.dev2440}/monai/utils/enums.py

@@ -15,7 +15,6 @@ import random
 from enum import Enum
 from typing import TYPE_CHECKING
 
-from monai.config import IgniteInfo
 from monai.utils.module import min_version, optional_import
 
 __all__ = [
@@ -61,6 +60,7 @@ __all__ = [
     "BundleProperty",
     "BundlePropertyConfig",
     "AlgoKeys",
+    "IgniteInfo",
 ]
 
 
@@ -89,14 +89,6 @@ class StrEnum(str, Enum):
         return self.value
 
 
-if TYPE_CHECKING:
-    from ignite.engine import EventEnum
-else:
-    EventEnum, _ = optional_import(
-        "ignite.engine", IgniteInfo.OPT_IMPORT_VERSION, min_version, "EventEnum", as_type="base"
-    )
-
-
 class NumpyPadMode(StrEnum):
     """
     See also: https://numpy.org/doc/1.18/reference/generated/numpy.pad.html
@@ -717,6 +709,35 @@ class AdversarialKeys(StrEnum):
     DISCRIMINATOR_LOSS = "discriminator_loss"
 
 
+class OrderingType(StrEnum):
+    RASTER_SCAN = "raster_scan"
+    S_CURVE = "s_curve"
+    RANDOM = "random"
+
+
+class OrderingTransformations(StrEnum):
+    ROTATE_90 = "rotate_90"
+    TRANSPOSE = "transpose"
+    REFLECT = "reflect"
+
+
+class IgniteInfo(StrEnum):
+    """
+    Config information of the PyTorch ignite package.
+
+    """
+
+    OPT_IMPORT_VERSION = "0.4.11"
+
+
+if TYPE_CHECKING:
+    from ignite.engine import EventEnum
+else:
+    EventEnum, _ = optional_import(
+        "ignite.engine", IgniteInfo.OPT_IMPORT_VERSION, min_version, "EventEnum", as_type="base"
+    )
+
+
 class AdversarialIterationEvents(EventEnum):
     """
     Keys used to define events as used in the AdversarialTrainer.
@@ -733,15 +754,3 @@ class AdversarialIterationEvents(EventEnum):
     DISCRIMINATOR_LOSS_COMPLETED = "discriminator_loss_completed"
     DISCRIMINATOR_BACKWARD_COMPLETED = "discriminator_backward_completed"
     DISCRIMINATOR_MODEL_COMPLETED = "discriminator_model_completed"
-
-
-class OrderingType(StrEnum):
-    RASTER_SCAN = "raster_scan"
-    S_CURVE = "s_curve"
-    RANDOM = "random"
-
-
-class OrderingTransformations(StrEnum):
-    ROTATE_90 = "rotate_90"
-    TRANSPOSE = "transpose"
-    REFLECT = "reflect"

{monai_weekly-1.4.dev2438 → monai_weekly-1.4.dev2440}/monai/utils/jupyter_utils.py

@@ -24,7 +24,7 @@ from typing import TYPE_CHECKING, Any
 import numpy as np
 import torch
 
-from monai.config import IgniteInfo
+from monai.utils import IgniteInfo
 from monai.utils.module import min_version, optional_import
 
 try: