Skip to content

Qwen3.8-Flash-Next on any consumer hardware: one-click install for Windows / Linux. Strata inference engine, OpenAI/Anthropic API on localhost, optional image input.

C++

iq_pack: refuse to mark a native_experts.txt other than v3/v4 as v5

Laurent Zuijdwijk4557f68053d7
diff --git a/tools/iq_pack.py b/tools/iq_pack.py
index 997be21d0..b48af1aad 100644
--- a/tools/iq_pack.py
+++ b/tools/iq_pack.py
@@ -488,6 +488,21 @@ def expert_layout(model: Model, src: pathlib.Path):
return layout, head + "".join(line + "\n" for line in lines), n_expert, offset
+NATIVE_HEAD = re.compile(r"^# strata native experts v(\d+):")
+
+
+def native_experts_v5(text: str) -> str:
+ """native_experts.txt as expert_layout writes it (v3, or v4 with per-role shards) -> the same table marked v5
+ (Hadamard-folded experts, hadamard.txt beside it), or an error string naming the version it cannot mark."""
+ head, rest = text.split("\n", 1) if "\n" in text else (text, "")
+ m = NATIVE_HEAD.match(head)
+ if not m or m.group(1) not in ("3", "4"):
+ found = "v" + m.group(1) if m else "without a version header (%r)" % head[:40]
+ return ("cannot mark native_experts.txt %s as v5 for Hadamard-folded experts: only v3 and v4 tables are "
+ "supported" % found)
+ return "# strata native experts v5:" + head[m.end():] + " - v5: Hadamard-folded experts, see hadamard.txt\n" + rest
+
+
HADAMARD_ROLE = re.compile(r"^blk\.(\d+)\.ffn_(gate|up|down)_exps\.weight$")
@@ -618,9 +633,10 @@ def main() -> int:
print("prism.hadamard: " + had)
return 1
if had is not None:
- head, rest = text.split("\n", 1)
- head = re.sub(r"^# strata native experts v[34]:", "# strata native experts v5:", head)
- text = head + " - v5: Hadamard-folded experts, see hadamard.txt\n" + rest
+ text = native_experts_v5(text)
+ if not text.startswith("# strata native experts v5:"):
+ print("prism.hadamard: " + text)
+ return 1
print("prism.hadamard: %d layer(s) of Hadamard-folded experts (block %s, %s signs): hadamard.txt, "
"native_experts.txt v5" % (sum(1 for ln in had.splitlines() if ln.startswith("layer ")),
g.metadata["prism.hadamard.block_size"],
diff --git a/tools/test_iq_pack.py b/tools/test_iq_pack.py
index 538c08276..580bf2741 100644
--- a/tools/test_iq_pack.py
+++ b/tools/test_iq_pack.py
@@ -598,5 +598,52 @@ class HadamardTests(unittest.TestCase):
self.assertIn("Q2_0", got)
+class NativeExpertsV5Tests(unittest.TestCase):
+ """The v5 mark (Hadamard-folded experts) rewrites only the tables the packer writes, v3 and v4."""
+ ROWS = "0 145 146 0 100 1 2 3\n1 145 146 100 100 4 5 6\n"
+
+ def table(self, version, tail="(n_expert 2, total 200)"):
+ return "# strata native experts v%s: layer gu_type d_type offset ... %s\n" % (version, tail) + self.ROWS
+
+ def test_v3_and_v4_become_v5(self):
+ for v in ("3", "4"):
+ with self.subTest(v):
+ got = iq_pack.native_experts_v5(self.table(v))
+ head, rest = got.split("\n", 1)
+ self.assertTrue(head.startswith("# strata native experts v5: layer gu_type"))
+ self.assertTrue(head.endswith("(n_expert 2, total 200) - v5: Hadamard-folded experts, see hadamard.txt"))
+ self.assertEqual(rest, self.ROWS)
+
+ def test_other_versions_are_refused_by_name(self):
+ for v in ("2", "5", "6", "10"):
+ with self.subTest(v):
+ got = iq_pack.native_experts_v5(self.table(v))
+ self.assertFalse(got.startswith("# strata native experts"))
+ self.assertIn("v%s" % v, got)
+ self.assertIn("v3 and v4", got)
+ got = iq_pack.native_experts_v5("# something else\n" + self.ROWS)
+ self.assertIn("without a version header", got)
+
+ def test_packer_refuses_before_writing(self):
+ real = iq_pack.expert_layout
+
+ def v6_layout(model, src):
+ layout, text, n_expert, offset = real(model, src)
+ return layout, text.replace("native experts v3:", "native experts v6:", 1), n_expert, offset
+
+ with tempfile.TemporaryDirectory() as d:
+ root = Path(d)
+ paths = split_model(root, split_layer=False)
+ out = root / "pack"
+ with patch.object(iq_pack, "expert_layout", v6_layout), \
+ patch.object(iq_pack, "hadamard_spec", return_value="# strata hadamard v1\nblock 32\n"):
+ rc, log = run_pack(paths[0], out)
+ self.assertEqual(rc, 1)
+ self.assertIn("native_experts.txt v6", log)
+ self.assertIn("only v3 and v4", log)
+ self.assertFalse((out / "native_experts.txt").exists())
+ self.assertFalse((out / "hadamard.txt").exists())
+
+
if __name__ == "__main__":
unittest.main()