dflash: pass missing NVFP4 scales to attention operations - #28000
Merged
ggerganov merged 1 commit intoAug 30, 2026
Conversation
- DFlash2 NVFP4 draft models produced almost no accepted speculative tokens because the Q, K, V, and output projection scales were not passed to the corresponding graph operations.
CISC
approved these changes
Aug 30, 2026
jbooth
pushed a commit
to jbooth/llama.cpp
that referenced
this pull request
Aug 30, 2026
…8000) - DFlash2 NVFP4 draft models produced almost no accepted speculative tokens because the Q, K, V, and output projection scales were not passed to the corresponding graph operations.
fewtarius
added a commit
to fewtarius/CachyLLama
that referenced
this pull request
Sep 1, 2026
Properly merge upstream commits preserving all CachyLLama features: - CachyLLama Lightning Indexer shader + DSV4_HC pre/comb/post (kept over upstream cb30059's li_dict variant - c22b79e already removed the dup) - FA dequant-once scratch with host-RAM safety gate (q8_0/q4_0/q4_1/q5_0/q5_1) - concat_transpose shader (delta-net dim-0) - mmid_row_lists prepass + padded_N + use_row_lists (coexist with upstream's n_experts + hoist_row_ids; both push_constant fields kept in struct and mul_mm.comp / mul_mmq.comp dispatch tries row_lists first, then hoisted, then dense) - MoE expert residency tracking + observability (CLI args, fields, debug) - DFlash framework: decoder_laguna gate, embeddings_nextn post-final-layer lookup, dflash_conv/DFlash2 (selector + p_min) - DSpark (Nemotron) attn_sinks - Upstream's spec : fuse the DFlash encoder into the KV cache injection (ggml-org#27310) replaces the HEAD's two-step llama_encode + llama_decode path with a fused single llama_decode. Same encoder (fc + norm) runs inline as part of the decode graph. EAGLE3/MTP encode path (separate code in common_speculative_impl_draft_eagle3) is untouched. - Laguna-S-2.1 model - User isolation (user_id, conv_hash, slot affinity) - SSD-backed KV cache and page manager - Context checkpoint ring buffer with insertion-order eviction - --lazy-mode (upstream rename of CachyLLama's --tensor-read-lazy) - kv_unified_per_slot (upstream, additive) - nvfp4 scales to attention ops (ggml-org#28000) - quantize: row-slab stream to avoid thread starvation (ggml-org#27830) - test-save-load-state across all architectures (ggml-org#27755) - test-archs verbosity fix (ggml-org#28147) Merge conflicts resolved (see ac01c2dc6 for full details - same resolutions re-applied for the redo). Verified: - llama-server builds clean - test-save-load-state passes (38s) after rebuild - DSV4_HC_COMB shaders all pass - Pre-existing failures unchanged (minimax-m3/01 numerical tolerance, test-recurrent-state-rollback)
fewtarius
added a commit
to fewtarius/CachyLLama
that referenced
this pull request
Sep 1, 2026
Merge upstream commits preserving all CachyLLama features: - CachyLLama Lightning Indexer shader + DSV4_HC pre/comb/post (kept over upstream cb30059's li_dict variant - c22b79e already removed the dup) - FA dequant-once scratch with host-RAM safety gate (q8_0/q4_0/q4_1/q5_0/q5_1) - concat_transpose shader (delta-net dim-0) - mmid_row_lists prepass + padded_N + use_row_lists (coexist with upstream's n_experts + hoist_row_ids; both push_constant fields kept in struct and mul_mm.comp / mul_mmq.comp dispatch tries row_lists first, then hoisted, then dense) - MoE expert residency tracking + observability (CLI args, fields, debug) - DFlash framework: decoder_laguna gate, embeddings_nextn post-final-layer lookup, dflash_conv/DFlash2 (selector + p_min) - DSpark (Nemotron) attn_sinks - Upstream's spec : fuse the DFlash encoder into the KV cache injection (ggml-org#27310) replaces the HEAD's two-step llama_encode + llama_decode path with a fused single llama_decode. Same encoder (fc + norm) runs inline as part of the decode graph. EAGLE3/MTP encode path (separate code in common_speculative_impl_draft_eagle3) is untouched. - Laguna-S-2.1 model - User isolation (user_id, conv_hash, slot affinity) - SSD-backed KV cache and page manager - Context checkpoint ring buffer with insertion-order eviction - --lazy-mode (upstream rename of CachyLLama's --tensor-read-lazy) - kv_unified_per_slot (upstream, additive) - nvfp4 scales to attention ops (ggml-org#28000) - quantize: row-slab stream to avoid thread starvation (ggml-org#27830) - test-save-load-state across all architectures (ggml-org#27755) - test-archs verbosity fix (ggml-org#28147) Verified: - llama-server builds clean - test-save-load-state passes (38s) after rebuild - DSV4_HC_COMB shaders all pass - Pre-existing failures unchanged (minimax-m3/01 numerical tolerance, test-recurrent-state-rollback)
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
I tested the DFlash2 draft model provided by the https://huggingface.co/maurienne-ai/Qwen3.8-27B-DFlash2-NVFP4-RTNcal project. I found that the DFlash2 BF16 and Q8 versions performed normally, but the DFlash2 NVFP4 draft models produced almost no accepted speculative tokens because the Q, K, V, and output projection scales were not passed to the corresponding graph operations. I eventually traced the issue to a missing scale parameter pass in
dflash.cpp; adding the missing code allowed it to compile and run correctly.Overview
Pass the missing NVFP4 weight scales to the DFlash graph operations:
Without these scales, the NVFP4 draft model generated incorrect draft tokens, resulting in a near-zero acceptance rate and slower speculative decoding.
Additional information
Benchmark configuration:
Compared with ordinary decoding from the patched build, DFlash achieved speedups of 1.65x, 1.62x, and 1.93x for 128, 512, and 1024 generated tokens, respectively.
Requirements
Logs
Master PR(10689)
master pr.txt
Patched PR
after_patch.txt