Skip to content

model : register t_layer_inp for qwen3next - #25141

Merged
ruixiang63 merged 2 commits into
ggml-org:masterfrom
jschmied:patch-2
Jun 30, 2026
Merged

model : register t_layer_inp for qwen3next#25141
ruixiang63 merged 2 commits into
ggml-org:masterfrom
jschmied:patch-2

Conversation

@jschmied

@jschmied jschmied commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

Overview

This fixes speculative decoding support for qwen3next.

qwen3next graphs did not set res->t_layer_inp[il], so drafters that extract target hidden states, such as DFlash and EAGLE3, abort at runtime:

llama-graph.cpp:1244: GGML_ASSERT(t_layer_inp[il] != nullptr && "layer input tensor is null") failed

Requirements

Fix DFLASH for qwen-coder-next
@jschmied
jschmied requested a review from CISC as a code owner June 29, 2026 17:58
@github-actions github-actions Bot added the model Model specific label Jun 29, 2026
@ggml-gh-bot

This comment was marked as resolved.

@jschmied

Copy link
Copy Markdown
Contributor Author

@jschmied

jschmied commented Jun 29, 2026

Copy link
Copy Markdown
Contributor Author

Commit message was AI generated, code was manually checked & tested. DFlash was broken before and works now. See gist above.

Comment thread src/models/qwen3next.cpp
Added tensor for attention normalization in Qwen3 model.
@CISC

CISC commented Jun 29, 2026

Copy link
Copy Markdown
Member

Commit message was AI generated, code was manually checked & tested. DFlash was broken before and works now. See gist above.

Update OP to use our PR template please.

@jschmied jschmied changed the title register t_layer_inp for qwen3next (enables DFlash/EAGLE3 speculative decoding) model : register t_layer_inp for qwen3next Jun 29, 2026
@jschmied

Copy link
Copy Markdown
Contributor Author

local test run is green, dont know how to fix failing checks. Please help.

@CISC

CISC commented Jun 30, 2026

Copy link
Copy Markdown
Member

local test run is green, dont know how to fix failing checks. Please help.

Ignore them, they are unrelated, but please update your OP so that is using our PR template.

@jschmied

Copy link
Copy Markdown
Contributor Author

changed PR description, hope its better now

@ruixiang63

Copy link
Copy Markdown
Member

changed PR description, hope its better now

Please check how other PRs are formatted. You are missing "Requirements".

@jschmied

Copy link
Copy Markdown
Contributor Author

added, sorry

@ruixiang63
ruixiang63 merged commit 4f31eed into ggml-org:master Jun 30, 2026
22 of 25 checks passed
turbo-tan pushed a commit to turbo-tan/llama.cpp-tq3 that referenced this pull request Jul 1, 2026
* Fix input assignment in layer processing loop

Fix DFLASH for qwen-coder-next

* add line break

Added tensor for attention normalization in Qwen3 model.
DFveloper pushed a commit to DFveloper/aikar-engine that referenced this pull request Jul 3, 2026
* Fix input assignment in layer processing loop

Fix DFLASH for qwen-coder-next

* add line break

Added tensor for attention normalization in Qwen3 model.
LyndonBlack added a commit to LyndonBlack/llama.cpp-Ternary-1.58Bit-and-TurboQuant that referenced this pull request Jul 5, 2026
Sync with upstream (44 commits):
- DFlash speculative decoding support (ggml-org#22105, ggml-org#25110, ggml-org#25246)
- DeepSeek V4 model support (ggml-org#24162)
- MoE topk fusion for 288 experts (ggml-org#25267)
- Qwen3Next model fixes (ggml-org#25141)
- CUDA FA optimizations + Gemma E4B MTP fix
- NVFP4 support for WebGPU, AVX2 nvfp4 dot
- llama_model_ftype_name() API
- Various UI, server, and build fixes

Resolved conflicts:
- arch-fallback.h: kept Q2_0 vec_dot generic defines
- llama-kv-cache-iswa.{h,cpp}: merged upstream 2-ctor refactor with turboquant layer_type_k_cb
- llama-model-loader.cpp: adopted upstream llama_ftype_name() with Q2_0 entry preserved

Assisted-by: Hermes Agent
adrianhoehne pushed a commit to adrianhoehne/llama.cpp that referenced this pull request Jul 5, 2026
* Fix input assignment in layer processing loop

Fix DFLASH for qwen-coder-next

* add line break

Added tensor for attention normalization in Qwen3 model.
zommiommy pushed a commit to zommiommy/llama.cpp that referenced this pull request Aug 18, 2026
* Fix input assignment in layer processing loop

Fix DFLASH for qwen-coder-next

* add line break

Added tensor for attention normalization in Qwen3 model.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

model Model specific

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants