Merge branch 'dev' into fix-vista2d

models/brats_mri_axial_slices_generative_diffusion/configs/metadata.json

@@ -1,7 +1,8 @@
 {
     "schema": "https://github.com/Project-MONAI/MONAI-extra-test-data/releases/download/0.8.1/meta_schema_20240725.json",
-    "version": "1.1.1",
+    "version": "1.1.2",
     "changelog": {
+        "1.1.2": "update issue for IgniteInfo",
         "1.1.1": "enable tensorrt",
         "1.1.0": "update to use monai 1.4, model ckpt not changed, rm GenerativeAI repo",
         "1.0.9": "update to use monai 1.3.1",

models/brats_mri_axial_slices_generative_diffusion/scripts/ldm_trainer.py

@@ -14,11 +14,10 @@
 from typing import TYPE_CHECKING, Any, Callable, Iterable, Sequence
 
 import torch
-from monai.config import IgniteInfo
 from monai.engines.utils import IterationEvents, default_metric_cmp_fn, default_prepare_batch
 from monai.inferers import Inferer, SimpleInferer
 from monai.transforms import Transform
-from monai.utils import min_version, optional_import
+from monai.utils import IgniteInfo, min_version, optional_import
 from monai.utils.enums import CommonKeys, GanKeys
 from torch.optim.optimizer import Optimizer
 from torch.utils.data import DataLoader

models/brats_mri_generative_diffusion/configs/metadata.json

@@ -1,7 +1,8 @@
 {
     "schema": "https://github.com/Project-MONAI/MONAI-extra-test-data/releases/download/0.8.1/meta_schema_20240725.json",
-    "version": "1.1.1",
+    "version": "1.1.2",
     "changelog": {
+        "1.1.2": "update issue for IgniteInfo",
         "1.1.1": "enable tensorrt",
         "1.1.0": "update to use monai 1.4, model ckpt not changed, rm GenerativeAI repo",
         "1.0.9": "update to use monai 1.3.1",

models/brats_mri_generative_diffusion/scripts/ldm_trainer.py

@@ -14,11 +14,10 @@
 from typing import TYPE_CHECKING, Any, Callable, Iterable, Sequence
 
 import torch
-from monai.config import IgniteInfo
 from monai.engines.utils import IterationEvents, default_metric_cmp_fn, default_prepare_batch
 from monai.inferers import Inferer, SimpleInferer
 from monai.transforms import Transform
-from monai.utils import min_version, optional_import
+from monai.utils import IgniteInfo, min_version, optional_import
 from monai.utils.enums import CommonKeys, GanKeys
 from torch.optim.optimizer import Optimizer
 from torch.utils.data import DataLoader

models/lung_nodule_ct_detection/configs/metadata.json

@@ -1,7 +1,8 @@
 {
     "schema": "https://github.com/Project-MONAI/MONAI-extra-test-data/releases/download/0.8.1/meta_schema_20220324.json",
-    "version": "0.6.7",
+    "version": "0.6.8",
     "changelog": {
+        "0.6.8": "update issue for IgniteInfo",
         "0.6.7": "use monai 1.4 and update large files",
         "0.6.6": "update to use monai 1.3.1",
         "0.6.5": "remove notes for trt_export in readme",

models/lung_nodule_ct_detection/scripts/detection_saver.py

@@ -14,9 +14,8 @@
 import warnings
 from typing import TYPE_CHECKING, Callable, Optional
 
-from monai.config import IgniteInfo
 from monai.handlers.classification_saver import ClassificationSaver
-from monai.utils import evenly_divisible_all_gather, min_version, optional_import, string_list_all_gather
+from monai.utils import IgniteInfo, evenly_divisible_all_gather, min_version, optional_import, string_list_all_gather
 
 from .utils import detach_to_numpy
 

models/lung_nodule_ct_detection/scripts/evaluator.py

@@ -15,11 +15,10 @@
 
 import torch
 from monai.apps.detection.networks.retinanet_detector import RetinaNetDetector
-from monai.config import IgniteInfo
 from monai.engines.evaluator import SupervisedEvaluator
 from monai.engines.utils import IterationEvents, default_metric_cmp_fn
 from monai.transforms import Transform
-from monai.utils import ForwardMode, min_version, optional_import
+from monai.utils import ForwardMode, IgniteInfo, min_version, optional_import
 from monai.utils.enums import CommonKeys as Keys
 from torch.utils.data import DataLoader
 

models/lung_nodule_ct_detection/scripts/trainer.py

@@ -14,12 +14,11 @@
 from typing import TYPE_CHECKING, Any, Callable, Dict, Iterable, List, Optional, Sequence, Tuple, Union
 
 import torch
-from monai.config import IgniteInfo
 from monai.engines.trainer import Trainer
 from monai.engines.utils import IterationEvents, default_metric_cmp_fn
 from monai.inferers import Inferer
 from monai.transforms import Transform
-from monai.utils import min_version, optional_import
+from monai.utils import IgniteInfo, min_version, optional_import
 from monai.utils.enums import CommonKeys as Keys
 from torch.optim.optimizer import Optimizer
 from torch.utils.data import DataLoader

models/maisi_ct_generative/configs/metadata.json

@@ -1,7 +1,8 @@
 {
     "schema": "https://github.com/Project-MONAI/MONAI-extra-test-data/releases/download/0.8.1/meta_schema_generator_ldm_20240318.json",
-    "version": "0.4.3",
+    "version": "0.4.4",
     "changelog": {
+        "0.4.4": "update issue for IgniteInfo",
         "0.4.3": "remove download large files, add weights_only when loading weights and add label_dict to large files",
         "0.4.2": "update train.json to fix finetune ckpt bug",
         "0.4.1": "update large files",

models/maisi_ct_generative/scripts/trainer.py

@@ -15,13 +15,12 @@
 
 import torch
 import torch.nn.functional as F
-from monai.config import IgniteInfo
 from monai.engines.trainer import Trainer
 from monai.engines.utils import IterationEvents, PrepareBatchExtraInput, default_metric_cmp_fn
 from monai.inferers import Inferer
 from monai.networks.schedulers import Scheduler
 from monai.transforms import Transform
-from monai.utils import RankFilter, min_version, optional_import
+from monai.utils import IgniteInfo, RankFilter, min_version, optional_import
 from monai.utils.enums import CommonKeys as Keys
 from torch.optim.optimizer import Optimizer
 from torch.utils.data import DataLoader

models/pathology_nuclei_classification/configs/metadata.json

@@ -1,7 +1,8 @@
 {
     "schema": "https://github.com/Project-MONAI/MONAI-extra-test-data/releases/download/0.8.1/meta_schema_20220324.json",
-    "version": "0.1.9",
+    "version": "0.2.0",
     "changelog": {
+        "0.2.0": "update issue for IgniteInfo",
         "0.1.9": "update tensorrt benchmark results",
         "0.1.8": "enable tensorrt",
         "0.1.7": "update to use monai 1.3.1",

models/pathology_nuclei_classification/scripts/handlers.py

@@ -15,8 +15,7 @@
 import numpy as np
 import torch
 import torch.distributed
-from monai.config import IgniteInfo
-from monai.utils import min_version, optional_import
+from monai.utils import IgniteInfo, min_version, optional_import
 from sklearn.metrics import classification_report
 
 Events, _ = optional_import("ignite.engine", IgniteInfo.OPT_IMPORT_VERSION, min_version, "Events")

models/pathology_nuclick_annotation/configs/metadata.json

@@ -1,7 +1,8 @@
 {
     "schema": "https://github.com/Project-MONAI/MONAI-extra-test-data/releases/download/0.8.1/meta_schema_20220324.json",
-    "version": "0.2.0",
+    "version": "0.2.1",
     "changelog": {
+        "0.2.1": "update issue for IgniteInfo",
         "0.2.0": "use monai 1.4 and update large files",
         "0.1.9": "update to use monai 1.3.1",
         "0.1.8": "add load_pretrain flag for infer",

models/pathology_nuclick_annotation/scripts/handlers.py

@@ -15,8 +15,7 @@
 import numpy as np
 import torch
 import torch.distributed
-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")
 make_grid, _ = optional_import("torchvision.utils", name="make_grid")