Prebuilt: repin Inkling after merging b10229 into the branch - #50
Merged
Conversation
The 2026-08-02 schedule (run 30767267935) failed in resolve: ggml-org#25731 (02142bb) does not merge cleanly onto b10229 + the PRs listed before it Not the pin rot that broke the previous two nights -- all four pins passed the membership gate this time. Upstream added LLM_ARCH_DEEPSEEK4 to the same fallthrough group in src/llama-arch.cpp that Inkling registers in, between b10226 and b10229, and the resolver has no conflict resolution. Fixed on the branch rather than here: b10229 is merged into add-inkling and both cases are kept, since both arches belong in that group. That also clears ggml-org#25731's own mergeable state against master, which had gone red for the same reason. No other pin moves. #48 needed nothing -- it already carries b10223 and the new arch does not collide with Kimi-K3. Verified against b10229: the four merge in order with zero unmerged paths, and the merged tree builds with -DGGML_CUDA=ON. test-chat passes and test-llama-archs -a kimi-k3 is OK on CUDA and CPU (NMSE 8.77e-08). The new Inkling head also merge-tree's clean against upstream master, which is six commits past b10229, so the next tag should resolve too.
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.
Last night's schedule (30767267935) failed in
Resolve tag:This is not the pin rot that broke 07-31 and 08-01. All four pins passed the membership gate this time, and each was still at its PR head. Straightforward upstream drift instead.
Cause
Between b10226 and b10229, upstream added
LLM_ARCH_DEEPSEEK4to the same fallthrough group insrc/llama-arch.cppthat Inkling registers in:The resolver merges pins onto the base tag and has no conflict resolution, so it refused. b10225-mix-345e1e3 published fine yesterday because the base was b10225, before
DEEPSEEK4landed.Fix
Resolved on the branch, not here.
b10229is merged intoadd-inklingand both cases are kept, since both arches belong in that group. That is the last-writer problem this repo keeps hitting: whoever merges second has to know about the first.The pin moves
02142bbc->1e6f9e4a. Nothing else changes:c3fb97241e6f9e4a02142bbcdaef2b3e04d6828b#48 needed nothing. It already carries b10223, and
DEEPSEEK4does not land anywhere Kimi-K3 registers.Side benefit: ggml-org#25731's own
mergeablestate against master had gone red for exactly this conflict. It is back totrue.Verification
Replayed the resolver's merge sequence against b10229:
Merged tree builds clean with
-DGGML_CUDA=ON -DLLAMA_BUILD_TESTS=ON.test-chatpasses;test-llama-archs -a kimi-k3is OK on CUDA and CPU (NMSE 8.77e-08).The new Inkling head also
merge-trees clean against upstream master, which is six commits past b10229, so tonight's tag should resolve without another repin.