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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[fix] OSS restore state to proper device #46

Merged
merged 5 commits into from
Aug 20, 2020
Merged

[fix] OSS restore state to proper device #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5cb1445
move the restored param groups to the original device
blefaudeux Aug 20, 2020
14eb9d5
typo
blefaudeux Aug 20, 2020
539944a
black..
blefaudeux Aug 20, 2020
1553291
adding a corresponding test
blefaudeux Aug 20, 2020
7120d57
better device check
blefaudeux Aug 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion fairscale/optim/oss.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ def load_state_dict(self, state_dict: Dict[str, Any]) -> None:
self.load_local_state_dict(state_dict["state"][self.rank])

# Restore the global param_groups
self.param_groups = state_dict["param_groups"]
self.param_groups = recursive_copy_to_device(state_dict["param_groups"], non_blocking=True, device=self._device)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line too long?

Is there a test for this already? If so, should there be some assert in the test?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no test, it's a good point, I'll add that

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We follow PyTorch coding style of 120 columns:

https://github.com/pytorch/pytorch/blob/master/.flake8#L3

It is enforced here:

https://github.com/facebookresearch/fairscale/blob/master/setup.cfg#L29

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's supposed to be automatic with vscode+black, it's pure FB tooling and set to 120 cols, this formatting crap is so annoying.. I'll fix that in the next PR

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah no ok, black is happy with that indeed, it's 121 cols but for some reason this passes (same for the init above, also 121). Anyway, all good then


def add_param_group(self, param_group: dict) -> None:
super().add_param_group(param_group)
Expand Down
3 changes: 3 additions & 0 deletions tests/optim/test_oss.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@ def test_state_dict():
o.step()
assert x == torch.tensor([0.9], device=DEVICE)

# Check that the exposed param_groups are on the proper device
assert o.param_groups[0]["params"][0].device == x.device


def test_local_state_dict():
x = torch.tensor([1.0], device=DEVICE, requires_grad=True)
Expand Down