From e83c57e07588f2b84d66a7bebff06e726c45962f Mon Sep 17 00:00:00 2001 From: danielhanchen Date: Mon, 31 Aug 2026 12:12:23 +0000 Subject: [PATCH] unsloth: repin #144 to 586b15ef, fixing a brace I dropped in the rebase 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. --- scripts/unsloth/pr-set.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/unsloth/pr-set.json b/scripts/unsloth/pr-set.json index 96215c47cb84..e4edc3a27b66 100644 --- a/scripts/unsloth/pr-set.json +++ b/scripts/unsloth/pr-set.json @@ -29,7 +29,7 @@ "https://github.com/unslothai/llama.cpp/pull/157/commits/6c6da89266ba7839d825c9997782af4f4d26b81b", "https://github.com/unslothai/llama.cpp/pull/149/commits/b65a2dce12c14a489e19a059cb6ee59112f1b733", "https://github.com/ggml-org/llama.cpp/pull/27941/commits/6b2b85cfbf8a5c612e7d3d4c0ef222e1e58de1c5", - "https://github.com/unslothai/llama.cpp/pull/144/commits/6fc8df13a1677759a06ae229155d697c5d725ea7", + "https://github.com/unslothai/llama.cpp/pull/144/commits/586b15ef8ef9488140c64a71424589cec1a6a9a2", "https://github.com/unslothai/llama.cpp/pull/152/commits/258345efa640eb099eb1af3c9ee8f8e6e8e7b0d3", "https://github.com/unslothai/llama.cpp/pull/154/commits/31e432e758f8cc4b2c5f27902721500173bf39db" ]