Prebuilt: repin #25731 and #70 onto post-squash heads - #103
Merged
Conversation
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.
The nightly has been failing in
Resolve tagsince upstream squash-merged Kimi K3, so no prebuilt has been produced. Two pins needed moving.What was failing
ggml-org#25731(TML Inkling) was pinned to0a9841fa, which no longer merges onto the base tag once#24423is applied before it. Two of its four conflicts were real:unslothai#70(Kimi K3 vision) was pinned to06d2326a, whose history carries the pre-squash snapshot ofggml-org#26185. Upstream merged that PR on 2026-08-15 as squashad1de39e, and a squash is not an ancestor of the pinned commit, so the merge re-applied the whole text side on top of a base that already had it:This is exactly the case the
_docin this file warns about.What changed
Both PRs have been reconciled with current upstream, so this only moves the pins:
ggml-org#257310a9841fac44c9a11unslothai#7006d2326aedfd4c1a#25731merged current master in.#70was rebased onto master, which drops the duplicated text-side work and leaves only our delta, +209/-3 across 9 files: the MoonViT-3d vision tower, the full-size loading fixes and theSSM_A_NOSCANplacement fix.conversion/base.pyfell out of that delta because upstream tookrepack_mxfp4_blocksas aModelBasestatic method.#91and#95are unchanged.#91stays listed: it is merged upstream but its pin is still not an ancestor of the base tag, so it is contributing content.Verification
Replayed the
Resolve tagmerge loop locally against baseb10456with the realscripts/unsloth/additive_merge.py:Both reconciled branches were built with CUDA on B200 and tested before pinning.
#25731:test-llama-archs,test-chat,test-flash-attn-bias,test-flash-attn-generic-hashall pass, andtest-backend-ops -o FLASH_ATTN_EXT_BANDEDreports 13/13 on CUDA0.#70:test-llama-archsandtest-chatpass.One note for whoever touches this next: the new
#70pin sits 14 commits pastb10456, since it is rebased on master rather than on the tag. The mix therefore carries a little upstream code that has not been through the 6 hour aging window.