Repository navigation
Conversation
The upstream llama.cpp CPU image moved to Ubuntu resolute, whose mesa 26.0.8 already lacks the VK_KHR_external_memory_fd requirement that 0001-Revert-venus-filter-out-venus-incapable-physical-dev.patch removes. patch detects it as reversed, skips all 4 hunks and exits 1, which fails the linux/arm64 CPU image build under set -e. Skip a patch when it reverse-applies cleanly, so the same script keeps working on older base images where the patch is still needed.
Member
Author
|
Superseded by #1091, which already handles the applied Mesa patch on main. |
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.
Skips mesa patches that are already applied when building the arm64 CPU image.
The Release run failed on it: https://github.com/docker/model-runner/actions/runs/39609833130
The upstream llama.cpp image moved to Ubuntu resolute, and its mesa 26.0.8 already lacks the
VK_KHR_external_memory_fdcheck that0001-Revert-venus-…removes.patchsees it as reversed, skips all 4 hunks and exits 1.Checking with
patch -R --dry-runfirst (rather than dropping the patch) so older base images that still need it keep working. I guess we could drop it once nothing pinned is on 24.04 anymore…Ran the three patches against
apt-get source mesainubuntu:resolute(arm64): the revert one is skipped, the other two apply. I haven't rebuilt the whole image though, so a Release re-run would be the real test.