unsloth: pin ggml-org#27941, #152 and #154 - #163
Merged
Conversation
ggml-org#27941 at 02eb201, no longer a draft and MERGEABLE upstream. It fixes four qwen4exp correctness defects and is the only account of the Flash-Next reporter who is on Vulkan only, where the allocator variable is never set. The previous pin PR #148 carried the stale 8161d11 and is closed. #152 at 258345e and #154 at 31e432e both merge onto b10708 on their own. #137 is already pinned at 4e1865e, which is still its head, so no change. #142 and #144 are NOT pinned here: both predate an upstream refactor that folded lazy_mode and model_shared into a lazy struct, so they conflict on src/llama.cpp and src/llama-model-loader.cpp against b10708. b10708 has 'ml.lazy.mode = params.lazy_mode' where those branches still write 'ml.lazy_mode' and 'ml.model_shared'. They need rebasing onto current upstream before they can be pinned; pinning them now would fail the resolve.
Codex Review SummaryThis comment shows the latest Codex review activity on this pull request.
ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings. |
added 3 commits
August 31, 2026 10:53
The PR moved on at 10:44Z, after 02eb201 was pinned. Verified to merge onto the current base tag: 6 files changed, 480 insertions, 138 deletions.
#144 rebased onto b10709 at 6fc8df1. Two of its nine commits were dropped rather than carried: 'qwen4exp: fix QSA correctness defects and harden metadata loading' and the comment tidy on top of it. That work is what ggml-org#27941 supersedes, and keeping both copies is what made the two pins conflict in llama-kv-cells.h and llama-memory-hybrid-idx.cpp. Listed after ggml-org#27941 so the upstream version of that work lands first. #142 is deliberately NOT pinned: its single commit is byte-identical to #144's c7bd6f2 apart from the lazy API spelling, so #144 already contains it and pinning both would apply the same change twice. Verified: b10709 + ggml-org#27941 + #144 merges clean, 24 files, +612/-94.
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.
Overview
Adds three pins: ggml-org#27941, #152 and #154.
02eb201dMERGEABLEupstream. Replaces the stale8161d117that closed PR #148 carried258345efb10708on its own31e432e7b10708on its own#137 needs no change. It is already pinned at
4e1865e3, which is still its head.Why ggml-org#27941 matters here
It fixes four
qwen4expcorrectness defects, and it is the only account of the one Flash-Next reporter the unified-memory work could not explain: edsonmedina, who says "I only use Vulkan", where Studio never sets the allocator variable. Two of the defects need no AMD involvement at all:nparameter.--kv-unifieda block could be pooled from another sequence's cells.So Flash-Next gibberish has two independent causes stacked on one model, which is why the workarounds in that thread contradict each other. The AMD pins fix one of them; this fixes the other.
#142 and #144 are deliberately NOT pinned
Both conflict against
b10708onsrc/llama.cppandsrc/llama-model-loader.cpp, and it is a real semantic conflict rather than a textual one. Upstream foldedlazy_modeandmodel_sharedinto alazystruct:Both branches predate that refactor. Pinning them as they stand would fail the resolve and take every pin after them down with it, since the preflight stops at the first conflict. They need rebasing onto current upstream first, which is a code change in MTP paths and wants its own review rather than being smuggled through a pin update.
Verification
Each new pin was merged onto
b10708individually before being listed:The full chain is left to the preflight, which resolves some overlaps with
additive_merge.pyand is the authority; a plaingit mergereplay is not equivalent.