fix: honor flash attention flag in LLM text encoder attention - #1987
Merged
Merged
Conversation
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.
Summary
LLMAttention::forwardpassed a hard-codedfalseforflash_attntoggml_ext_attention_ext, so--fanever applied to LLM text encoders (Qwen, Mistral, Gemma, ...), unlike the diffusion models and VAEs that passctx->flash_attn_enabled.Without it the
[N*num_heads, n, n]attention matrix is materialized. On Vulkan devices limited to a 4 GiB storage buffer this crosses the limit at ~4096 tokens for 64-head encoders and the ops fall back to CPU (encode 11.5 s at 4065 tokens → 239 s at 4214 tokens on an RX 7900 XTX); on other backends it costs O(n²) memory.This passes
ctx->flash_attn_enabled, matchingernie_image.hpp. Behaviour without--fais unchanged. The GPT-OSS path (attention sinks) is untouched.Related Issue / Discussion
Fixes #1986
Additional Information
sd-cliwith-DSD_VULKAN=ONon master cc515a0 with this change.--fais not set.Checklist
AI-assisted: the investigation, measurements and change were done with Claude Code and reviewed by me.
🤖 Generated with Claude Code