Repository navigation
Expand file tree
/
Copy pathtest_adapters.py
More file actions
288 lines (222 loc) · 9.54 KB
/
Copy pathtest_adapters.py
File metadata and controls
288 lines (222 loc) · 9.54 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
# SPDX-License-Identifier: Apache-2.0
# SPDX-FileCopyrightText: Copyright contributors to the vLLM project
"""Tests for model adapter weight loading (adapters.py)."""
import pytest
import torch
from transformers import Gemma3Config, PreTrainedConfig, Qwen2Config
from vllm.model_executor.models.adapters import (
_create_pooling_model_cls,
_resolve_num_labels,
)
from vllm.model_executor.models.utils import (
AutoWeightsLoader,
StageMissingLayer,
WeightsMapper,
)
pytestmark = pytest.mark.cpu_test
class SimpleInnerModel(torch.nn.Module):
def __init__(self):
super().__init__()
self.embed = torch.nn.Linear(4, 8, bias=False)
self.layer0 = torch.nn.Linear(8, 8, bias=False)
self.layer1 = torch.nn.Linear(8, 8, bias=False)
self.norm = torch.nn.Linear(8, 4, bias=False)
def load_weights(self, weights):
params = dict(self.named_parameters())
loaded = set()
for name, tensor in weights:
if name in params:
params[name].data.copy_(tensor)
loaded.add(name)
return loaded
class SimpleModel(torch.nn.Module):
def __init__(self):
super().__init__()
self.model = SimpleInnerModel()
self.lm_head = torch.nn.Linear(8, 16, bias=False)
def load_weights(self, weights):
loader = AutoWeightsLoader(self)
return loader.load_weights(weights)
class PackedWeightInnerModel(torch.nn.Module):
"""Remaps q_proj/k_proj into a fused qkv_proj (Qwen2/Llama pattern)."""
def __init__(self):
super().__init__()
self.qkv_proj = torch.nn.Linear(4, 16, bias=False)
self.out = torch.nn.Linear(8, 4, bias=False)
def load_weights(self, weights):
params = dict(self.named_parameters())
loaded = set()
for name, tensor in weights:
if name == "q_proj.weight":
params["qkv_proj.weight"].data[:8].copy_(tensor)
loaded.add("qkv_proj.weight")
elif name == "k_proj.weight":
params["qkv_proj.weight"].data[8:].copy_(tensor)
loaded.add("qkv_proj.weight")
elif name in params:
params[name].data.copy_(tensor)
loaded.add(name)
return loaded
class PackedWeightModel(torch.nn.Module):
def __init__(self):
super().__init__()
self.model = PackedWeightInnerModel()
self.lm_head = torch.nn.Linear(4, 8, bias=False)
def load_weights(self, weights):
loader = AutoWeightsLoader(self)
return loader.load_weights(weights)
def _buffer_reusing_iterator(weight_dict):
"""Yield weights through a shared buffer overwritten each step.
Mimics ``runai_model_streamer`` with ``RUNAI_STREAMER_MEMORY_LIMIT=0``.
"""
buf = None
for name, tensor in weight_dict.items():
if buf is None or buf.numel() < tensor.numel():
buf = torch.empty(tensor.numel(), dtype=tensor.dtype)
view = buf[: tensor.numel()].view(tensor.shape)
view.copy_(tensor)
yield name, view
def _make_pooling_model(base_cls=SimpleModel):
PoolingModel = _create_pooling_model_cls(base_cls)
model = base_cls()
model.__class__ = PoolingModel
model.lm_head = StageMissingLayer("output", model.lm_head)
return model
def _make_reference_weights():
torch.manual_seed(42)
return {
"model.embed.weight": torch.randn(8, 4),
"model.layer0.weight": torch.randn(8, 8),
"model.layer1.weight": torch.randn(8, 8),
"model.norm.weight": torch.randn(4, 8),
"lm_head.weight": torch.randn(16, 8),
}
def _make_packed_reference_weights():
torch.manual_seed(42)
return {
"model.q_proj.weight": torch.randn(8, 4),
"model.k_proj.weight": torch.randn(8, 4),
"model.out.weight": torch.randn(4, 8),
"lm_head.weight": torch.randn(8, 4),
}
def _load_and_compare(model, ref, expected):
for p in model.parameters():
p.data.zero_()
model.load_weights(_buffer_reusing_iterator(ref))
for name, param in model.named_parameters():
assert torch.equal(param.data, expected[name]), name
def test_pooling_load_weights_with_buffer_reuse():
"""Ensure ModelForPooling.load_weights works with buffer-reusing iterators."""
ref = _make_reference_weights()
ground_truth = SimpleModel()
ground_truth.load_weights(ref.items())
expected = {n: p.data.clone() for n, p in ground_truth.named_parameters()}
_load_and_compare(_make_pooling_model(), ref, expected)
def test_pooling_load_weights_clones_probed_weights():
"""Ensure probed weights survive buffer reuse during packed remapping."""
ref = _make_packed_reference_weights()
ground_truth = PackedWeightModel()
ground_truth.load_weights(ref.items())
expected = {n: p.data.clone() for n, p in ground_truth.named_parameters()}
_load_and_compare(_make_pooling_model(PackedWeightModel), ref, expected)
class _LanguageModelInner(torch.nn.Module):
def __init__(self):
super().__init__()
self.embed = torch.nn.Linear(4, 8, bias=False)
self.layer0 = torch.nn.Linear(8, 8, bias=False)
class _LanguageModelWrapper(torch.nn.Module):
def __init__(self):
super().__init__()
self.model = _LanguageModelInner()
class ModelWithWeightsMapper(torch.nn.Module):
"""Stand-in for models whose keys only align after hf_to_vllm_mapper.
Checkpoint keys like ``model.language_model.*`` never match
``""`` / ``model.`` + raw name against ``language_model.model.*`` params.
The pooling prefix probe must consult the mapper so it can early-exit.
"""
hf_to_vllm_mapper = WeightsMapper(
orig_to_new_prefix={
"model.language_model.": "language_model.model.",
}
)
def __init__(self):
super().__init__()
self.language_model = _LanguageModelWrapper()
self.lm_head = torch.nn.Linear(8, 16, bias=False)
def load_weights(self, weights):
params = dict(self.named_parameters())
loaded = set()
self.seen_names = []
for name, tensor in weights:
self.seen_names.append(name)
mapped = self.hf_to_vllm_mapper._map_name(name)
if mapped is not None and mapped in params:
params[mapped].data.copy_(tensor)
loaded.add(mapped)
return loaded
def test_pooling_prefix_probe_uses_hf_to_vllm_mapper(monkeypatch):
"""Mapper lets the prefix probe early-exit without cloning the full ckpt.
Checkpoint keys only align after ``hf_to_vllm_mapper``. The probe must use
the mapped name for membership, keep forwarding original names to the
parent loader, and stop after the first hit instead of cloning everything.
"""
ref = {
"model.language_model.embed.weight": torch.randn(8, 4),
"model.language_model.layer0.weight": torch.randn(8, 8),
"model.language_model.extra0.weight": torch.randn(8, 8),
"model.language_model.extra1.weight": torch.randn(8, 8),
"model.language_model.extra2.weight": torch.randn(8, 8),
}
# Sanity: none of these keys match the generic "" / "model." probe.
model = _make_pooling_model(ModelWithWeightsMapper)
params = dict(model.named_parameters())
for name in ref:
assert name not in params
assert f"model.{name}" not in params
clone_count = 0
original_clone = torch.Tensor.clone
def counting_clone(self, *args, **kwargs):
nonlocal clone_count
clone_count += 1
return original_clone(self, *args, **kwargs)
monkeypatch.setattr(torch.Tensor, "clone", counting_clone)
loaded = model.load_weights(iter(ref.items()))
# First key maps onto a param, so the probe clones once and breaks.
assert clone_count == 1
assert clone_count < len(ref)
# Parent still receives original (unmapped, unprefixed) checkpoint names.
assert model.seen_names == list(ref.keys())
assert loaded == {
"language_model.model.embed.weight",
"language_model.model.layer0.weight",
}
def _composite_config(outer_labels=None, inner_labels=None):
"""Build a multimodal-style config whose text_config is a separate object."""
config = Gemma3Config(text_config={"num_hidden_layers": 1})
if outer_labels is not None:
config.num_labels = outer_labels
if inner_labels is not None:
config.get_text_config().num_labels = inner_labels
return config
def test_resolve_num_labels_text_only_config():
config = Qwen2Config(num_labels=7)
assert config.get_text_config() is config
assert _resolve_num_labels(config, config.get_text_config()) == 7
def test_resolve_num_labels_defaults_when_undeclared():
config = _composite_config()
assert (
_resolve_num_labels(config, config.get_text_config())
== PreTrainedConfig().num_labels
)
def test_resolve_num_labels_declared_on_outer_config():
"""Multimodal checkpoints keep id2label/problem_type on the top-level config."""
config = _composite_config(outer_labels=20)
assert config.get_text_config().num_labels == PreTrainedConfig().num_labels
assert _resolve_num_labels(config, config.get_text_config()) == 20
def test_resolve_num_labels_declared_on_text_config():
"""Overrides written into text_config keep working."""
config = _composite_config(inner_labels=5)
assert _resolve_num_labels(config, config.get_text_config()) == 5
def test_resolve_num_labels_outer_wins_when_both_declared():
config = _composite_config(outer_labels=20, inner_labels=5)
assert _resolve_num_labels(config, config.get_text_config()) == 20