Skip to content

Move IterationEvents into workflow #2299

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.

Sign up for GitHub

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

Merged
Nic-Ma merged 4 commits into from
Jun 3, 2021
Merged

Move IterationEvents into workflow #2299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
42a45e0
Merge pull request #19 from Project-MONAI/master
Nic-Ma Feb 1, 2021
cd16a13
Merge pull request #32 from Project-MONAI/master
Nic-Ma Feb 24, 2021
405ef89
Merge pull request #118 from Project-MONAI/dev
Nic-Ma Jun 3, 2021
486b150
[DLMED] move IterationEvents into workflow
Nic-Ma Jun 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions monai/engines/evaluator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,7 @@ def __init__(
val_handlers=val_handlers,
amp=amp,
mode=mode,
# add the iteration events
event_names=[IterationEvents] if event_names is None else event_names + [IterationEvents],
event_names=event_names,
event_to_attr=event_to_attr,
)

Expand Down Expand Up @@ -306,8 +305,7 @@ def __init__(
val_handlers=val_handlers,
amp=amp,
mode=mode,
# add the iteration events
event_names=[IterationEvents] if event_names is None else event_names + [IterationEvents],
event_names=event_names,
event_to_attr=event_to_attr,
)

Expand Down
3 changes: 1 addition & 2 deletions monai/engines/trainer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,7 @@ def __init__(
additional_metrics=additional_metrics,
handlers=train_handlers,
amp=amp,
# add the iteration events
event_names=[IterationEvents] if event_names is None else event_names + [IterationEvents],
event_names=event_names,
event_to_attr=event_to_attr,
)

Expand Down
16 changes: 7 additions & 9 deletions monai/engines/workflow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,16 +137,14 @@ def set_sampler_epoch(engine: Engine):
self.prepare_batch = prepare_batch
self.amp = amp

if event_names is not None:
if not isinstance(event_names, list):
event_names = [IterationEvents] if event_names is None else event_names + [IterationEvents]
for name in event_names:
if isinstance(name, str):
self.register_events(name, event_to_attr=event_to_attr)
elif issubclass(name, EventEnum):
self.register_events(*name, event_to_attr=event_to_attr)
else:
raise ValueError("event_names must be a list or string or EventEnum.")
Comment thread
Nic-Ma marked this conversation as resolved.
for name in event_names:
if isinstance(name, str):
self.register_events(name, event_to_attr=event_to_attr)
elif issubclass(name, EventEnum):
self.register_events(*name, event_to_attr=event_to_attr)
else:
raise ValueError("event_names must be a list or string or EventEnum.")

if post_transform is not None:
self._register_post_transforms(post_transform)
Expand Down