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.

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

Allow Horovod teardown() to complete gracefully if exception thrown in callback setup #11752

Merged
merged 3 commits into from
Feb 5, 2022
Merged

Allow Horovod teardown() to complete gracefully if exception thrown in callback setup #11752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5311427
allow Horovod `teardown()` to complete gracefully if exception thrown…
speediedan Feb 5, 2022
65a815b
add PR to changelog
speediedan Feb 5, 2022
f53eed0
Update CHANGELOG.md
awaelchli Feb 5, 2022
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,6 +464,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).

### Fixed

- Fixed an issue where `HorovodStrategy.teardown()` did not complete gracefully if an exception was thrown during callback setup [#11752](https://github.com/PyTorchLightning/pytorch-lightning/pull/11752)

- Fixed security vulnerabilities CVE-2020-1747 and CVE-2020-14343 caused by the `PyYAML` dependency ([#11099](https://github.com/PyTorchLightning/pytorch-lightning/pull/11099))


Expand Down
6 changes: 4 additions & 2 deletions pytorch_lightning/strategies/horovod.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,10 @@ def _filter_named_parameters(model: nn.Module, optimizer: Optimizer) -> List[Tup

def teardown(self) -> None:
super().teardown()
self._exit_stack.__exit__(None, None, None)
self._exit_stack = None
# teardown may be called before `_exit_stack` is set
if self._exit_stack:
self._exit_stack.__exit__(None, None, None)
self._exit_stack = None
ananthsub marked this conversation as resolved.
Show resolved Hide resolved
# Make sure all workers have finished training before returning to the user
self.join()
if self.root_device.type == "cuda":
Expand Down