-
Notifications
You must be signed in to change notification settings - Fork 163
[BugFix][Multi-GPU] Allocate and launch MoE outputs on the input device #30
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
Open
PerryLink
wants to merge
2
commits into
deepseek-ai:main
Choose a base branch
from
PerryLink:fix/moe-output-device
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
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 |
|---|---|---|
| @@ -1,29 +1,53 @@ | ||
| import functools | ||
| from typing import Optional | ||
|
|
||
| import torch | ||
|
|
||
| _num_sms = 0 | ||
|
|
||
|
|
||
| @functools.lru_cache(maxsize=None) | ||
| def get_device_num_sms() -> int: | ||
| prop = torch.cuda.get_device_properties(torch.cuda.current_device()) | ||
| def _get_device_num_sms(device_index: int) -> int: | ||
| prop = torch.cuda.get_device_properties(device_index) | ||
| return prop.multi_processor_count | ||
|
|
||
|
|
||
| @functools.lru_cache(maxsize=None) | ||
| def _get_max_smem_per_sm(device_index: int) -> int: | ||
| prop = torch.cuda.get_device_properties(device_index) | ||
| return prop.shared_memory_per_multiprocessor | ||
|
|
||
|
|
||
| def _resolve_device_index(device_index: Optional[int]) -> int: | ||
| # Resolve before the cached call: caching under `None` would pin whichever device | ||
| # happened to be current on the first call and reuse that value on every other device. | ||
| if device_index is None: | ||
| return torch.cuda.current_device() | ||
| return device_index | ||
|
|
||
|
|
||
| def get_device_num_sms(device_index: Optional[int] = None) -> int: | ||
| # The cached key is always a concrete device index, so a second device never reuses | ||
| # the first device's value, whether or not the caller passed an index. | ||
| return _get_device_num_sms(_resolve_device_index(device_index)) | ||
|
|
||
|
|
||
| def set_num_sms(num_sms: int) -> None: | ||
| # The override below is process-global, so the bound is checked against the current | ||
| # device only; the value is not re-validated per device when it is later used. | ||
| global _num_sms | ||
| assert 0 < num_sms <= get_device_num_sms() | ||
| _num_sms = num_sms | ||
|
|
||
|
|
||
| def get_num_sms() -> int: | ||
| def get_num_sms(device_index: Optional[int] = None) -> int: | ||
| # `_num_sms` set through `set_num_sms` is a process-global override; it wins | ||
| # over the per-device value. | ||
| global _num_sms | ||
| if _num_sms == 0: | ||
| return get_device_num_sms() | ||
| return get_device_num_sms(device_index) | ||
| return _num_sms | ||
|
|
||
|
|
||
| @functools.lru_cache(maxsize=None) | ||
| def get_max_smem_per_sm() -> int: | ||
| prop = torch.cuda.get_device_properties(torch.cuda.current_device()) | ||
| return prop.shared_memory_per_multiprocessor | ||
| def get_max_smem_per_sm(device_index: Optional[int] = None) -> int: | ||
| return _get_max_smem_per_sm(_resolve_device_index(device_index)) | ||
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
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
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🔵 suggestion:
set_num_sms()still validatesnum_smsagainstget_device_num_sms()with no argument, i.e. against the current device only. On hosts with heterogeneous GPUs the process-global override may be accepted based on one device and then applied to another with fewer SMs. This is pre-existing behaviour and the PR documents the override as intentionally global, so it is not a blocker; consider a follow-up that validates against the minimum SM count over visible devices, or makes the override per-device.🤖 v5