Prebuilt: repin #24423 and #25731 onto carry branches - #109
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 the merge loop since the aged base moved past
b10549. Two third-party pins stopped merging:ggml-org#24423(DiffusionGemma) conflicted incommon/arg.cppggml-org#25731(TML Inkling) conflicted in five filesThe loop stops at the first conflict, so this did not just drop those two, it dropped the whole mix:
#70,#91and#95all merge cleanly and were never applied.Neither upstream PR can be repinned to a newer author commit. Both pins already equal their PR's current head, both are
mergeable_state=dirtyagainst upstream master too, and the authors have not touched them since 08-10 and 08-17. So both move to carry branches, following #99:The conflict resolutions and their verification are documented on #107 and #108. Both carries also needed one fix each for an upstream API change that did not conflict textually and so only showed up at build time:
RESIZE_ALGO_BICUBIC_PILLOWwas deleted upstream (#108), and the diffusion visual server had to move to the newcommon_jsonwrapper (#107). The second one matters here because the prebuilt workflows build the diffusion binaries best-effort and never fail the job, so it would have shipped bundles quietly missing them.A side benefit: both pins are now fork-owned, so
repin.pycan maintain them automatically when the base tag moves, instead of emittingthird-partyand asking the author to merge master.Verification
Replayed the merge loop from
unsloth-prebuilt.ymlagainst the aged base, inpr-set.jsonorder:Each pin was also probed in isolation onto the bare tag, so a clean result is not hiding an interaction between pins. All five are clean both ways.