-
Notifications
You must be signed in to change notification settings - Fork 215
ROCm: disable cache in generate and fix GPT-OSS dtype #494
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
danielhanchen
wants to merge
5
commits into
main
Choose a base branch
from
rocm-generate-cache-gpt-oss-dtype
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
Show all changes
5 commits
Select commit
Hold shift + click to select a range
db69274
ROCm: disable cache in generate and fix GPT-OSS dtype
danielhanchen e000231
ROCm: fix GPT-OSS router dtype in compiled path and harden expert dty…
danielhanchen cdb92b0
ROCm GPT-OSS: cast router inputs only on dtype mismatch
danielhanchen c312e59
Fix VLM GRPO selective-log-softmax for precomputed logits
danielhanchen 6dfd726
ROCm notebook fixes: torchcodec/audio fallbacks + CSM attention stabi…
danielhanchen 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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -760,6 +760,12 @@ def forward( | |
| self, hidden_states: torch.Tensor, router_indices=None, routing_weights=None | ||
| ) -> torch.Tensor: | ||
| """Forward using grouped_mm or loop fallback with LoRA support.""" | ||
| # Keep activations aligned with expert weights to avoid mixed-dtype matmul errors. | ||
| target_dtype = getattr(getattr(self.down_proj, "weight", None), "dtype", None) | ||
|
Collaborator
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. Are we still seeing any errors? I remember checking both fp16 and bf16 |
||
| if target_dtype is None: | ||
| target_dtype = self.dtype | ||
| if hidden_states is not None and hidden_states.dtype != target_dtype: | ||
| hidden_states = hidden_states.to(target_dtype) | ||
| # Use optimized grouped_mm if available | ||
| if _check_torch_grouped_mm_supported(): | ||
| return forward_native_grouped_mm(self, hidden_states, router_indices, routing_weights) | ||
|
|
@@ -1253,6 +1259,12 @@ def moe_forward_inference_bf16(self, hidden_states): | |
| elif hasattr(down_proj, "weight"): | ||
| down_proj = down_proj.weight | ||
|
|
||
| # Keep activations aligned with expert weights to avoid mixed-dtype | ||
| # bmm mismatches in inference kernels. | ||
| target_dtype = gate_up_proj.dtype if gate_up_proj is not None else down_proj.dtype | ||
| if hidden_states is not None and hidden_states.dtype != target_dtype: | ||
| hidden_states = hidden_states.to(target_dtype) | ||
|
|
||
| return _moe_forward_inference_bf16_kernel( | ||
| hidden_states, | ||
| routing_weights, | ||
|
|
||
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.
The
elifandelsecan be combined into single call?