Skip to content

Fix multimodal model registrations in nnx_decoders #4320

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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
copybara-service merged 1 commit into from
Jul 1, 2026
Merged

Fix multimodal model registrations in nnx_decoders #4320

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 11 additions & 25 deletions src/maxtext/layers/nnx_decoders.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1111,38 +1111,22 @@ def get_deepseek():
DecoderBlockType.GEMMA: [gemma.GemmaDecoderLayer],
DecoderBlockType.GEMMA2: [gemma2.Gemma2DecoderLayer],
DecoderBlockType.GEMMA3: [gemma3.Gemma3DecoderLayer],
DecoderBlockType.GEMMA4: get_scannable(
gemma4.Gemma4DecoderLayer, gemma4.Gemma4ScannableBlock
),
DecoderBlockType.GEMMA4: get_scannable(gemma4.Gemma4DecoderLayer, gemma4.Gemma4ScannableBlock),
DecoderBlockType.GEMMA4_SMALL: [gemma4_small.Gemma4SmallDecoderLayer],
DecoderBlockType.GPT3: [gpt3.Gpt3DecoderLayer],
DecoderBlockType.QWEN2: [qwen2.Qwen2DecoderLayer],
DecoderBlockType.QWEN3: [qwen3.Qwen3DecoderLayer],
DecoderBlockType.QWEN3_MOE: [qwen3.Qwen3MoeDecoderLayer],
DecoderBlockType.QWEN3_CUSTOM_MOE: [
qwen3_custom.Qwen3CustomMoeDecoderLayer
],
DecoderBlockType.QWEN3_CUSTOM_MOE: [qwen3_custom.Qwen3CustomMoeDecoderLayer],
DecoderBlockType.SIMPLE: [simple_layer.SimpleDecoderLayer],
DecoderBlockType.SIMPLE_MLP: [simple_layer.SimpleMlpDecoderLayer],
DecoderBlockType.DEEPSEEK: get_deepseek(),
DecoderBlockType.DEEPSEEK4: get_scannable(
deepseek4.DeepSeek4DecoderLayer, deepseek4.DeepSeek4ScannableBlock
),
DecoderBlockType.GPT_OSS: get_scannable(
gpt_oss.GptOssDecoderLayer, gpt_oss.GptOssScannableBlock
),
DecoderBlockType.QWEN3_NEXT: get_scannable(
qwen3.Qwen3NextDecoderLayer, qwen3.Qwen3NextScannableBlock
),
DecoderBlockType.QWEN3_5: get_scannable(
qwen3_5.Qwen3_5DecoderLayer, qwen3_5.Qwen3_5ScannableBlock
),
DecoderBlockType.LLAMA4: get_scannable(
llama4.Llama4DecoderLayer, llama4.Llama4ScannableBlock
),
DecoderBlockType.OLMO3: get_scannable(
olmo3.Olmo3DecoderLayer, olmo3.Olmo3ScannableBlock
),
DecoderBlockType.DEEPSEEK4: get_scannable(deepseek4.DeepSeek4DecoderLayer, deepseek4.DeepSeek4ScannableBlock),
DecoderBlockType.GPT_OSS: get_scannable(gpt_oss.GptOssDecoderLayer, gpt_oss.GptOssScannableBlock),
DecoderBlockType.QWEN3_NEXT: get_scannable(qwen3.Qwen3NextDecoderLayer, qwen3.Qwen3NextScannableBlock),
DecoderBlockType.QWEN3_5: get_scannable(qwen3_5.Qwen3_5DecoderLayer, qwen3_5.Qwen3_5ScannableBlock),
DecoderBlockType.LLAMA4: get_scannable(llama4.Llama4DecoderLayer, llama4.Llama4ScannableBlock),
DecoderBlockType.OLMO3: get_scannable(olmo3.Olmo3DecoderLayer, olmo3.Olmo3ScannableBlock),
Comment thread
hengtaoguo marked this conversation as resolved.
}

if cfg.decoder_block not in layer_map:
Expand Down Expand Up @@ -1360,6 +1344,8 @@ def _apply_embedding(
"llama4-17b-16e",
"llama4-17b-128e",
"qwen3-omni-30b-a3b",
"qwen3-vl-2b",
"qwen3-vl-4b",
"qwen3.5-35b-a3b",
"qwen3.5-397b-a17b",
}:
Expand All @@ -1373,7 +1359,7 @@ def _apply_embedding(
raise ValueError(f"Unsupported model_name for multimodal: {cfg.model_name}")

if video_embeddings is not None and cfg.use_multimodal:
if cfg.model_name in {"qwen3-omni-30b-a3b", "qwen3.5-35b-a3b", "qwen3.5-397b-a17b"}:
if cfg.model_name in {"qwen3-omni-30b-a3b", "qwen3-vl-2b", "qwen3-vl-4b", "qwen3.5-35b-a3b", "qwen3.5-397b-a17b"}:
y = mm_utils.merge_mm_embeddings(
text_embeddings=y,
multimodal_embeddings=video_embeddings,
Expand Down
Loading