From 58da97c32d6b9587e01b802cdfe14d62b2ad9c8a Mon Sep 17 00:00:00 2001 From: YunLiu <55491388+KumoLiu@users.noreply.github.com> Date: Mon, 30 Sep 2024 13:20:22 +0800 Subject: [PATCH 1/4] fix #8120 Signed-off-by: YunLiu <55491388+KumoLiu@users.noreply.github.com> --- monai/config/__init__.py | 1 + monai/config/deviceconfig.py | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/monai/config/__init__.py b/monai/config/__init__.py index a83889aee0..c814e1f8eb 100644 --- a/monai/config/__init__.py +++ b/monai/config/__init__.py @@ -14,6 +14,7 @@ from .deviceconfig import ( USE_COMPILED, USE_META_DICT, + IgniteInfo, get_config_values, get_gpu_info, get_optional_config_values, diff --git a/monai/config/deviceconfig.py b/monai/config/deviceconfig.py index 7ac1b29919..2e8f82a323 100644 --- a/monai/config/deviceconfig.py +++ b/monai/config/deviceconfig.py @@ -23,6 +23,8 @@ import torch import monai +from monai.utils.deprecate_utils import deprecated +from monai.utils.enums import IgniteInfo as NewIgniteInfo from monai.utils.module import OptionalImportError, get_package_version, optional_import try: @@ -260,5 +262,14 @@ def print_debug_info(file: TextIO = sys.stdout) -> None: print_gpu_info(file) +@deprecated(since=1.4, removed=1.6, msg_suffix="Please use `monai.utils.enums.IgniteInfo` instead.") +class IgniteInfo: + """ + IgniteInfo enum is moved to `monai.utils.enums.IgniteInfo`. + """ + + OPT_IMPORT_VERSION = NewIgniteInfo.OPT_IMPORT_VERSION + + if __name__ == "__main__": print_debug_info() From 9db212dc08cba9ba4b4ff1da8874000cbc782760 Mon Sep 17 00:00:00 2001 From: YunLiu <55491388+KumoLiu@users.noreply.github.com> Date: Mon, 30 Sep 2024 13:40:06 +0800 Subject: [PATCH 2/4] address comments Signed-off-by: YunLiu <55491388+KumoLiu@users.noreply.github.com> --- monai/config/deviceconfig.py | 8 +++----- monai/utils/enums.py | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/monai/config/deviceconfig.py b/monai/config/deviceconfig.py index 2e8f82a323..3a26f667d5 100644 --- a/monai/config/deviceconfig.py +++ b/monai/config/deviceconfig.py @@ -24,7 +24,7 @@ import monai from monai.utils.deprecate_utils import deprecated -from monai.utils.enums import IgniteInfo as NewIgniteInfo +from monai.utils.enums import IgniteInfo as _IgniteInfo from monai.utils.module import OptionalImportError, get_package_version, optional_import try: @@ -264,11 +264,9 @@ def print_debug_info(file: TextIO = sys.stdout) -> None: @deprecated(since=1.4, removed=1.6, msg_suffix="Please use `monai.utils.enums.IgniteInfo` instead.") class IgniteInfo: - """ - IgniteInfo enum is moved to `monai.utils.enums.IgniteInfo`. - """ + """Deprecated Import of IgniteInfo enum, which was moved to `monai.utils.enums.IgniteInfo`.""" - OPT_IMPORT_VERSION = NewIgniteInfo.OPT_IMPORT_VERSION + OPT_IMPORT_VERSION = _IgniteInfo.OPT_IMPORT_VERSION if __name__ == "__main__": diff --git a/monai/utils/enums.py b/monai/utils/enums.py index 900133f2f2..1fbf3ffa05 100644 --- a/monai/utils/enums.py +++ b/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: From 754ca155a72e2e448c776d13930f69fce75da909 Mon Sep 17 00:00:00 2001 From: YunLiu <55491388+KumoLiu@users.noreply.github.com> Date: Mon, 30 Sep 2024 13:55:10 +0800 Subject: [PATCH 3/4] fix mypy Signed-off-by: YunLiu <55491388+KumoLiu@users.noreply.github.com> --- monai/config/deviceconfig.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monai/config/deviceconfig.py b/monai/config/deviceconfig.py index 3a26f667d5..9521027d12 100644 --- a/monai/config/deviceconfig.py +++ b/monai/config/deviceconfig.py @@ -262,7 +262,7 @@ def print_debug_info(file: TextIO = sys.stdout) -> None: print_gpu_info(file) -@deprecated(since=1.4, removed=1.6, msg_suffix="Please use `monai.utils.enums.IgniteInfo` instead.") +@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`.""" From ad5c493d167f745d7883ffab1b83adc46bb0bce3 Mon Sep 17 00:00:00 2001 From: YunLiu <55491388+KumoLiu@users.noreply.github.com> Date: Mon, 30 Sep 2024 14:28:15 +0800 Subject: [PATCH 4/4] add the class in the all Signed-off-by: YunLiu <55491388+KumoLiu@users.noreply.github.com> --- monai/config/deviceconfig.py | 1 + 1 file changed, 1 insertion(+) diff --git a/monai/config/deviceconfig.py b/monai/config/deviceconfig.py index 9521027d12..05842245ce 100644 --- a/monai/config/deviceconfig.py +++ b/monai/config/deviceconfig.py @@ -47,6 +47,7 @@ "print_debug_info", "USE_COMPILED", "USE_META_DICT", + "IgniteInfo", ]