diff --git a/tests/test_config.py b/tests/test_config.py index 5c892da6c6..a07929abfc 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -46,6 +46,7 @@ from vllm.config.utils import get_field from vllm.config.vllm import OPTIMIZATION_LEVEL_TO_CONFIG, OptimizationLevel from vllm.platforms import current_platform from vllm.transformers_utils.config import ( + _patch_hf_transformers_nested_rope_validation, get_pooling_config, try_get_dense_modules, ) @@ -54,6 +55,42 @@ from vllm.v1.attention.backend import AttentionCGSupport DEVICE_TYPE = current_platform.device_type +def test_nested_rope_validation_patch_preserves_flat_rope_parameters(monkeypatch): + calls = [] + + def original_validate_rope(config, *args, **kwargs): + calls.append(config) + + from transformers import PretrainedConfig + + monkeypatch.setattr(PretrainedConfig, "validate_rope", original_validate_rope) + _patch_hf_transformers_nested_rope_validation() + + nested_rope_parameters = { + "full_attention": {"rope_type": "default"}, + "original_max_position_embeddings": 32768, + } + PretrainedConfig.validate_rope( + SimpleNamespace(rope_parameters=nested_rope_parameters) + ) + assert nested_rope_parameters == {"full_attention": {"rope_type": "default"}} + + flat_rope_parameters = { + "rope_type": "linear", + "factor": 8.0, + "rope_theta": 500000.0, + } + PretrainedConfig.validate_rope( + SimpleNamespace(rope_parameters=flat_rope_parameters) + ) + assert flat_rope_parameters == { + "rope_type": "linear", + "factor": 8.0, + "rope_theta": 500000.0, + } + assert len(calls) == 2 + + def _write_json(path: Path, value: object) -> None: path.parent.mkdir(parents=True, exist_ok=True) path.write_text(json.dumps(value), encoding="utf-8") diff --git a/vllm/transformers_utils/config.py b/vllm/transformers_utils/config.py index 54f3086431..20d0d73afb 100644 --- a/vllm/transformers_utils/config.py +++ b/vllm/transformers_utils/config.py @@ -273,7 +273,7 @@ def _patch_hf_transformers_nested_rope_validation() -> None: layer_types = set(rope_parameters) & set( hf_configuration_utils.ALLOWED_LAYER_TYPES ) - if shared_keys := set(rope_parameters) - layer_types: + if layer_types and (shared_keys := set(rope_parameters) - layer_types): for key in shared_keys: del rope_parameters[key] logger.warning(