docs: FORK.md F12 temporary upstream carries (#32735, #32740), Inkling config; runbook carry procedure
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01PZz44SLQvTXMyWGio6t9DZ
This commit is contained in:
1 parent
66b3c3f72f
commit
01812e8b02
2 files changed
+80
-1
No files matched your search
@@ -58,6 +58,21 @@ git log --oneline "$OLD_BASE"..origin/master -- \
|
||||
tools/mtmd/clip.cpp tools/mtmd/mtmd.cpp common/arg.cpp tools/llama-bench/
|
||||
```
|
||||
|
||||
**Temporary upstream carries (FORK.md F12)** come first: `git log --oneline --grep '^upstream-carry'
|
||||
"$OLD_BASE"..HEAD`. For each: merged into the new upstream -> do not cherry-pick it (check that the
|
||||
merged version is the carried head or newer); still open -> re-fetch the PR head and re-carry it if
|
||||
it moved; closed -> ask the owner. To carry a PR (2026-11-22: #32735, #32740):
|
||||
```sh
|
||||
git fetch https://github.com/ggml-org/llama.cpp pull/<N>/head:pr-<N>
|
||||
git cherry-pick $(git merge-base pr-<N> HEAD)..pr-<N> # the PR's commits, oldest first; resolve by hand
|
||||
# squash them into one commit with the PR author, subject "upstream-carry #<N>: <PR title>", and a
|
||||
# body with the PR URL, the carried head and any conflict resolution (git commit-tree on the final tree)
|
||||
diff <(git diff $(git merge-base pr-<N> HEAD) pr-<N> | grep '^[+-]') <(git diff HEAD~1 HEAD | grep '^[+-]')
|
||||
```
|
||||
The last diff shows only the lines you changed while resolving conflicts (for #32740: none, the F2
|
||||
line differs only in context). Validate a carry like any compiled change (sections 5-6), plus the
|
||||
PR's own tests.
|
||||
|
||||
For each fork commit decide: still needed, needs a semantic merge, or obsolete. Examples of past
|
||||
decisions:
|
||||
- 2026-09-09: dropped the weight-pinning chain, the expert prefetch and fractional `-ncmoe` (all measured
|
||||
@@ -168,7 +183,7 @@ Open questions from that rebase:
|
||||
|
||||
**Semantic re-checks to do for every rebase, clean or not** (details in FORK.md):
|
||||
- F1: `sched_copy_experts` and its `st` struct unchanged in meaning.
|
||||
- F2: `use_mask_opt` still contains upstream's terms plus our `>= 256`.
|
||||
- F2: `use_mask_opt` still contains upstream's terms plus our `>= 256` (and `!bias &&` from #32740, carried as F12 or merged upstream).
|
||||
- F3: `build_conv_state` still emits `ggml_concat(conv_states, ggml_transpose(qkv_mixed), 0)` with
|
||||
`qkv_mixed` contiguous `[ch, n_seq_tokens, n_seqs]`; pipeline names; `types_ok` still excludes
|
||||
quantized types.
|
||||
|
||||
Reference in new issue
Block a user