perf(flux2): optimize cache locking in Klein encoder to fix #7513 - #8863
Merged
lstein merged 7 commits intoMar 7, 2026
Merged
Conversation
girlyoulookthebest
requested review from
JPPhoto,
blessedcoolant,
dunkeroni and
lstein
as code owners
February 8, 2026 09:16
lstein
reviewed
Feb 26, 2026
lstein
left a comment
Collaborator
There was a problem hiding this comment.
I've been using this PR for a few days now without encountering any issues. As soon as @Pfannkuchensack change request is implemented I think it is good to go.
Collaborator
|
@girlyoulookthebest Please update the version of the fixed node as requested by @Pfannkuchensack . Then I can go ahead and merge your fix into the main branch. |
Contributor
Author
Version has been updated as requested. |
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
Addresses a race condition in the ModelCache where models are evicted prematurely on low-VRAM systems (Issue #7513).
Refactored invoke() to hold a single ExitStack for the entire duration of the node's execution. This ensures the Text Encoder remains locked in RAM while the conditioning data is being saved.
Reordered the loading sequence in _encode_prompt. The Text Encoder is now locked immediately upon retrieval, closing the window where it could be evicted while the Tokenizer is being fetched.
Related Issues / Discussions
Issue #7513
QA Instructions
Merge Plan
Safe to merge immediately. This is an architectural optimization restricted to the flux2_klein_text_encoder node and does not affect other pipelines.
Checklist
What's Newcopy (if doing a release after this PR)