-
Notifications
You must be signed in to change notification settings - Fork 503
Add support for Qwen3.5 MoE #1109
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
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
93dc123
Add support for Qwen3.5 MoE
2d0f1bc
Both Qwen3.5 MoE and Qwen3-Next should use Gemma-style RMSNorm instea…
e2b0666
Convergence test fixes
849b2f8
Fix test imports
a017ed4
Add shift_labels to loss_function calls
michaelroyzen 4ef9808
Match fp32 skip behavior for Qwen3.5 MoE (as with Qwen3-Next) and add…
7a83092
Rebase and lint
michaelroyzen 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,155 @@ | ||
| from typing import TYPE_CHECKING | ||
| from typing import List | ||
| from typing import Optional | ||
| from typing import Union | ||
|
|
||
| import torch | ||
|
|
||
| from transformers.modeling_outputs import MoeModelOutputWithPast | ||
|
|
||
| if TYPE_CHECKING: | ||
| from transformers.models.qwen3_5_moe.modeling_qwen3_5_moe import load_balancing_loss_func | ||
|
|
||
| from liger_kernel.transformers.model.loss_utils import LigerForCausalLMLoss | ||
| from liger_kernel.transformers.model.loss_utils import unpack_cross_entropy_result | ||
| from liger_kernel.transformers.model.output_classes import LigerMoeCausalLMOutputWithPast | ||
|
|
||
|
|
||
| def lce_forward( | ||
| self, | ||
| input_ids: Optional[torch.LongTensor] = None, | ||
| attention_mask: Optional[torch.Tensor] = None, | ||
| position_ids: Optional[torch.LongTensor] = None, | ||
| past_key_values: Optional[List[torch.FloatTensor]] = None, | ||
| inputs_embeds: Optional[torch.FloatTensor] = None, | ||
| labels: Optional[torch.LongTensor] = None, | ||
| use_cache: Optional[bool] = None, | ||
| output_attentions: Optional[bool] = None, | ||
| output_hidden_states: Optional[bool] = None, | ||
| output_router_logits: Optional[bool] = None, | ||
| cache_position: Optional[torch.LongTensor] = None, | ||
| logits_to_keep: Union[int, torch.Tensor] = 0, | ||
| skip_logits: Optional[bool] = None, | ||
| return_dict: Optional[bool] = None, | ||
| **kwargs, | ||
| ) -> LigerMoeCausalLMOutputWithPast: | ||
| r""" | ||
| labels (`torch.LongTensor` of shape `(batch_size, sequence_length)`, *optional*): | ||
| Labels for computing the masked language modeling loss. Indices should either be in `[0, ..., | ||
| config.vocab_size]` or -100 (see `input_ids` docstring). Tokens with indices set to `-100` are ignored | ||
| (masked), the loss is only computed for the tokens with labels in `[0, ..., config.vocab_size]`. | ||
|
|
||
| logits_to_keep (`int` or `torch.Tensor`, *optional*): | ||
| If an `int`, compute logits for the last `logits_to_keep` tokens. If `0`, calculate logits for all | ||
| `input_ids` (special case). Only last token logits are needed for generation, and calculating them only for that | ||
| token can save memory, which becomes pretty significant for long sequences or large vocabulary size. | ||
| If a `torch.Tensor`, must be 1D corresponding to the indices to keep in the sequence length dimension. | ||
| This is useful when using packed tensor format (single dimension for batch and sequence length). | ||
|
|
||
| Returns: | ||
|
|
||
| Example: | ||
|
|
||
| ```python | ||
| >>> from transformers import AutoModelForCausalLM, AutoTokenizer | ||
|
|
||
| >>> model = AutoModelForCausalLM.from_pretrained("Qwen/Qwen3.5-35B-A3B-Instruct") | ||
| >>> tokenizer = AutoTokenizer.from_pretrained("Qwen/Qwen3.5-35B-A3B-Instruct") | ||
|
|
||
| >>> prompt = "Give me a short introduction to large language model." | ||
| >>> inputs = tokenizer(prompt, return_tensors="pt") | ||
|
|
||
| >>> # Generate | ||
| >>> generate_ids = model.generate(inputs.input_ids, max_length=30) | ||
| >>> tokenizer.batch_decode(generate_ids, skip_special_tokens=True, clean_up_tokenization_spaces=False)[0] | ||
| "Hey, are you conscious? Can you talk to me?\nI'm not conscious, but I can talk to you." | ||
| ```""" | ||
| output_attentions = output_attentions if output_attentions is not None else self.config.output_attentions | ||
| output_router_logits = ( | ||
| output_router_logits if output_router_logits is not None else self.config.output_router_logits | ||
| ) | ||
| output_hidden_states = ( | ||
| output_hidden_states if output_hidden_states is not None else self.config.output_hidden_states | ||
| ) | ||
| return_dict = return_dict if return_dict is not None else self.config.use_return_dict | ||
|
|
||
| # decoder outputs consists of (dec_features, layer_state, dec_hidden, dec_attn) | ||
| outputs: MoeModelOutputWithPast = self.model( | ||
| input_ids=input_ids, | ||
| attention_mask=attention_mask, | ||
| position_ids=position_ids, | ||
| past_key_values=past_key_values, | ||
| inputs_embeds=inputs_embeds, | ||
| use_cache=use_cache, | ||
| output_attentions=output_attentions, | ||
| output_hidden_states=output_hidden_states, | ||
| output_router_logits=output_router_logits, | ||
| cache_position=cache_position, | ||
| **kwargs, | ||
| ) | ||
|
|
||
| hidden_states = outputs.last_hidden_state | ||
| # Only compute necessary logits, and do not upcast them to float if we are not computing the loss | ||
| slice_indices = slice(-logits_to_keep, None) if isinstance(logits_to_keep, int) else logits_to_keep | ||
| kept_hidden_states = hidden_states[:, slice_indices, :] | ||
|
|
||
| shift_labels = kwargs.pop("shift_labels", None) | ||
| logits = None | ||
| loss = None | ||
| token_accuracy = None | ||
| predicted_tokens = None | ||
|
|
||
| if skip_logits is None: | ||
| skip_logits = self.training and (labels is not None or shift_labels is not None) | ||
|
|
||
| if skip_logits: | ||
| result = LigerForCausalLMLoss( | ||
| hidden_states=kept_hidden_states, | ||
| lm_head_weight=self.lm_head.weight, | ||
| labels=labels, | ||
| shift_labels=shift_labels, | ||
| hidden_size=self.config.hidden_size, | ||
| **kwargs, | ||
| ) | ||
| loss, _, token_accuracy, predicted_tokens = unpack_cross_entropy_result(result) | ||
| else: # if in inference model materialize logits | ||
| logits = self.lm_head(kept_hidden_states) | ||
| if labels is not None or shift_labels is not None: | ||
| loss = self.loss_function( | ||
| logits=logits, | ||
| labels=labels, | ||
| shift_labels=shift_labels, | ||
| vocab_size=self.vocab_size, | ||
| **kwargs, | ||
| ) | ||
|
|
||
| aux_loss = None | ||
| if output_router_logits: | ||
| aux_loss = load_balancing_loss_func( | ||
| outputs.router_logits, | ||
| self.num_experts, | ||
| self.num_experts_per_tok, | ||
| attention_mask, | ||
| ) | ||
| if labels is not None: | ||
| loss += self.router_aux_loss_coef * aux_loss.to(loss.device) # make sure to reside in the same device | ||
|
|
||
| if not return_dict: | ||
| output = (logits,) + outputs[1:] | ||
| output = ((aux_loss,) + output) if aux_loss is not None else output | ||
| output = ((loss,) + output) if loss is not None else output | ||
| output = output + (token_accuracy,) if token_accuracy is not None else output | ||
| output = output + (predicted_tokens,) if predicted_tokens is not None else output | ||
| return output | ||
|
|
||
| return LigerMoeCausalLMOutputWithPast( | ||
| loss=loss, | ||
| aux_loss=aux_loss, | ||
| logits=logits, | ||
| past_key_values=outputs.past_key_values, | ||
| hidden_states=outputs.hidden_states, | ||
| attentions=outputs.attentions, | ||
| router_logits=outputs.router_logits, | ||
| token_accuracy=token_accuracy, | ||
| predicted_tokens=predicted_tokens, | ||
| ) |
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.
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.
Uh oh!
There was an error while loading. Please reload this page.