Skip to content

unsloth: repin #144 to 586b15ef, fixing a brace dropped in the rebase - #164

Merged
oobabooga merged 1 commit into
masterfrom
unsloth/fix-144-brace
Aug 31, 2026
Merged

unsloth: repin #144 to 586b15ef, fixing a brace dropped in the rebase#164
oobabooga merged 1 commit into
masterfrom
unsloth/fix-144-brace

Conversation

@danielhanchen

Copy link
Copy Markdown
Member

What broke

Run 33385736675 failed to compile on every backend that builds src/, which is all of them: CPU, Vulkan, macOS, ROCm and CUDA-legacy.

llama-model-loader.cpp:1114:62: error: qualified-id in declaration before '(' token
... repeated at 1176, 1458, 1476, 1515, 1532, 1574, 1579, 1601, 1896, 1900
llama-model-loader.cpp:1908:2: error: expected '}' at end of input

Resolve tag succeeded, so the 14-pin chain merges. The failure is a syntax error in the merged source.

Cause

Mine. Rebasing #144 onto b10709 produced a false conflict: upstream's lazy_read::add() and this branch's borrow_shared_tensor() landed at the same offset in llama-model-loader.cpp. I resolved it keep-both, which was right in intent, but add() ended at return true; with its closing brace on the far side of the conflict region. Concatenating the two sides left add() unterminated, and the shared trailing brace closed borrow_shared_tensor instead. Every member function after that parsed as nested, which is exactly what qualified-id in declaration before '(' means.

Fix

The brace is restored in the commit that introduced the problem, a70cf195 in the old lineage, rather than patched on top, so no commit in the branch is left unbuildable.

Verification

g++ -fsyntax-only on the fully merged tree (b10709 + ggml-org#27941 + #144), which is the check that would have caught this before the run rather than after:

file result
src/llama-model-loader.cpp OK
src/llama.cpp OK
src/llama-model.cpp OK
src/models/qwen4exp.cpp OK

Brace counting alone said 0 delta both before and after the fix on the branch tip, so it is not a sufficient check; the parse is.

Note

A merge that resolves cleanly is not a merge that compiles. The pin preflight only proves the former. Nothing in the pin machinery builds the merged tree, which is why this reached a publish run.

Run 33385736675 failed to compile on every backend that builds src/, which is
all of them: 'qualified-id in declaration before (' repeated from
llama-model-loader.cpp:1114 and 'expected } at end of input'.

Cause was mine. Rebasing #144 onto b10709 produced a false conflict where
upstream's lazy_read::add() and this branch's borrow_shared_tensor() landed at
the same offset. I resolved it keep-both, but add() ended at 'return true;' with
its closing brace on the far side of the conflict, so concatenating the sides
left add() unterminated and the shared brace closed borrow_shared_tensor
instead. Every member function after it then parsed as nested.

The brace is restored in the commit that introduced the problem rather than
patched on top. Verified with g++ -fsyntax-only on the merged tree, which is the
check that would have caught this before the run: llama-model-loader.cpp,
llama.cpp, llama-model.cpp and models/qwen4exp.cpp all parse clean.
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Aug 31, 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-08-31T12:15:36.637466Z e83c57e 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.

@oobabooga

Copy link
Copy Markdown
Member

Run 33385736675 failed across the build matrix because the pinned #144 revision, 6fc8df13, omitted the closing brace after lazy_read::add(). Linux and Windows jobs reported the same resulting parser errors.

This repins #144 to its current head, 586b15ef, where the brace is restored. The SHA belongs to the PR, pr-set.json validation passes, and the pin merge dry-run passes.

@oobabooga
oobabooga merged commit df9d4a5 into master Aug 31, 2026
5 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.

2 participants