From 1ce0239c3ad8c8b9dbda08305f6b184cc8e6be32 Mon Sep 17 00:00:00 2001 From: Nic Ma Date: Mon, 27 Feb 2023 13:52:36 +0800 Subject: [PATCH 1/2] [DLMED] upgrade ignite to 0.4.11 Signed-off-by: Nic Ma --- docs/requirements.txt | 2 +- requirements-dev.txt | 2 +- setup.cfg | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index b9c85466b8..e5888b85db 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,6 +1,6 @@ -f https://download.pytorch.org/whl/cpu/torch-1.12.1%2Bcpu-cp37-cp37m-linux_x86_64.whl torch>=1.8 -pytorch-ignite==0.4.10 +pytorch-ignite==0.4.11 numpy>=1.20 itk>=5.2 nibabel diff --git a/requirements-dev.txt b/requirements-dev.txt index d3297bdbe2..f8de589eef 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,6 +1,6 @@ # Full requirements for developments -r requirements-min.txt -pytorch-ignite==0.4.10 +pytorch-ignite==0.4.11 gdown>=4.4.0 scipy itk>=5.2 diff --git a/setup.cfg b/setup.cfg index cecc7e610d..2fe9b464b6 100644 --- a/setup.cfg +++ b/setup.cfg @@ -53,7 +53,7 @@ all = pillow tensorboard gdown>=4.4.0 - pytorch-ignite==0.4.10 + pytorch-ignite==0.4.11 torchvision itk>=5.2 tqdm>=4.47.0 @@ -90,7 +90,7 @@ tensorboard = gdown = gdown>=4.4.0 ignite = - pytorch-ignite==0.4.10 + pytorch-ignite==0.4.11 torchvision = torchvision itk = From 1c8aaed795582924bc933fb9291b8b13bca84f5d Mon Sep 17 00:00:00 2001 From: Nic Ma Date: Mon, 27 Feb 2023 18:59:43 +0800 Subject: [PATCH 2/2] [DLMED] deprecate create_multi_gpu_supervised_trainer Signed-off-by: Nic Ma --- monai/engines/multi_gpu_supervised_trainer.py | 29 +++++++++++++++++-- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/monai/engines/multi_gpu_supervised_trainer.py b/monai/engines/multi_gpu_supervised_trainer.py index 9bb3e9ff56..cb6bbe86cd 100644 --- a/monai/engines/multi_gpu_supervised_trainer.py +++ b/monai/engines/multi_gpu_supervised_trainer.py @@ -20,7 +20,7 @@ from monai.config import IgniteInfo from monai.engines.utils import get_devices_spec -from monai.utils import min_version, optional_import +from monai.utils import deprecated, min_version, optional_import create_supervised_trainer, _ = optional_import( "ignite.engine", IgniteInfo.OPT_IMPORT_VERSION, min_version, "create_supervised_trainer" @@ -53,6 +53,11 @@ def _default_eval_transform( return y_pred, y +@deprecated( + since="1.1", + removed="1.3", + msg_suffix=("Native ignite engine lacks support of many MONAI features, please use `SupervisedTrainer` instead."), +) def create_multigpu_supervised_trainer( net: torch.nn.Module, optimizer: Optimizer, @@ -100,10 +105,23 @@ def create_multigpu_supervised_trainer( net = DataParallel(net) return create_supervised_trainer( # type: ignore[no-any-return] - net, optimizer, loss_fn, devices_[0], non_blocking, prepare_batch, output_transform + model=net, + optimizer=optimizer, + loss_fn=loss_fn, + device=devices_[0], + non_blocking=non_blocking, + prepare_batch=prepare_batch, + output_transform=output_transform, ) +@deprecated( + since="1.1", + removed="1.3", + msg_suffix=( + "Native ignite evaluator lacks support of many MONAI features, please use `SupervisedEvaluator` instead." + ), +) def create_multigpu_supervised_evaluator( net: torch.nn.Module, metrics: dict[str, Metric] | None = None, @@ -153,5 +171,10 @@ def create_multigpu_supervised_evaluator( net = DataParallel(net) return create_supervised_evaluator( # type: ignore[no-any-return] - net, metrics, devices_[0], non_blocking, prepare_batch, output_transform + model=net, + metrics=metrics, + device=devices_[0], + non_blocking=non_blocking, + prepare_batch=prepare_batch, + output_transform=output_transform, )