Repin Inkling and kimi-k3 so the nightly merges onto b10289 - #68
Closed
danielhanchen wants to merge 2 commits into
Closed
Repin Inkling and kimi-k3 so the nightly merges onto b10289#68danielhanchen wants to merge 2 commits into
danielhanchen wants to merge 2 commits into
Conversation
Member
Author
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 failed since 08-05:
ggml-org#25731(Inkling) stopped merging once the base moved to b10280, and it stayed broken through b10285 and b10289.Two pins move:
ggml-org#25731:1e6f9e4a59->3fd7901cb4. The author merged master this morning, which resolves it upstream.unslothai#48:daef2b3e1b->522ef818d4. Our branch is stacked on Inkling, so the newer Inkling head conflicted with our older copy of it. I merged the new head into our branch; the only conflict was the WebGPU skip list, where our side is a superset (it adds MINIMAX_M3 and KIMI_K3 to their DEEPSEEK32/GLM_DSA), so the union is our side.ggml-org#26185deliberately stays at04d6828b2b. Its newer heada614fab10bdropscase LLM_ARCH_INKLINGand KIMI_K3 from the WebGPU skip list, so it conflicts against the pins ahead of it. Newest is not always mergeable.Verified by replaying the nightly's own merge sequence onto
b10289before opening this: