[Diffusion] Disable packed QKV for FLUX & Z-Image#16038
Conversation
Summary of ChangesHello @BBuf, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed! This pull request refactors the attention mechanism for the FLUX and Z-Image models by decoupling the Query, Key, and Value (QKV) projections. Previously, these were handled by a single fused QKV layer, which led to performance degradation due to inefficient CUDA kernel operations involving uncontiguous memory concatenation. By separating these projections into distinct linear layers, the aim is to eliminate this bottleneck and improve overall model performance. Highlights
🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console. Using Gemini Code AssistThe full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips. Invoking Gemini You can request assistance from Gemini at any point by creating a comment using either
Customization To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a Limitations & Feedback Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here. You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension. Footnotes
|
There was a problem hiding this comment.
Code Review
This pull request disables packed QKV projections for FLUX, FLUX-2, and Z-Image models to improve performance by avoiding an inefficient uncontiguous concat kernel. The changes involve updating model configurations to remove packed parameter mappings and modifying the model implementations to use separate linear layers for query, key, and value projections instead of a single fused layer. The modifications are consistent across all affected models and correctly implement the intended change. I've suggested a minor refactoring to improve code organization by moving a helper function into its associated class for better encapsulation. Otherwise, the changes look good.
|
/tag-and-rerun-ci |
Motivation
Refer to #15812
Pack qkv will cause a uncontiguous concat kernel, which is a not efficient cuda kernel and caused performance drop.
Modifications
Accuracy Tests
Benchmarking and Profiling
Checklist