Reduce AutoWeightsLoader kwargs (#53106)
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
This commit is contained in:
+28
-76
@@ -2,6 +2,7 @@
|
||||
# SPDX-FileCopyrightText: Copyright contributors to the vLLM project
|
||||
|
||||
import pytest
|
||||
import regex as re
|
||||
import torch
|
||||
|
||||
from vllm.model_executor.layers.vocab_parallel_embedding import (
|
||||
@@ -10,6 +11,7 @@ from vllm.model_executor.layers.vocab_parallel_embedding import (
|
||||
)
|
||||
from vllm.model_executor.models.utils import (
|
||||
AutoWeightsLoader,
|
||||
WeightsMapper,
|
||||
_merge_multimodal_embeddings,
|
||||
)
|
||||
from vllm.platforms import current_platform
|
||||
@@ -93,82 +95,6 @@ def test_module_with_child_containing_batchnorm_can_autoload():
|
||||
assert new_mod.nested_mod.bn.num_batches_tracked.item() == 1
|
||||
|
||||
|
||||
@pytest.mark.cpu_test
|
||||
def test_module_skip_prefix():
|
||||
"""Ensure the auto weight loader can skip prefix."""
|
||||
mod = ModuleWithNestedBatchNorm()
|
||||
# Run some data through the module with batchnorm
|
||||
mod(torch.Tensor([[1, 2], [3, 4]]))
|
||||
|
||||
# Try to load the weights to a new instance
|
||||
def weight_generator():
|
||||
# weights needed to be filtered out
|
||||
redundant_weights = {
|
||||
"prefix.bn.weight": torch.Tensor([1, 2]),
|
||||
"prefix.bn.bias": torch.Tensor([3, 4]),
|
||||
}
|
||||
yield from (mod.state_dict() | redundant_weights).items()
|
||||
|
||||
new_mod = ModuleWithNestedBatchNorm()
|
||||
|
||||
assert not torch.all(
|
||||
new_mod.nested_mod.bn.running_mean == mod.nested_mod.bn.running_mean
|
||||
)
|
||||
assert not torch.all(
|
||||
new_mod.nested_mod.bn.running_var == mod.nested_mod.bn.running_var
|
||||
)
|
||||
assert new_mod.nested_mod.bn.num_batches_tracked.item() == 0
|
||||
|
||||
loader = AutoWeightsLoader(new_mod, skip_prefixes=["prefix."])
|
||||
loader.load_weights(weight_generator())
|
||||
|
||||
# Ensure the stats are updated
|
||||
assert torch.all(
|
||||
new_mod.nested_mod.bn.running_mean == mod.nested_mod.bn.running_mean
|
||||
)
|
||||
assert torch.all(new_mod.nested_mod.bn.running_var == mod.nested_mod.bn.running_var)
|
||||
assert new_mod.nested_mod.bn.num_batches_tracked.item() == 1
|
||||
|
||||
|
||||
@pytest.mark.cpu_test
|
||||
def test_module_skip_substr():
|
||||
"""Ensure the auto weight loader can skip prefix."""
|
||||
mod = ModuleWithNestedBatchNorm()
|
||||
# Run some data through the module with batchnorm
|
||||
mod(torch.Tensor([[1, 2], [3, 4]]))
|
||||
|
||||
# Try to load the weights to a new instance
|
||||
def weight_generator():
|
||||
# weights needed to be filtered out
|
||||
redundant_weights = {
|
||||
"nested_mod.0.substr.weight": torch.Tensor([1, 2]),
|
||||
"nested_mod.0.substr.bias": torch.Tensor([3, 4]),
|
||||
"nested_mod.substr.weight": torch.Tensor([1, 2]),
|
||||
"nested_mod.substr.bias": torch.Tensor([3, 4]),
|
||||
}
|
||||
yield from (mod.state_dict() | redundant_weights).items()
|
||||
|
||||
new_mod = ModuleWithNestedBatchNorm()
|
||||
|
||||
assert not torch.all(
|
||||
new_mod.nested_mod.bn.running_mean == mod.nested_mod.bn.running_mean
|
||||
)
|
||||
assert not torch.all(
|
||||
new_mod.nested_mod.bn.running_var == mod.nested_mod.bn.running_var
|
||||
)
|
||||
assert new_mod.nested_mod.bn.num_batches_tracked.item() == 0
|
||||
|
||||
loader = AutoWeightsLoader(new_mod, skip_substrs=["substr."])
|
||||
loader.load_weights(weight_generator())
|
||||
|
||||
# Ensure the stats are updated
|
||||
assert torch.all(
|
||||
new_mod.nested_mod.bn.running_mean == mod.nested_mod.bn.running_mean
|
||||
)
|
||||
assert torch.all(new_mod.nested_mod.bn.running_var == mod.nested_mod.bn.running_var)
|
||||
assert new_mod.nested_mod.bn.num_batches_tracked.item() == 1
|
||||
|
||||
|
||||
VOCAB_SIZE = 16
|
||||
HIDDEN_SIZE = 2
|
||||
|
||||
@@ -265,3 +191,29 @@ def test_merge_multimodal_embeddings_no_sync():
|
||||
_merge_multimodal_embeddings(
|
||||
inputs_embeds, multimodal_embeddings, is_multimodal
|
||||
)
|
||||
|
||||
|
||||
@pytest.mark.cpu_test
|
||||
def test_get_rename_mapper_keeps_only_renames():
|
||||
"""`None` means "do not load", which is meaningless to the consumers of
|
||||
this mapper (LoRA name parsing, quantization config layer lists), and
|
||||
applying it would silently shrink their lists."""
|
||||
mapper = WeightsMapper(
|
||||
orig_to_new_regex={re.compile(r"^drop_regex\."): None},
|
||||
orig_to_new_substr={"drop_substr": None, "keep_substr": "kept"},
|
||||
orig_to_new_stacked={".q_proj": (".qkv_proj", "q")},
|
||||
orig_to_new_prefix={"drop_prefix.": None, "keep_prefix.": "kept."},
|
||||
orig_to_new_suffix={".drop_suffix": None},
|
||||
)
|
||||
renames = mapper.get_rename_mapper()
|
||||
|
||||
assert renames.orig_to_new_regex == {}
|
||||
assert renames.orig_to_new_substr == {"keep_substr": "kept"}
|
||||
assert renames.orig_to_new_stacked == {}
|
||||
assert renames.orig_to_new_prefix == {"keep_prefix.": "kept."}
|
||||
assert renames.orig_to_new_suffix == {}
|
||||
|
||||
# Names the full mapper drops now survive unchanged.
|
||||
for name in ("drop_regex.w", "drop_substr.w", "drop_prefix.w", "w.drop_suffix"):
|
||||
assert mapper._map_name(name) is None
|
||||
assert renames._map_name(name) == name
|
||||
|
||||
Reference in New Issue
Block a user