File size: 22,678 Bytes
2dd5f57 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 | """Tests for the draft-model initialization sources in ``scripts/train.py``.
Covers the three mutually exclusive init paths and their guard rails:
- ``--draft-config``: decoder ``transformer_layer_config`` loaded from a file,
reconciled against the verifier (hidden-size match, vocab-size alignment).
- ``--from-pretrained`` pointing at a config-only directory: fresh weights
initialized from a full saved speculator config.
- ``--dry-run`` flag parsing.
- CLI validation: ``--from-pretrained`` takes precedence over and is mutually
exclusive with ``--draft-config`` and the decoder-shaping flags; and
``--draft-config`` is mutually exclusive with the decoder-shaping flags.
"""
import argparse
import json
from pathlib import Path
from types import SimpleNamespace
from typing import Any
from unittest.mock import patch
import pytest
from transformers.models.llama.configuration_llama import LlamaConfig
from transformers.models.qwen3.configuration_qwen3 import Qwen3Config
from speculators import SpeculatorsConfig, VerifierConfig
from speculators.models.eagle3 import Eagle3DraftModel, Eagle3SpeculatorConfig
from speculators.proposals.greedy import GreedyTokenProposalConfig
from speculators.train.cli import (
_build_from_config_only,
build_draft_model,
create_transformer_layer_config,
load_draft_transformer_layer_config,
)
from speculators.train.config import TrainConfig
from speculators.train.config.resolution import DECODER_SHAPING_FLAGS
from speculators.utils.loading import is_config_only_dir
# ---------------------------------------------------------------------------
# Helpers
# ---------------------------------------------------------------------------
TINY_LLAMA_KWARGS: dict[str, Any] = {
"vocab_size": 64,
"hidden_size": 32,
"intermediate_size": 128,
"num_hidden_layers": 2,
"num_attention_heads": 4,
"num_key_value_heads": 4,
"head_dim": 8,
"max_position_embeddings": 32,
"tie_word_embeddings": False,
}
def _parse(monkeypatch, extra: list[str]) -> argparse.Namespace:
cfg = TrainConfig.resolve(["--verifier-name-or-path", "dummy", *extra])
return argparse.Namespace(**cfg.flatten())
def _make_eagle3_config(verifier_name_or_path: str | None = "some-verifier"):
return Eagle3SpeculatorConfig(
transformer_layer_config=LlamaConfig(
**{"_attn_implementation": "eager", **TINY_LLAMA_KWARGS}
),
draft_vocab_size=64,
norm_before_residual=False,
embed_requires_grad=False,
speculators_config=SpeculatorsConfig(
algorithm="eagle3",
proposal_methods=[GreedyTokenProposalConfig(speculative_tokens=1)],
default_proposal_method="greedy",
verifier=VerifierConfig(
name_or_path=verifier_name_or_path,
architectures=["LlamaForCausalLM"],
),
),
)
def _save_config_only_dir(
tmp_path: Path, verifier_name_or_path="some-verifier"
) -> Path:
"""Save a full speculator checkpoint then strip the weight files, leaving a
config-only directory."""
model = Eagle3DraftModel(_make_eagle3_config(verifier_name_or_path))
model_dir = tmp_path / "config_only"
model.save_pretrained(str(model_dir))
weight_files = list(model_dir.glob("*.safetensors")) + list(model_dir.glob("*.bin"))
for weights in weight_files:
weights.unlink()
return model_dir
def _make_verifier_namespace(**overrides) -> SimpleNamespace:
"""A minimal stand-in for a verifier PretrainedConfig as consumed by
create_transformer_layer_config (no text_config / rope fields)."""
base = {
"vocab_size": 128,
"hidden_size": 32,
"num_attention_heads": 4,
"num_key_value_heads": 2,
"hidden_act": "silu",
"max_position_embeddings": 128,
"initializer_range": 0.02,
"rms_norm_eps": 1e-6,
"head_dim": 8,
}
base.update(overrides)
return SimpleNamespace(**base)
# ---------------------------------------------------------------------------
# CLI validation: --draft-config exclusivity
# ---------------------------------------------------------------------------
def test_draft_config_alone_parses(monkeypatch):
args = _parse(monkeypatch, ["--draft-config", "some/decoder/config"])
assert args.draft_config == "some/decoder/config"
assert args.from_pretrained == ""
def test_dry_run_flag_parses(monkeypatch):
assert _parse(monkeypatch, []).dry_run is False
assert _parse(monkeypatch, ["--dry-run"]).dry_run is True
def test_draft_config_with_from_pretrained_errors(monkeypatch):
with pytest.raises(SystemExit):
_parse(monkeypatch, ["--draft-config", "c", "--from-pretrained", "p"])
@pytest.mark.parametrize(
"extra",
[
["--num-layers", "5"],
["--draft-arch", "qwen3"],
["--draft-hidden-act", "gelu"],
["--sliding-window", "1024"],
["--full-attention-indices", "0", "1"],
],
)
def test_draft_config_with_decoder_flag_errors(monkeypatch, extra):
with pytest.raises(SystemExit):
_parse(monkeypatch, ["--draft-config", "c", *extra])
def test_draft_config_with_explicit_default_flag_errors(monkeypatch):
"""Explicitly passing a decoder-shaping flag conflicts with --draft-config even
when its value equals the argparse default (--num-layers default is 1):
detection is based on what was provided, not on the resulting value."""
with pytest.raises(SystemExit):
_parse(monkeypatch, ["--draft-config", "c", "--num-layers", "1"])
def test_decoder_shaping_flags_dests_exist(monkeypatch):
"""Every dest in DECODER_SHAPING_FLAGS is a real parsed attribute."""
args = _parse(monkeypatch, [])
for dest in DECODER_SHAPING_FLAGS:
assert hasattr(args, dest), dest
# ---------------------------------------------------------------------------
# --full-attention-indices: CLI parsing and layer-type synthesis
# ---------------------------------------------------------------------------
@pytest.mark.parametrize(
("cli_args", "expected"),
[
([], []),
(["--full-attention-indices", "0", "2"], [0, 2]),
],
)
def test_full_attention_indices_parsing(monkeypatch, cli_args, expected):
"""Defaults to empty (all layers sliding window) and parses explicit values."""
assert _parse(monkeypatch, cli_args).full_attention_indices == expected
@pytest.mark.parametrize(
(
"num_layers",
"full_attention_indices",
"expected_layer_types",
"expected_use_sliding_window",
),
[
(3, [], ["sliding_attention"] * 3, True),
(
3,
[1],
["sliding_attention", "full_attention", "sliding_attention"],
True,
),
(2, [0, 1], ["full_attention", "full_attention"], False),
],
)
def test_create_layer_config_layer_types(
num_layers,
full_attention_indices,
expected_layer_types,
expected_use_sliding_window,
):
"""full_attention_indices selects per-layer attention; sliding window stays
enabled unless every layer opts into full attention."""
verifier = _make_verifier_namespace()
with patch(
"speculators.train.cli.AutoConfig.from_pretrained", return_value=verifier
):
config = create_transformer_layer_config(
"target",
num_layers=num_layers,
draft_arch="llama",
hidden_act=None,
sliding_window=2048,
full_attention_indices=full_attention_indices,
)
assert config.layer_types == expected_layer_types
assert config.use_sliding_window is expected_use_sliding_window
@pytest.mark.parametrize("bad_indices", [[-1], [3], [0, 3]])
def test_create_layer_config_rejects_out_of_range_indices(bad_indices):
"""full_attention_indices outside [0, num_layers) is a hard error."""
verifier = _make_verifier_namespace()
with (
patch(
"speculators.train.cli.AutoConfig.from_pretrained", return_value=verifier
),
pytest.raises(ValueError, match="valid draft layer ids"),
):
create_transformer_layer_config(
"target",
num_layers=3,
draft_arch="llama",
hidden_act=None,
sliding_window=2048,
full_attention_indices=bad_indices,
)
# ---------------------------------------------------------------------------
# CLI validation: --from-pretrained precedence
# ---------------------------------------------------------------------------
def test_from_pretrained_alone_parses(monkeypatch):
args = _parse(monkeypatch, ["--from-pretrained", "some/checkpoint"])
assert args.from_pretrained == "some/checkpoint"
assert args.draft_config == ""
@pytest.mark.parametrize(
"extra",
[
["--num-layers", "5"],
["--draft-arch", "qwen3"],
["--draft-hidden-act", "gelu"],
["--sliding-window", "1024"],
["--full-attention-indices", "0", "1"],
["--draft-config", "c"],
],
)
def test_from_pretrained_takes_precedence_over_model_flags(monkeypatch, extra):
"""--from-pretrained defines the whole draft and takes precedence over every
other model-definition option, erroring if combined with any of them."""
with pytest.raises(SystemExit):
_parse(monkeypatch, ["--from-pretrained", "p", *extra])
def test_from_pretrained_with_explicit_default_flag_errors(monkeypatch):
"""--from-pretrained conflicts with an explicitly-passed decoder-shaping flag
even when its value equals the argparse default (--num-layers default is 1)."""
with pytest.raises(SystemExit):
_parse(monkeypatch, ["--from-pretrained", "p", "--num-layers", "1"])
# ---------------------------------------------------------------------------
# CLI validation: MTP-from-scratch rejects inapplicable draft-definition flags
# ---------------------------------------------------------------------------
def test_mtp_from_scratch_alone_parses(monkeypatch):
args = _parse(monkeypatch, ["--speculator-type", "mtp"])
assert args.speculator_type == "mtp"
assert args.draft_config == ""
@pytest.mark.parametrize(
"extra",
[
["--draft-config", "c"],
["--num-layers", "5"],
["--draft-arch", "qwen3"],
["--sliding-window", "1024"],
],
)
def test_mtp_from_scratch_rejects_inapplicable_flags(monkeypatch, extra):
"""MTP-from-scratch reuses the verifier decoder config, so --draft-config and
decoder-shaping flags do not apply and must error instead of being ignored."""
with pytest.raises(SystemExit):
_parse(monkeypatch, ["--speculator-type", "mtp", *extra])
def test_mtp_with_from_pretrained_parses(monkeypatch):
"""MTP + --from-pretrained (a converted checkpoint) parses; the MTP-from-scratch
rejection only applies when not loading from a checkpoint."""
args = _parse(
monkeypatch, ["--speculator-type", "mtp", "--from-pretrained", "ckpt"]
)
assert args.from_pretrained == "ckpt"
# ---------------------------------------------------------------------------
# load_draft_transformer_layer_config
# ---------------------------------------------------------------------------
def _patch_verifier(monkeypatch, hidden_size: int, vocab_size: int):
monkeypatch.setattr(
"speculators.train.cli.get_verifier_config",
lambda _path, **_kwargs: SimpleNamespace(
hidden_size=hidden_size, vocab_size=vocab_size
),
)
def test_load_draft_config_from_dir(tmp_path, monkeypatch):
Qwen3Config(hidden_size=64, num_hidden_layers=3, vocab_size=100).save_pretrained(
tmp_path
)
_patch_verifier(monkeypatch, hidden_size=64, vocab_size=200)
out = load_draft_transformer_layer_config(str(tmp_path), "dummy-verifier")
assert isinstance(out, Qwen3Config)
assert out.num_hidden_layers == 3
# vocab_size is aligned to the verifier's target vocabulary
assert out.vocab_size == 200
def test_load_draft_config_hidden_size_mismatch_raises(tmp_path, monkeypatch):
Qwen3Config(hidden_size=64, num_hidden_layers=2, vocab_size=100).save_pretrained(
tmp_path
)
_patch_verifier(monkeypatch, hidden_size=128, vocab_size=100)
with pytest.raises(ValueError, match="hidden_size"):
load_draft_transformer_layer_config(str(tmp_path), "dummy-verifier")
def test_load_draft_config_extracts_nested_from_full_config(tmp_path, monkeypatch):
"""A full speculator config (with nested transformer_layer_config) is accepted;
only the decoder definition is used."""
nested = Qwen3Config(hidden_size=64, num_hidden_layers=5, vocab_size=100).to_dict()
full = {"speculators_model_type": "dflash", "transformer_layer_config": nested}
(tmp_path / "config.json").write_text(json.dumps(full))
_patch_verifier(monkeypatch, hidden_size=64, vocab_size=64)
out = load_draft_transformer_layer_config(str(tmp_path), "dummy-verifier")
assert isinstance(out, Qwen3Config)
assert out.num_hidden_layers == 5
def test_load_draft_config_missing_model_type_raises(tmp_path, monkeypatch):
"""A --draft-config without a model_type fails loudly rather than silently
defaulting to a particular decoder class."""
cfg = {"hidden_size": 64, "num_hidden_layers": 2, "vocab_size": 100}
(tmp_path / "config.json").write_text(json.dumps(cfg))
_patch_verifier(monkeypatch, hidden_size=64, vocab_size=100)
with pytest.raises(ValueError, match="model_type"):
load_draft_transformer_layer_config(str(tmp_path), "dummy-verifier")
# ---------------------------------------------------------------------------
# _build_from_config_only
# ---------------------------------------------------------------------------
def test_build_from_config_only(tmp_path):
model_dir = _save_config_only_dir(tmp_path)
assert is_config_only_dir(str(model_dir))
with patch.object(Eagle3DraftModel, "load_verifier_weights"):
built = _build_from_config_only(Eagle3DraftModel, str(model_dir), None, None)
assert isinstance(built, Eagle3DraftModel)
# decoder (trainable) weights are freshly/randomly initialized, not NaN
assert not built.fc.weight.isnan().any()
def test_build_from_config_only_fills_missing_verifier_name(tmp_path):
model_dir = _save_config_only_dir(tmp_path, verifier_name_or_path=None)
with patch.object(Eagle3DraftModel, "load_verifier_weights"):
built = _build_from_config_only(
Eagle3DraftModel,
str(model_dir),
None,
None,
verifier_name_or_path="fallback-verifier",
)
assert built.config.speculators_config.verifier.name_or_path == "fallback-verifier"
@pytest.mark.parametrize("blanked", ["", None])
def test_build_from_config_only_fills_blank_verifier_name(tmp_path, blanked):
# Manually blanking name_or_path in config.json yields "" (not null), so the
# fallback must treat any empty value -- not just None -- as "use the CLI arg".
model_dir = _save_config_only_dir(tmp_path, verifier_name_or_path=blanked)
with patch.object(Eagle3DraftModel, "load_verifier_weights"):
built = _build_from_config_only(
Eagle3DraftModel,
str(model_dir),
None,
None,
verifier_name_or_path="fallback-verifier",
)
assert built.config.speculators_config.verifier.name_or_path == "fallback-verifier"
def test_build_from_config_only_preserves_existing_verifier_name(tmp_path):
model_dir = _save_config_only_dir(tmp_path, verifier_name_or_path="real-verifier")
with patch.object(Eagle3DraftModel, "load_verifier_weights"):
built = _build_from_config_only(
Eagle3DraftModel,
str(model_dir),
None,
None,
verifier_name_or_path="fallback-verifier",
)
assert built.config.speculators_config.verifier.name_or_path == "real-verifier"
def test_config_roundtrip_drops_attn_implementation(tmp_path):
# Precondition of the --from-pretrained bug: HF configs never serialize
# _attn_implementation, so the field does not survive a save/load round-trip
# and must be re-applied from the CLI selection.
config = _make_eagle3_config()
config.transformer_layer_config._attn_implementation = "sdpa"
save_dir = tmp_path / "roundtrip"
config.save_pretrained(str(save_dir))
reloaded = Eagle3SpeculatorConfig.from_pretrained(str(save_dir))
assert reloaded.transformer_layer_config._attn_implementation != "sdpa"
def test_build_from_config_only_reapplies_draft_attn_impl(tmp_path):
model_dir = _save_config_only_dir(tmp_path)
with patch.object(Eagle3DraftModel, "load_verifier_weights"):
built = _build_from_config_only(
Eagle3DraftModel,
str(model_dir),
None,
None,
draft_attn_impl="sdpa",
)
assert built.config.transformer_layer_config._attn_implementation == "sdpa"
# ---------------------------------------------------------------------------
# build_draft_model: MTP-from-scratch routing
# ---------------------------------------------------------------------------
def test_build_draft_model_mtp_from_scratch_uses_verifier_decoder(monkeypatch):
"""MTP without --from-pretrained reuses the verifier's own decoder config and
must not synthesize a decoder or resolve a draft mask token."""
verifier_cfg = object()
monkeypatch.setattr(
"speculators.train.cli.get_verifier_config",
lambda _p, **_kwargs: verifier_cfg,
)
def _must_not_call(*_a, **_k):
raise AssertionError("not expected for MTP-from-scratch")
monkeypatch.setattr(
"speculators.train.cli.create_transformer_layer_config", _must_not_call
)
monkeypatch.setattr("speculators.train.cli.resolve_mask_token_id", _must_not_call)
captured = {}
class _FakeMTP:
@classmethod
def from_training_args(cls, *, verifier_config, t2d, d2t, **kwargs):
captured["verifier_config"] = verifier_config
captured["num_speculative_steps"] = kwargs.get("num_speculative_steps")
return "MTP_MODEL"
args = SimpleNamespace(
speculator_type="mtp",
from_pretrained="",
draft_config="",
verifier_name_or_path="some-verifier",
mask_token_id=None,
num_speculative_steps=3,
draft_mrope_full_head_hack=True,
)
built = build_draft_model(args, _FakeMTP, None, None, None) # type: ignore[arg-type]
assert built == "MTP_MODEL"
assert captured["verifier_config"] is verifier_cfg
assert captured["num_speculative_steps"] == 3
# mask token stays unset for MTP (resolve_mask_token_id was never called)
assert args.mask_token_id is None
# ---------------------------------------------------------------------------
# build_draft_model: sliding-window default routing by speculator type
# ---------------------------------------------------------------------------
def _capture_full_attention_indices(
monkeypatch, speculator_type: str, requested_indices: list[int]
):
"""Run build_draft_model for a synthesized draft (no --from-pretrained /
--draft-config) and return the full_attention_indices it forwards to
create_transformer_layer_config."""
captured = {}
def _fake_create(*, full_attention_indices, **_kwargs):
captured["full_attention_indices"] = full_attention_indices
return SimpleNamespace(vocab_size=128)
monkeypatch.setattr(
"speculators.train.cli.create_transformer_layer_config", _fake_create
)
monkeypatch.setattr(
"speculators.train.cli.resolve_mask_token_id", lambda *_a, **_k: 0
)
class _FakeModel:
@classmethod
def from_training_args(cls, **_kwargs):
return "MODEL"
args = SimpleNamespace(
speculator_type=speculator_type,
from_pretrained="",
draft_config="",
verifier_name_or_path="some-verifier",
num_layers=3,
draft_arch="qwen3",
draft_hidden_act=None,
sliding_window=2048,
full_attention_indices=requested_indices,
mask_token_id=None,
trust_remote_code=False,
draft_mrope_full_head_hack=True,
)
build_draft_model(args, _FakeModel, None, None, 128) # type: ignore[arg-type]
return captured["full_attention_indices"]
@pytest.mark.parametrize(
("speculator_type", "requested_indices", "expected_indices"),
[
("dflash", [], []),
("dspark", [], []),
("dflash", [1], [1]),
("eagle3", [], []),
("peagle", [], []),
("eagle3", [0, 2], [0, 2]),
],
)
def test_build_draft_model_routing(
monkeypatch, speculator_type, requested_indices, expected_indices
):
"""All speculator types (except mtp) default every layer to sliding window
(empty opt-out list) and forward an explicit non-empty list unchanged."""
assert (
_capture_full_attention_indices(monkeypatch, speculator_type, requested_indices)
== expected_indices
)
# ---------------------------------------------------------------------------
# intermediate_size resolution (dense + MoE verifiers)
# ---------------------------------------------------------------------------
def _create_layer_config_for(verifier: SimpleNamespace):
with patch(
"speculators.train.cli.AutoConfig.from_pretrained", return_value=verifier
):
return create_transformer_layer_config(
"target",
num_layers=2,
draft_arch="llama",
hidden_act=None,
sliding_window=2048,
full_attention_indices=[],
)
def test_create_layer_config_uses_dense_intermediate_size():
verifier = _make_verifier_namespace(intermediate_size=48)
config = _create_layer_config_for(verifier)
assert config.intermediate_size == 48
def test_create_layer_config_infers_moe_intermediate_size():
# MoE verifier (no dense intermediate_size): the draft MLP width falls back to
# 3 * hidden_size. Detailed resolver behavior is covered in
# tests/unit/models/test_utils.py.
verifier = _make_verifier_namespace(
moe_intermediate_size=768, # present but irrelevant to the fallback
num_experts_per_tok=8,
num_experts=128,
)
with pytest.warns(UserWarning, match="3 x hidden_size"):
config = _create_layer_config_for(verifier)
assert config.intermediate_size == 3 * 32
|