Skip to content

pr-set: repin #264 and #266, drop ggml-org#30670 (merged upstream) - #286

Open
danielhanchen wants to merge 1 commit into
masterfrom
pinset-repin-264-266-drop-30670
Open

danielhanchen wants to merge 1 commit into
masterfrom
pinset-repin-264-266-drop-30670

Conversation

@danielhanchen

Copy link
Copy Markdown
Member

Summary

The prebuilt is upstream ggml-org at an aged b#### tag plus the pins in scripts/unsloth/pr-set.json, merged in order. This updates the pin set so the scheduled build merges again:

pin change why
ggml-org#30670 (Beam) dropped merged upstream on 10-16 (01fc3aae8), already in the aged base. Pinning it again is the same change twice, which additive_merge.py refuses. This is what failed the 10-17 nightly (run 39066439326): refused common/parsers/parsers.h ... src/llama-arch.cpp: both sides add the same line(s).
#264 5bb68456b -> 194170f8c the reviewed head. Its newer commits touch the duplicate-id mul_mat_id tests that upstream ggml-org#30501 disabled with #if 0; the pin branch now merges b11627 (the oldest tag with ggml-org#30501), keeps upstream's #if 0 block verbatim and keeps only the pin's IQ1_M type inside it. PR base retargeted to base/upstream-8c2134a87.
#266 88035b0f7 -> 1eae0b577 the reviewed head (cgroup-aware populate budget, budget sampled before mapping, mountinfo subtree resolution).

feature-checks.json: the beam entry keeps its check with owner: null, since the feature now arrives through the base tag.

Evidence

llama_pinset.py audit --pr-set: 17/17 pins clean, feature-checks coverage ok.

tag merge loop pin_contract merge_checks CPU gate CUDA build test-chat test-backend-ops feature_matrix
b11717 17 pins, ggml-org#25731 and #70 additive all 17 intact clean - - - - -
b11718 (aged and newest at the time of the run) 17 pins, ggml-org#25731 and #70 additive all 17 intact clean ok ok all passed MUL_MAT 2484/2484, MUL_MAT_ID 993/993, PAD 37/37, GET_ROWS 340/340 11/11 features on CPU and on GPU

Not covered here

ROCm, Vulkan, macOS, Windows and ARM legs only run in the nightly. Tags newer than b11718 were not simulated.

@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Oct 18, 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-18T11:16:29.552119Z 84319eb PR opened
🔒 Security Review ✅ Completed 2026-10-18T11:17:09.944650Z 84319eb 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.

This branch has not been deployed

No deployments
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