Prebuilt: repin the PR set on Inkling and Kimi-K3 - #47
Merged
Conversation
The nightly died in resolve: #40 carried MiniMax-M3 plus Inkling, upstream master now ships its own MiniMax-M3, and the two collided in src/models/models.h and tests/test-backend-ops.cpp. Every build job was skipped. Drop the two MiniMax entries (ggml-org#24523 is closed anyway, so it was already inert) and repin on the four PRs we actually want: ggml-org#24423 DiffusionGemma ggml-org#25731 TML Inkling #44 Kimi-K3 fixes + MoonViT-3d vision tower ggml-org#26185 Kimi-K3 text ggml-org#25731 and #44 both had their conflicts against current master fixed on their own branches, and #44 also carries the Inkling merge: the two archs land in the same arch/model/mtmd registries, so they cannot go in as two independent heads and one of them has to know about the other. ggml-org#26185 is last on purpose. Its head is an ancestor of #44, so by the time the resolver gets there the merge is a no-op; listed before #44 it conflicts on tests/test-llama-archs.cpp. It stays in the set so the release manifest names it. Verified locally against b10173: the four merge in this order with zero unmerged paths, and the merged tree builds with -DGGML_CUDA=OFF -DLLAMA_CURL=OFF -DLLAMA_BUILD_TESTS=ON. Assisted-by: Claude Code
This was referenced Jul 29, 2026
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.
Fixes the nightly. Run 30401043818 failed in
Resolve tagand every build job was skipped:#40 was a combined branch carrying MiniMax-M3 and Inkling. Upstream master now ships its own MiniMax-M3 (ggml-org#24908), so #40's copy collides with it. ggml-org#24523 is closed, so that entry was already inert.
New set
c3fb9724(unchanged)79ca732e23fac110cf67f0d2Both ggml-org#25731 and #44 were
mergeable: falsebefore this; their conflicts are fixed on their own branches rather than in a fork-side mirror, so the pins point at the real PRs.RPC_PROTO_PATCH_VERSION: master reset it to 0 when it went to proto 5 at 101 ops, Inkling adds an op, so it is now 1.tests/test-llama-archs.cpp, upstream replaced the skip list with DEEPSEEK32/GLM_DSA after fixing the binding alias issues (ggml-webgpu: Fix some binding alias issues to support all archs, fix recurrent-state-rollback test ggml-org/llama.cpp#25931); KIMI_K3 is appended to that list since upstream never evaluated it.llm_arch_is_hybrid,llm_arch_supports_sm_tensor,llama_model_mapping,llama_model_rope_typeandtools/mtmd/CMakeLists.txt, so they cannot go in as two independent heads.Ordering
ggml-org#26185 has to come after #44, not before it. #44 was rebased onto ggml-org#26185's head, so ggml-org#26185 is an ancestor and the resolver reports
Already up to date. Listed before #44 it conflicts ontests/test-llama-archs.cpp. It stays in the set so the release manifest names it, but note it is a strict no-op for the build and it is the one entry that can break the nightly for nothing if pwilkin force-pushes the pin away.Verification
Replayed the resolver's merge loop locally against b10173 (the tag
latestresolves to right now), in list order:The merged tree builds clean:
cmake -B build -DGGML_CUDA=OFF -DLLAMA_CURL=OFF -DLLAMA_BUILD_TESTS=ON && cmake --build build -j 28, exit 0. The lint checks inunsloth-pr-set-lint.ymlwere replayed locally and pass with no errors and no warnings: all four are open, all four pins are commits of their PR, all four pins equal their head.Supersedes #43, which dropped Inkling along with MiniMax. #40 is no longer pinned.