-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Expand file tree
/
Copy pathtest_draft.py
More file actions
302 lines (254 loc) · 11.6 KB
/
Copy pathtest_draft.py
File metadata and controls
302 lines (254 loc) · 11.6 KB
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
# Copyright (c) Meta Platforms, Inc. and affiliates.
# All rights reserved.
#
# This source code is licensed under the BSD-style license found in the
# LICENSE file in the root directory of this source tree.
"""Unit tests for the EAGLE-3 draft head and its checkpoint adapter."""
import json
import os
import pytest
import torch
from executorch.examples.models.eagle3.draft import Eagle3Config, Eagle3Draft
def tiny_config(norm_before_residual=True, has_own_embed=True) -> Eagle3Config:
return Eagle3Config(
hidden_size=32,
target_hidden_size=32,
intermediate_size=64,
num_attention_heads=4,
num_key_value_heads=2,
head_dim=8,
draft_vocab_size=16,
target_vocab_size=40,
aux_hidden_state_layers=[0, 1, 2],
norm_before_residual=norm_before_residual,
has_own_embed=has_own_embed,
)
@pytest.mark.parametrize("norm_before_residual", [True, False])
@pytest.mark.parametrize("has_own_embed", [True, False])
def test_tiny_forward_shapes(norm_before_residual, has_own_embed):
torch.manual_seed(0)
cfg = tiny_config(norm_before_residual, has_own_embed)
model = Eagle3Draft(cfg).to(torch.float32).eval()
B, T = 1, 5
aux = torch.randn(B, T, len(cfg.aux_hidden_state_layers) * cfg.target_hidden_size)
feat = model.fuse(aux)
assert feat.shape == (B, T, cfg.hidden_size)
if has_own_embed:
emb = model.embed(torch.randint(0, cfg.target_vocab_size, (T,))).unsqueeze(0)
assert emb.shape == (B, T, cfg.hidden_size)
else:
emb = torch.randn(B, T, cfg.hidden_size)
with torch.no_grad():
logits, g = model(emb, feat, torch.arange(T))
assert logits.shape == (B, T, cfg.draft_vocab_size)
assert g.shape == (B, T, cfg.hidden_size)
assert torch.isfinite(logits).all() and torch.isfinite(g).all()
def test_norm_before_residual_changes_output():
# Check residual-path wiring, not only output shape.
B, T = 1, 5
aux = torch.randn(B, T, 3 * 32)
emb = torch.randn(B, T, 32)
outs = []
for nbr in (True, False):
torch.manual_seed(1) # identical weights, only the flag differs
model = (
Eagle3Draft(tiny_config(norm_before_residual=nbr)).to(torch.float32).eval()
)
with torch.no_grad():
_, g = model(emb, model.fuse(aux), torch.arange(T))
outs.append(g)
assert not torch.allclose(outs[0], outs[1]), "norm_before_residual had no effect"
def test_kv_cache_matches_full_recompute():
# Cached prefill + single-step decode must equal stateless full recompute.
torch.manual_seed(0)
cfg = tiny_config()
model = Eagle3Draft(cfg).to(torch.float32).eval()
T, prefill = 6, 3
feat = model.fuse(
torch.randn(1, T, len(cfg.aux_hidden_state_layers) * cfg.target_hidden_size)
)
emb = model.embed(torch.randint(0, cfg.target_vocab_size, (T,))).unsqueeze(0)
with torch.no_grad():
ref_logits, ref_g = model(emb, feat, torch.arange(T))
model.reset_cache()
pl, pg = model.forward_cached(
emb[:, :prefill], feat[:, :prefill], torch.arange(prefill)
)
torch.testing.assert_close(pl, ref_logits[:, :prefill])
torch.testing.assert_close(pg, ref_g[:, :prefill])
for i in range(prefill, T):
sl, sg = model.forward_cached(
emb[:, i : i + 1], feat[:, i : i + 1], torch.arange(i, i + 1)
)
torch.testing.assert_close(sl, ref_logits[:, i : i + 1])
torch.testing.assert_close(sg, ref_g[:, i : i + 1])
def test_reset_cache_isolates_sequences():
# A second sequence after reset_cache must match a fresh full recompute.
torch.manual_seed(0)
cfg = tiny_config()
model = Eagle3Draft(cfg).to(torch.float32).eval()
T = 4
feat = model.fuse(
torch.randn(1, T, len(cfg.aux_hidden_state_layers) * cfg.target_hidden_size)
)
emb = model.embed(torch.randint(0, cfg.target_vocab_size, (T,))).unsqueeze(0)
with torch.no_grad():
model.forward_cached(emb, feat, torch.arange(T)) # pollute the cache
model.reset_cache()
cached, _ = model.forward_cached(emb, feat, torch.arange(T))
ref, _ = model(emb, feat, torch.arange(T))
torch.testing.assert_close(cached, ref)
def test_offset_seed_after_reset_is_rejected():
# The contiguous-from-0 invariant is enforced in eager: an offset seed would
# attend to zeroed slots, so forward_cached rejects it outright.
torch.manual_seed(0)
cfg = tiny_config()
model = Eagle3Draft(cfg).to(torch.float32).eval()
T = 4
feat = model.fuse(
torch.randn(1, T, len(cfg.aux_hidden_state_layers) * cfg.target_hidden_size)
)
emb = model.embed(torch.randint(0, cfg.target_vocab_size, (T,))).unsqueeze(0)
model.reset_cache()
with pytest.raises(ValueError, match="non-contiguous cache seed"):
model.forward_cached(emb, feat, torch.arange(10, 10 + T))
def test_gapped_positions_rejected():
cfg = tiny_config()
model = Eagle3Draft(cfg).to(torch.float32).eval()
emb = torch.randn(1, 3, cfg.hidden_size)
feat = torch.randn(1, 3, cfg.hidden_size)
model.reset_cache()
with pytest.raises(ValueError, match="contiguous ascending"):
model.forward_cached(emb, feat, torch.tensor([0, 2, 3]))
def test_rollback_reseed_is_allowed():
# Overwriting already-written slots (speculative rollback) must be accepted.
torch.manual_seed(0)
cfg = tiny_config()
model = Eagle3Draft(cfg).to(torch.float32).eval()
emb = model.embed(torch.randint(0, cfg.target_vocab_size, (6,))).unsqueeze(0)
feat = model.fuse(
torch.randn(1, 6, len(cfg.aux_hidden_state_layers) * cfg.target_hidden_size)
)
with torch.no_grad():
model.reset_cache()
model.forward_cached(emb, feat, torch.arange(6)) # write slots 0..5
# re-decode at slot 4 (a rejected proposal rolled back) — allowed.
model.forward_cached(emb[:, 4:5], feat[:, 4:5], torch.arange(4, 5))
def test_post_rollback_gap_is_rejected():
# A rollback overwrite shrinks the valid prefix: after writing 0..5 then
# re-decoding slot 4, slot 5 holds stale (rejected) K/V, so a write starting
# at 6 must be rejected until slot 5 is rewritten.
cfg = tiny_config()
model = Eagle3Draft(cfg).to(torch.float32).eval()
model.reset_cache()
model._validate_contiguous(torch.arange(6)) # write slots 0..5
model._validate_contiguous(torch.arange(4, 5)) # rollback overwrite slot 4
with pytest.raises(ValueError, match="non-contiguous"):
model._validate_contiguous(torch.arange(6, 7)) # slot 5 stale -> rejected
model._validate_contiguous(torch.arange(5, 6)) # rewrite slot 5 -> ok
model._validate_contiguous(torch.arange(6, 7)) # now slot 6 -> ok
def test_forward_cached_rejects_batch_gt_1():
cfg = tiny_config()
model = Eagle3Draft(cfg).to(torch.float32).eval()
emb = torch.randn(2, 3, cfg.hidden_size)
feat = torch.randn(2, 3, cfg.hidden_size)
with pytest.raises(ValueError, match="batch size 1"):
model.forward_cached(emb, feat, torch.arange(3))
def test_draft_to_target_mapping():
model = Eagle3Draft(tiny_config()).eval()
model.d2t.copy_(torch.arange(model.config.draft_vocab_size)) # offset = id
ids = torch.tensor([0, 3, 7])
assert torch.equal(model.draft_to_target(ids), ids + ids)
def test_embed_requires_own_embed():
model = Eagle3Draft(tiny_config(has_own_embed=False)).eval()
assert not hasattr(model, "embed_tokens")
with pytest.raises(RuntimeError, match="no own embed_tokens"):
model.embed(torch.tensor([0, 1, 2]))
def test_inv_freq_stays_fp32_under_assign_load():
cfg = tiny_config()
model = Eagle3Draft(cfg)
assert model.midlayer.self_attn.inv_freq.dtype == torch.float32
sd = {
k: (v.to(torch.bfloat16) if v.is_floating_point() else v)
for k, v in model.state_dict().items()
}
model.load_state_dict(sd, strict=True, assign=True)
assert model.midlayer.self_attn.inv_freq.dtype == torch.float32
assert model.fc.weight.dtype == torch.bfloat16
def _write_checkpoint(model_dir, cfg, *, sharded=False, norm_before_fc=False):
"""Write a tiny speculators-format checkpoint (config.json + safetensors)."""
from safetensors.torch import save_file
os.makedirs(model_dir, exist_ok=True)
torch.manual_seed(2)
src = Eagle3Draft(cfg)
disk = {
k.replace("midlayer.", "layers.0."): v.clone().contiguous()
for k, v in src.state_dict().items()
}
d2t = torch.arange(cfg.draft_vocab_size, dtype=torch.int64)
t2d = torch.zeros(cfg.target_vocab_size, dtype=torch.bool)
t2d[: cfg.draft_vocab_size] = True
disk["d2t"] = d2t
disk["t2d"] = t2d
config = {
"draft_vocab_size": cfg.draft_vocab_size,
"target_hidden_size": cfg.target_hidden_size,
"eagle_aux_hidden_state_layer_ids": cfg.aux_hidden_state_layers,
"norm_before_residual": cfg.norm_before_residual,
"norm_before_fc": norm_before_fc,
"transformer_layer_config": {
"hidden_size": cfg.hidden_size,
"intermediate_size": cfg.intermediate_size,
"num_attention_heads": cfg.num_attention_heads,
"num_key_value_heads": cfg.num_key_value_heads,
"head_dim": cfg.head_dim,
"vocab_size": cfg.target_vocab_size,
"rms_norm_eps": cfg.rms_norm_eps,
"rope_parameters": {"rope_theta": cfg.rope_theta},
},
}
with open(os.path.join(model_dir, "config.json"), "w") as f:
json.dump(config, f)
if not sharded:
save_file(disk, os.path.join(model_dir, "model.safetensors"))
else:
keys = list(disk)
half = len(keys) // 2
s1 = {k: disk[k] for k in keys[:half]}
s2 = {k: disk[k] for k in keys[half:]}
save_file(s1, os.path.join(model_dir, "model-00001-of-00002.safetensors"))
save_file(s2, os.path.join(model_dir, "model-00002-of-00002.safetensors"))
weight_map = {k: "model-00001-of-00002.safetensors" for k in s1}
weight_map.update({k: "model-00002-of-00002.safetensors" for k in s2})
with open(os.path.join(model_dir, "model.safetensors.index.json"), "w") as f:
json.dump({"weight_map": weight_map}, f)
return src, d2t, t2d
@pytest.mark.parametrize("sharded", [False, True])
def test_from_checkpoint_roundtrip(tmp_path, sharded):
cfg = tiny_config()
src, d2t, t2d = _write_checkpoint(str(tmp_path), cfg, sharded=sharded)
model, loaded_cfg = Eagle3Draft.from_checkpoint(
str(tmp_path), device="cpu", dtype=torch.float32
)
assert loaded_cfg.has_own_embed
assert loaded_cfg.aux_hidden_state_layers == cfg.aux_hidden_state_layers
assert loaded_cfg.target_vocab_size == cfg.target_vocab_size
torch.testing.assert_close(
model.midlayer.self_attn.q_proj.weight, src.midlayer.self_attn.q_proj.weight
)
torch.testing.assert_close(model.fc.weight, src.fc.weight)
assert torch.equal(model.d2t, d2t)
assert torch.equal(model.t2d, t2d)
assert model.midlayer.self_attn.inv_freq.dtype == torch.float32
T = 4
feat = model.fuse(torch.randn(1, T, 3 * cfg.target_hidden_size))
emb = model.embed(torch.randint(0, cfg.target_vocab_size, (T,))).unsqueeze(0)
logits, g = model(emb, feat, torch.arange(T))
assert logits.shape == (1, T, cfg.draft_vocab_size)
def test_from_checkpoint_rejects_norm_before_fc(tmp_path):
cfg = tiny_config()
_write_checkpoint(str(tmp_path), cfg, norm_before_fc=True)
with pytest.raises(ValueError, match="norm_before_fc"):
Eagle3Draft.from_checkpoint(str(tmp_path), device="cpu", dtype=torch.float32)
if __name__ == "__main__":
raise SystemExit(pytest.main([__file__, "-q"]))