clip: move model cgraphs into their own files#17965
Merged
ngxson merged 7 commits intoggml-org:masterfrom Dec 12, 2025
Merged
Conversation
Contributor
Author
|
Test results: |
ggerganov
approved these changes
Dec 12, 2025
Member
There was a problem hiding this comment.
The filenaming convention is to use dashes instead of underscores for C++ source files
sfallah
added a commit
to sfallah/llama.cpp
that referenced
this pull request
Dec 13, 2025
Anico2
added a commit
to Anico2/llama.cpp
that referenced
this pull request
Jan 15, 2026
* clip: move model cgraphs into their own files * more explicit enums * fix linux build * fix naming * missing headers * nits: add comments for contributors
blime4
referenced
this pull request
in blime4/llama.cpp
Feb 5, 2026
* clip: move model cgraphs into their own files * more explicit enums * fix linux build * fix naming * missing headers * nits: add comments for contributors
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.
Some models like deepseek-ocr (#17400), gemma3n (#17961) and LFM2-audio (#17694) adds quite a lot of code into
clip.cppmaking it hard to track changes.This PR moves cgraph builder of all vision/audio models into their own file, mirroring the recent refactoring in
libllamaby @pwilkinMigration guide for pending PRs
mtmd/models/your_model.cppbuild_*()function fromclip.cppinto here)NOTE: You won't be able to access
clip_ctxdirectly from here. However, you can add custom fields intoclip_graphand modify its constructor insideclip.cppto copy fields intoclip_graphmodels.hclip_image_build_graph()inclip.cppto use the new cgraph