-
Notifications
You must be signed in to change notification settings - Fork 3.6k
Check parallel_devices passed through strategy is consistent with the accelerator flag
#12105
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
Merged
ananthsub
merged 3 commits into
Lightning-AI:master
from
four4fish:accl_conn/duplicated_flag
Mar 3, 2022
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -348,13 +348,21 @@ def _check_config_and_set_final_flags( | |
| else: | ||
| self._cluster_environment_flag = getattr(self._strategy_flag, "cluster_environment") | ||
|
|
||
| # TODO: RFC existing accel_conn doesn't handle this, should we add conflict check? | ||
| # eg: parallel_device is torch.device(cpu) but accelerator=gpu | ||
| if hasattr(self._strategy_flag, "parallel_devices"): | ||
| if self._strategy_flag.parallel_devices: | ||
| if self._strategy_flag.parallel_devices[0].type == "cpu": | ||
| if self._accelerator_flag and self._accelerator_flag not in ("auto", "cpu"): | ||
ananthsub marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| raise MisconfigurationException( | ||
| f"CPU parallel_devices set through {self._strategy_flag.__class__.__name__} class," | ||
| f" but accelerator set to {self._accelerator_flag}, please choose one device type" | ||
| ) | ||
| self._accelerator_flag = "cpu" | ||
| if self._strategy_flag.parallel_devices[0].type == "cuda": | ||
| if self._accelerator_flag and self._accelerator_flag not in ("auto", "gpu"): | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. when possible, we should always try optimize for minimum number of indentations to improve readability. |
||
| raise MisconfigurationException( | ||
| f"GPU parallel_devices set through {self._strategy_flag.__class__.__name__} class," | ||
| f" but accelerator set to {self._accelerator_flag}, please choose one device type" | ||
| ) | ||
four4fish marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| self._accelerator_flag = "gpu" | ||
|
|
||
| amp_type = amp_type if isinstance(amp_type, str) else None | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.