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++

setup: an explicit --rope-scale must be finite and at least 1 (#3393)

Jakub Luwierskia332cc95dbc2
diff --git a/setup.py b/setup.py
index f994d32e8..ab6dad1b2 100644
--- a/setup.py
+++ b/setup.py
@@ -7427,7 +7427,7 @@ def derived_factor(ctx: int, trained: int = 262144) -> float:
def resolve_rope(ctx: int, scaling, scale, trained: int = 262144):
"""The rope config for the context ACTUALLY SERVED: (scaling, scale); scaling None = no scaling flags.
- An explicit --rope-scaling/--rope-scale always wins - a user-supplied factor is kept verbatim even
+ An explicit --rope-scaling/--rope-scale always wins - a valid user-supplied factor is kept verbatim even
when a reduction changed the context. Past the trained range an omitted method defaults to yarn -
llama.cpp's extension method: the trained angles survive on the high-frequency pairs and the
magnitude correction keeps the attention temperature - and an omitted factor is derived from the
@@ -7436,6 +7436,8 @@ def resolve_rope(ctx: int, scaling, scale, trained: int = 262144):
past the trained range (the setup will not configure a run it knows is out of spec) rather than
silently overridden.
"""
+ if scale is not None and (not math.isfinite(scale) or scale < 1.0):
+ raise ValueError("--rope-scale must be a finite value >= 1, e.g. --rope-scale 4")
if ctx <= trained:
if scale is not None and scaling in (None, "none"):
raise ValueError("--rope-scale needs --rope-scaling linear or yarn (the chosen context fits the "
@@ -8640,8 +8642,8 @@ def main() -> int:
"interpolation) or yarn - llama.cpp's types. Omitted with a scaled context, the setup "
"picks yarn; 'none' is refused for such a context")
ap.add_argument("--rope-scale", type=float,
- help="the extension factor (default: the final context over the trained 262144, at least 1 - "
- "1.5 for 384K, 2 for 512K, 1 inside the trained range)")
+ help="the extension factor, finite and >= 1 (default: the final context over the trained "
+ "262144, at least 1 - 1.5 for 384K, 2 for 512K, 1 inside the trained range)")
ap.add_argument("--kv", choices=["int8", "q4_0", "k8v4", "fp16"],
help="KV cache precision above 8K context: int8 (default), q4_0 (half the memory, a little less "
"precise) k8v4 (hybrid: INT8 K + 4-bit V, 816 B/cell) or fp16 (16-bit, twice the memory of int8)")
diff --git a/tools/test_setup_rope.py b/tools/test_setup_rope.py
index 85b47f989..743fd0450 100644
--- a/tools/test_setup_rope.py
+++ b/tools/test_setup_rope.py
@@ -35,6 +35,21 @@ class DerivedFactor(unittest.TestCase):
class ResolveRope(unittest.TestCase):
+ def test_invalid_explicit_factors_are_rejected(self):
+ for ctx in (131072, 262144, 1048576):
+ for method in (None, "none", "linear", "yarn"):
+ for scale in (float("nan"), float("inf"), float("-inf"), -1.0, 0.0, 0.5):
+ with self.subTest(ctx=ctx, method=method, scale=scale):
+ with self.assertRaisesRegex(ValueError, r"--rope-scale.*finite.*>= 1"):
+ setup.resolve_rope(ctx, method, scale)
+
+ def test_valid_explicit_factors_remain_verbatim(self):
+ for ctx in (131072, 262144, 1048576):
+ for method in ("linear", "yarn"):
+ for scale in (1.0, 1.5, 4.0):
+ with self.subTest(ctx=ctx, method=method, scale=scale):
+ self.assertEqual(setup.resolve_rope(ctx, method, scale), (method, scale))
+
# ---- the automatic flow the docs promise (an omitted flag, --yes or the interactive default)
def test_omitted_384k_gets_yarn_and_1_5(self):
self.assertEqual(setup.resolve_rope(393216, None, None), ("yarn", 1.5))