fix(llama): release a vision chat handler's mtmd context on close (#2342)#2343
Open
Anai-Guo wants to merge 1 commit into
Open
fix(llama): release a vision chat handler's mtmd context on close (#2342)#2343Anai-Guo wants to merge 1 commit into
Anai-Guo wants to merge 1 commit into
Conversation
…etlen#2342) `Llama.close()` tore down the model and its context but left the chat handler's `_exit_stack` untouched, so the mtmd/clip context it built from that model was never freed. Handlers routinely outlive the `Llama` that initialized them -- callers construct one handler and reuse it across loads -- and `_init_mtmd_context()` returns early while `mtmd_ctx` is set. After the first `close()` the handler therefore kept a context bound to an already-freed model and handed it back on the next load, where it surfaces as a null `mtmd_ctx` on the C++ side. Register the handler's exit stack on the Llama's `_stack`. It unwinds LIFO, so the mtmd context is released ahead of the model teardown registered earlier in `__init__`, and `mtmd_free` resets `mtmd_ctx` to `None` so the next load re-initializes cleanly. Duck-typed on `_exit_stack`, which both `Llava15ChatHandler` and `MTMDChatHandler` (and every subclass) expose.
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
Fixes #2342.
Llama.close()unwindsself._stack, which frees the model, context and batch — but the chat handler's own_exit_stackis never touched. That stack holds themtmd_freecallback for the mtmd/clip context, so a vision handler's context is simply leaked on close.The crash in #2342 follows from that leak. A handler routinely outlives the
Llamathat initialized it (callers build one handler and reuse it across loads, as ComfyUI'skeep_model_alive: falsepath does), and_init_mtmd_context()returns early whilemtmd_ctxis set:The context was built from the first model (
mtmd_init_from_file(..., llama_model.model, ...)). Afterclose()frees that model, the handler still believes it is initialized and hands the stale context to the secondLlama— which is wheremtmd_ctxshows up null on the C++ side.Fix
Register the handler's exit stack on the Llama's
_stackin__init__:ExitStackunwinds LIFO and the model/context/batch are entered earlier in__init__, so the mtmd context is released before the model it was built from.mtmd_freesetsself.mtmd_ctx = None, so the next load re-initializes against the new model instead of reusing a dangling one.ExitStackis reusable afterclose(), so the handler stays usable._exit_stack, whichLlava15ChatHandlerandMTMDChatHandler— and therefore every subclass (Gemma4ChatHandler,Qwen25VLChatHandler,MiniCPMv26ChatHandler, …) — expose.getattrkeeps plain non-vision handlers andchat_handler=Noneunaffected.This is the upstream equivalent of the workaround the reporter applied downstream in
_drop_local_llama.Verification
I don't have the reporter's vision model to hand, so I verified the lifecycle contract directly by reproducing the object graph (handler with
_exit_stack+mtmd_ctxearly-return, Llama with an_exit_stack-based teardown) and driving two load/close cycles against it.Without the fix, the second cycle skips re-initialization and reuses the context bound to the freed model — the reported failure. With it, the trace is:
mtmd freed ahead of the model on both cycles, and a fresh context on the second load.
Scope
One file, +10/-0, no behavior change for non-vision handlers.
🤖 Generated with Claude Code