Improve Transformers modelling backend fx tracer (#49957)
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
This commit is contained in:
@@ -368,12 +368,12 @@ def test_qkv_identifies_output_projection():
|
||||
assert get_fuser(PerHeadQKNormAttention()).o_name == "o_proj"
|
||||
|
||||
|
||||
def test_fuser_is_cached_per_class():
|
||||
def test_fuser_is_cached_per_class_and_structure():
|
||||
with torch.device("meta"):
|
||||
fuser_a = get_fuser(GLUMLP())
|
||||
fuser_b = get_fuser(GLUMLP())
|
||||
assert fuser_a is fuser_b
|
||||
assert GLUMLP in get_fuser.cache
|
||||
assert any(key[0] is GLUMLP for key in get_fuser.cache)
|
||||
|
||||
|
||||
@pytest.mark.parametrize("cls", [NotAnMLP, UntraceableMLP])
|
||||
@@ -460,8 +460,7 @@ def test_unfusable_modules_are_not_fused(cls, default_vllm_config):
|
||||
fuser = get_fuser(module)
|
||||
# Either no pattern matches the class, or this instance fails validation
|
||||
# (`recursive_replace` gates fusion and its weight mappings on `validate`)
|
||||
model_config = default_vllm_config.model_config
|
||||
assert fuser is None or not fuser.validate(module, model_config)
|
||||
assert fuser is None or not fuser.validate(module, default_vllm_config)
|
||||
|
||||
|
||||
def test_act_and_mul_derived_from_module(default_vllm_config):
|
||||
|
||||
@@ -148,11 +148,13 @@ def test_rms_norm_builds_vllm_class(cls, expected, zero_centered, default_vllm_c
|
||||
|
||||
# `default_vllm_config` supplies the config context the CustomOp needs; the
|
||||
# weightless path reads hidden size from the model config, so stub it.
|
||||
model_config = SimpleNamespace(get_hidden_size=lambda: 16)
|
||||
vllm_config = SimpleNamespace(
|
||||
model_config=SimpleNamespace(get_hidden_size=lambda: 16)
|
||||
)
|
||||
with torch.device("meta"):
|
||||
module = cls()
|
||||
fuser = get_fuser(module)
|
||||
built = fuser.fuse(module, "norm", model_config, None)
|
||||
built = fuser.fuse(module, "norm", vllm_config)
|
||||
from vllm.model_executor.models.transformers.fusers.rms_norm import (
|
||||
TPAwareNormMixin,
|
||||
)
|
||||
@@ -176,8 +178,9 @@ def test_fused_rms_norm_op_default_eps(default_vllm_config):
|
||||
fuser = get_fuser(module)
|
||||
assert isinstance(fuser, RMSNormFuser)
|
||||
assert not fuser.zero_centered
|
||||
model_config = SimpleNamespace(get_hidden_size=lambda: 16, dtype=torch.float32)
|
||||
built = fuser.fuse(module, "norm", model_config, None)
|
||||
mc = SimpleNamespace(get_hidden_size=lambda: 16, dtype=torch.float32)
|
||||
vllm_config = SimpleNamespace(model_config=mc)
|
||||
built = fuser.fuse(module, "norm", vllm_config)
|
||||
assert isinstance(built, VLLMRMSNorm)
|
||||
assert built.variance_epsilon == torch.finfo(torch.float32).eps
|
||||
|
||||
@@ -185,11 +188,13 @@ def test_fused_rms_norm_op_default_eps(default_vllm_config):
|
||||
def test_eps_is_derived_per_instance(default_vllm_config):
|
||||
"""Two instances of the same norm class with different eps must fuse to their
|
||||
own eps: the type-cached fuser holds only structure, not this value."""
|
||||
model_config = SimpleNamespace(get_hidden_size=lambda: 16)
|
||||
vllm_config = SimpleNamespace(
|
||||
model_config=SimpleNamespace(get_hidden_size=lambda: 16)
|
||||
)
|
||||
with torch.device("meta"):
|
||||
for eps in (1e-5, 1e-6):
|
||||
module = RMSNorm(16, eps=eps)
|
||||
built = get_fuser(module).fuse(module, "norm", model_config, None)
|
||||
built = get_fuser(module).fuse(module, "norm", vllm_config)
|
||||
assert built.variance_epsilon == eps
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user