Skip to content

Prebuilt: repin the PR set on Inkling and Kimi-K3 - #47

Merged
danielhanchen merged 1 commit into
masterfrom
prset-inkling-kimi-k3
Jul 29, 2026
Merged

Prebuilt: repin the PR set on Inkling and Kimi-K3#47
danielhanchen merged 1 commit into
masterfrom
prset-inkling-kimi-k3

Conversation

@danielhanchen

Copy link
Copy Markdown
Member

Fixes the nightly. Run 30401043818 failed in Resolve tag and every build job was skipped:

CONFLICT (content): Merge conflict in src/models/models.h
CONFLICT (content): Merge conflict in tests/test-backend-ops.cpp
unslothai/llama.cpp#40 (233cedbe) does not merge cleanly onto b10165 + the PRs listed before it

#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

# PR pin
1 ggml-org#24423 DiffusionGemma c3fb9724 (unchanged)
2 ggml-org#25731 TML Inkling 79ca732e
3 #44 Kimi-K3 fixes + MoonViT-3d 23fac110
4 ggml-org#26185 Kimi-K3 text cf67f0d2

Both ggml-org#25731 and #44 were mergeable: false before this; their conflicts are fixed on their own branches rather than in a fork-side mirror, so the pins point at the real PRs.

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 on tests/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 latest resolves to right now), in list order:

--- ggml-org#24423   ok
--- ggml-org#25731   ok
--- unslothai#44     ok
--- ggml-org#26185   Already up to date.
FINAL unmerged=[]

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 in unsloth-pr-set-lint.yml were 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.

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
@danielhanchen
danielhanchen merged commit fd0b0d0 into master Jul 29, 2026
0 of 2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant