Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

6028 6041 Upgrade ignite dependency to 0.4.11 #6067

Merged
merged 12 commits into from
Feb 27, 2023
2 changes: 1 addition & 1 deletion docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
29 changes: 26 additions & 3 deletions monai/engines/multi_gpu_supervised_trainer.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
)
2 changes: 1 addition & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -90,7 +90,7 @@ tensorboard =
gdown =
gdown>=4.4.0
ignite =
pytorch-ignite==0.4.10
pytorch-ignite==0.4.11
torchvision =
torchvision
itk =
Expand Down