Skip to content

pr-set: pin Beam (ggml-org#30670), repin glm5-next compute buffer, drop pins merged upstream; fix preflight clone - #282

Merged
danielhanchen merged 7 commits into
masterfrom
pin-model-arch-fixes-set
Oct 16, 2026
Merged

danielhanchen merged 7 commits into
masterfrom
pin-model-arch-fixes-set

Conversation

@danielhanchen

@danielhanchen danielhanchen commented Oct 16, 2026 •

Copy link
Copy Markdown
Member

Pin set update for the prebuilt (aged upstream b#### plus the pins in pr-set.json, merged in order with diff3 and additive_merge.py for pure add/add conflicts).

Changes

pin change why
ggml-org#30670 (Beam) added at 00d962b64 new architecture, pinned through the upstream PR (one squashed commit; same changed lines as #281). feature-checks.json gets a beam entry owned by ggml-org#30670 (test-llama-archs -a beam)
#243 (glm5-next compute buffer) f427abb1c to 43521db75 refused on src/models/glm5-next.cpp on every tag from b11680, after upstream ggml-org#30613 (share the k-pool input views between layers). Fixed in the pin branch with a merge of b11680: upstream's text kept, only the chunked re-pooling left in the pin (+34/-12). Old vs new pin: identical perplexity and greedy output on the generated glm5-next test model
ggml-org#30520 (Nemotron 3.5) dropped merged upstream, in every aged base
ggml-org#30616 (Muse Spark) dropped merged upstream, in every aged base; applying it a second time conflicts, which is what fails the preflight on master

The dropped pins' feature checks stay, with owner: null, since the features now arrive through the base tag.

Evidence

llama_pinset.py sim --tags window (b11680 aged through b11696 newest, 11 tags): all 18 pins merge on every tag, pin_contract 18/18 intact, merge_checks clean; nothing is refused. Rerun with ggml-org#30670 in place of #281 on b11681 and b11696: same result (ggml-org#30670 additive).

llama_pinset.py audit: 18/18 pins clean.

llama_pinset.py verify --cuda (sm_100), final pin set with ggml-org#30670:

check b11681 (aged) b11696 (newest)
CPU gate build ok ok
feature_matrix CPU ok ok
full CUDA build ok ok
test-chat all passed all passed
test-backend-ops MUL_MAT 2484/2484 (an earlier run with #281 had one q4_1 matvec failure that passed on 5 isolated reruns and a full rerun) 2484/2484
test-backend-ops MUL_MAT_ID 993/993 993/993
test-backend-ops PAD 37/37 37/37
test-backend-ops GET_ROWS 340/340 340/340
feature_matrix --gpu ok ok

Real weights: the Beam UD-IQ1_S GGUF loads and generates on CUDA with the same change (#281 build).

Preflight fix

unsloth-pin-preflight.yml cloned with --filter=blob:none. With git 2.55 on the runners a merge then fetches missing blobs, GitHub refuses them, the merge exits 128, and the silenced git merge --abort ended the step with no message (master's own preflight failed this way). It now does a full clone and tolerates a failed abort.

Not covered here: ROCm, Vulkan, macOS, Windows and ARM legs (nightly only).

@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Oct 16, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-10-16T05:51:35.669686Z a5143b3 PR opened
🔒 Security Review ✅ Completed 2026-10-16T05:52:13.086163Z a5143b3 PR opened
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: a5143b3f6c

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread scripts/unsloth/pr-set.json Outdated
"https://github.com/ggml-org/llama.cpp/pull/30520/commits/e64207bab6c2989a4ae5aa8b9e0cbe700e135ee3",
"https://github.com/ggml-org/llama.cpp/pull/30616/commits/9bbf448097779acb72cb5084c1a92cde5ff19323"
"https://github.com/ggml-org/llama.cpp/pull/30616/commits/9bbf448097779acb72cb5084c1a92cde5ff19323",
"https://github.com/unslothai/llama.cpp/pull/0/commits/2dfaee3be5fa8c01c417faeae1c6cc461f0ff32d"

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Use the actual PR number and reviewed commit

This entry points to unslothai#0 at 2dfaee3..., although the reviewed pin described by this commit is unslothai#281 at cfb9f2cec.... When the manifest is consumed, the resolver in .github/workflows/unsloth-prebuilt.yml calls gh api repos/unslothai/llama.cpp/pulls/0 and exits if that nonexistent PR cannot be fetched, so every scheduled mixed prebuild aborts before merging or building; the lint workflow fails for the same reason. Update both this URL and the matching feature owner to the real PR.

Useful? React with 👍 / 👎.

Comment thread scripts/unsloth/feature-checks.json Outdated
]
},
"muse-spark": { "owner": "ggml-org#30616", "checks": [ { "kind": "arch", "arch": "muse-spark" }, { "kind": "mtmd", "projector": "muse-spark-audio" } ] },
"beam": { "owner": "unslothai#0", "checks": [ { "kind": "arch", "arch": "beam" } ] },

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Exercise the pinned Jinja behavior in preflight

Even after correcting the pin identity, this sole architecture probe does not exercise the PR's new Jinja list-on-objects behavior. The preflight builds only test-llama-archs, test-backend-ops, and test-mtmd-impl before running this matrix, and no workflow runs the existing test-jinja target, so a merge regression in that independently shipped behavior can leave the feature gate green. Add a Jinja probe that builds and executes test-jinja (or otherwise record and test this part of the pin).

Useful? React with 👍 / 👎.

…s merged upstream

ggml-org#30520 (Nemotron 3.5) and ggml-org#30616 (Muse Spark) are merged upstream and in every
aged base the nightly can pick, so their pins are dropped and their feature checks keep running
with no owner. ggml-org#30616 applied a second time conflicted on master.

#243 is repinned to its merge of b11680, which resolves the conflict with ggml-org#30613.
#281 is repinned to its current head.
@danielhanchen danielhanchen changed the title pr-set: pin model arch fixes pr-set: pin Beam, repin glm5-next compute buffer, drop pins merged upstream Oct 16, 2026
ggml-org#30670 is the upstream PR for the same change (one squashed commit, identical changed lines).
With --filter=blob:none, git 2.55 on the runners fetches missing blobs during the merge, GitHub refuses
them, the merge exits 128, and the silenced merge --abort then ends the step with no message.
@danielhanchen danielhanchen changed the title pr-set: pin Beam, repin glm5-next compute buffer, drop pins merged upstream pr-set: pin Beam (ggml-org#30670), repin glm5-next compute buffer, drop pins merged upstream; fix preflight clone Oct 16, 2026
@danielhanchen
danielhanchen merged commit 2bea314 into master Oct 16, 2026
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