Fix NaN attention scores on MPS from uninitialized baddbmm buffer - #14459
Open
RudraMantri123 wants to merge 1 commit into
Open
Fix NaN attention scores on MPS from uninitialized baddbmm buffer#14459RudraMantri123 wants to merge 1 commit into
RudraMantri123 wants to merge 1 commit into
Conversation
On MPS, torch.baddbmm does not honor the documented beta=0 semantics: NaN/Inf present in the input buffer propagate to the output. Both copies of get_attention_scores (Attention and AttentionModuleMixin) pass torch.empty() as that buffer, so recycled allocator pages containing NaN poison the attention scores, producing all-black images with SlicedAttnProcessor (e.g. SDXL + enable_model_cpu_offload + enable_attention_slicing). Use a buffer-free scaled bmm on MPS when there is no attention mask. This avoids relying on the beta=0 contract, skips the scores-sized buffer allocation entirely (lower peak memory on the memory-constrained devices the sliced path targets), and benchmarks ~35% faster than the baddbmm+empty path on Apple Silicon. Other backends are unchanged. Fixes huggingface#14438
RudraMantri123
force-pushed
the
fix-mps-sliced-attention-nan
branch
from
August 12, 2026 19:45
061b461 to
92bd5b5
Compare
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.
What does this PR do?
Fixes #14438 — SDXL produces all-black images on MPS when
enable_attention_slicing()is used (most visibly together withenable_model_cpu_offload()).Root cause
get_attention_scores(in bothAttentionandAttentionModuleMixin) passestorch.empty(...)totorch.baddbmmwithbeta=0, relying on the documented guarantee that the input is ignored and NaN/Inf in it are not propagated. The MPS backend violates that guarantee, so NaN garbage in recycled allocator pages leaks into the attention scores. Only the sliced attention processors reach this code path (the default processor uses SDPA), which makesenable_attention_slicing()the trigger; offload merely churns the allocator sotorch.emptyrecycles dirty pages more often — plainpipe.to("mps")+enable_attention_slicing("max")reproduces without any offload.Minimal reproduction of the underlying defect (torch 2.13.0, Apple Silicon, no diffusers):
I will file this against PyTorch separately; this PR makes diffusers robust to it.
The fix
On MPS, when there is no attention mask, compute scores with a buffer-free scaled
bmminstead ofbaddbmm:beta=0semantics and the uninitialized buffer,baddbmm+emptypath at SDXL slice dimensions on Apple Silicon,The issue's reproduction script now renders correctly across seeds (verified on M5 Pro 24GB; end-to-end images inspected).
Tests
test_get_attention_scores_no_nan_from_recycled_buffer— poisons the MPS allocator pool and exercises both implementations; fails deterministically on currentmain, passes with the fix.test_get_attention_scores_matches_cpu_reference— guards numerical equivalence with the CPU path, not just NaN-absence.Both are gated to MPS.
Notes for reviewers
AI disclosure: Claude Code assisted with debugging and drafting; all experiments were run and verified by the author on real hardware.
query * self.scale) instead of post-scaling viaalpha— mathematically identical, bounded by the CPU-parity test (fp32 exact). A zero-initialized buffer also fixes the bug but benchmarked +53% slower and keeps the allocation.torch.empty+baddbmm(beta=0)pattern exists inpipelines/kolors/text_encoder.py; left for a follow-up since I cannot end-to-end test Kolors on this hardware.Who can review?
@yiyixuxu @dg845 @asomoza — cc @pupa3066 for co-verification on M1 8GB (the memory-constrained case I can't cover).
🤖 Generated with Claude Code