[Config Refactor][2/N] Pipeline + Deploy Config Schema (#2383)
Signed-off-by: lishunyang <lishunyang12@163.com> Signed-off-by: reidliu41 <reid201711@gmail.com> Signed-off-by: Alex Brooks <albrooks@redhat.com> Co-authored-by: reidliu41 <reid201711@gmail.com> Co-authored-by: xiaohajiayou <75477391+xiaohajiayou@users.noreply.github.com> Co-authored-by: Alex Brooks <albrooks@redhat.com> Co-authored-by: Hongsheng Liu <liuhongsheng4@huawei.com>
This commit is contained in:
104 files changed
+3959
-3814
No files matched your search
+161
-17
@@ -1,3 +1,4 @@
|
||||
import argparse
|
||||
import os
|
||||
import types
|
||||
from collections import Counter
|
||||
@@ -5,10 +6,12 @@ from dataclasses import fields, is_dataclass
|
||||
from pathlib import Path
|
||||
from typing import Any, get_args, get_origin
|
||||
|
||||
import yaml
|
||||
from vllm.logger import init_logger
|
||||
from vllm.transformers_utils.config import get_config, get_hf_file_to_dict
|
||||
from vllm.transformers_utils.repo_utils import file_or_path_exists
|
||||
|
||||
from vllm_omni.config.stage_config import StageConfigFactory
|
||||
from vllm_omni.config.yaml_util import create_config, load_yaml_config, merge_configs
|
||||
from vllm_omni.entrypoints.stage_utils import _to_dict
|
||||
from vllm_omni.platforms import current_omni_platform
|
||||
@@ -23,6 +26,65 @@ _DIFFUSERS_CLASS_TO_CONFIG: dict[str, str] = {
|
||||
}
|
||||
|
||||
|
||||
def detect_explicit_cli_keys(
|
||||
argv: list[str],
|
||||
parser: argparse.ArgumentParser | None = None,
|
||||
) -> set[str]:
|
||||
"""Walk ``argv`` and return the set of ``dest`` attribute names the user
|
||||
explicitly provided (e.g. ``--max-num-seqs 64`` → ``max_num_seqs``).
|
||||
|
||||
Used to distinguish user-typed CLI args from argparse default values so
|
||||
deploy YAMLs are not silently overridden by parser defaults. Shared
|
||||
across online (``vllm serve``) and offline (scripts, examples, tests,
|
||||
CI) entry points — offline callers that parse CLI args via argparse
|
||||
should invoke this on ``sys.argv[1:]`` and pass the result through to
|
||||
``AsyncOmni`` / ``Omni`` via the ``_cli_explicit_keys`` kwarg.
|
||||
|
||||
When ``parser`` is provided, each token is looked up in the parser's
|
||||
action table to find its real ``dest``. This correctly handles flags
|
||||
with ``dest=`` overrides, alias flags (e.g. ``--usp`` /
|
||||
``--ulysses-degree`` both mapping to ``ulysses_degree``), and
|
||||
``--disable-foo`` / ``store_false`` patterns that map to a differently
|
||||
named dest. Callers with access to an ``argparse.ArgumentParser`` should
|
||||
always pass it.
|
||||
|
||||
When ``parser`` is ``None``, a name-based heuristic is used as a
|
||||
fallback (hyphens → underscores, plus a ``no_`` prefix strip for
|
||||
``argparse.BooleanOptionalAction``). This is correct for simple flags
|
||||
but silently misidentifies ``--disable-X``-style flags and explicit
|
||||
``dest=`` overrides, so prefer the parser-aware form.
|
||||
"""
|
||||
if parser is not None:
|
||||
dest_map: dict[str, str] = {}
|
||||
for action in parser._actions:
|
||||
for opt in action.option_strings:
|
||||
dest_map[opt] = action.dest
|
||||
explicit: set[str] = set()
|
||||
for tok in argv:
|
||||
if not tok.startswith("--"):
|
||||
continue
|
||||
flag = tok.split("=", 1)[0]
|
||||
dest = dest_map.get(flag)
|
||||
if dest is not None:
|
||||
explicit.add(dest)
|
||||
return explicit
|
||||
|
||||
# Fallback: name-based heuristic (legacy path for callers without a parser).
|
||||
explicit = set()
|
||||
for tok in argv:
|
||||
if not tok.startswith("--"):
|
||||
continue
|
||||
name = tok[2:].split("=", 1)[0]
|
||||
if not name:
|
||||
continue
|
||||
attr = name.replace("-", "_")
|
||||
explicit.add(attr)
|
||||
# BooleanOptionalAction: --no-foo records as dest `foo`, not `no_foo`.
|
||||
if attr.startswith("no_"):
|
||||
explicit.add(attr[3:])
|
||||
return explicit
|
||||
|
||||
|
||||
def inject_omni_kv_config(stage: Any, omni_conn_cfg: dict[str, Any], omni_from: str, omni_to: str) -> None:
|
||||
"""Inject connector configuration into stage engine arguments."""
|
||||
# Prepare omni_kv_config dict
|
||||
@@ -273,29 +335,59 @@ def resolve_model_config_path(model: str) -> str:
|
||||
return str(stage_config_path)
|
||||
|
||||
|
||||
def load_stage_configs_from_model(model: str, base_engine_args: dict | None = None) -> list:
|
||||
def load_stage_configs_from_model(
|
||||
model: str,
|
||||
base_engine_args: dict | None = None,
|
||||
deploy_config_path: str | None = None,
|
||||
stage_overrides: dict[str, dict[str, Any]] | None = None,
|
||||
cli_explicit_keys: set[str] | None = None,
|
||||
) -> list:
|
||||
"""Load stage configurations from model's default config file.
|
||||
|
||||
.. deprecated::
|
||||
This is the legacy OmegaConf-based loading path. New code should use
|
||||
``StageConfigFactory.create_from_model()`` instead. This function will
|
||||
be removed once all callers are migrated (see PR series [2/N]).
|
||||
For models registered in the pipeline registry (new path), uses
|
||||
``StageConfigFactory.create_from_model()`` which merges
|
||||
PipelineConfig + DeployConfig + CLI overrides.
|
||||
|
||||
Loads stage configurations based on the model type and device type.
|
||||
First tries to load a device-specific YAML file from stage_configs/{device_type}/
|
||||
directory. If not found, falls back to the default config file.
|
||||
For other models (legacy path), loads stage configs from YAML.
|
||||
|
||||
Args:
|
||||
model: Model name or path (used to determine model_type)
|
||||
base_engine_args: Base engine args to merge as CLI overrides.
|
||||
deploy_config_path: Optional explicit deploy config path.
|
||||
stage_overrides: Per-stage overrides from --stage-overrides.
|
||||
cli_explicit_keys: Set of CLI keys the user actually typed. When
|
||||
provided, only these keys override deploy YAML; argparse defaults
|
||||
stay subordinate to YAML. ``None`` means treat every kwarg as
|
||||
explicit (programmatic ``Omni()`` calls).
|
||||
|
||||
Returns:
|
||||
List of stage configuration dictionaries
|
||||
|
||||
Raises:
|
||||
FileNotFoundError: If no stage config file exists for the model type
|
||||
"""
|
||||
if base_engine_args is None:
|
||||
base_engine_args = {}
|
||||
|
||||
cli_overrides = _convert_dataclasses_to_dict(dict(base_engine_args))
|
||||
# Per-stage JSON overrides are always explicit (the user typed --stage-overrides).
|
||||
explicit = set(cli_explicit_keys) if cli_explicit_keys is not None else None
|
||||
if stage_overrides:
|
||||
for stage_id_str, overrides in stage_overrides.items():
|
||||
for key, val in overrides.items():
|
||||
stage_key = f"stage_{stage_id_str}_{key}"
|
||||
cli_overrides[stage_key] = val
|
||||
if explicit is not None:
|
||||
explicit.add(stage_key)
|
||||
|
||||
stages = StageConfigFactory.create_from_model(
|
||||
model,
|
||||
cli_overrides=cli_overrides,
|
||||
deploy_config_path=deploy_config_path,
|
||||
cli_explicit_keys=explicit,
|
||||
)
|
||||
if stages is not None:
|
||||
# Convert StageConfig objects to OmegaConf for backward compat
|
||||
return [stage.to_omegaconf() for stage in stages]
|
||||
|
||||
# Legacy fallback: load from YAML
|
||||
stage_config_path = resolve_model_config_path(model)
|
||||
if stage_config_path is None:
|
||||
return []
|
||||
@@ -312,10 +404,9 @@ def load_stage_configs_from_yaml(
|
||||
base_engine_args: dict | None = None,
|
||||
prefer_stage_engine_args: bool = True,
|
||||
) -> list:
|
||||
"""Load stage configurations from a YAML file.
|
||||
"""Load stage configurations from a YAML file (legacy OmegaConf path).
|
||||
|
||||
.. deprecated::
|
||||
Legacy OmegaConf-based loader. Will be removed in PR series [2/N].
|
||||
TODO(@lishunyang12): remove once all models use PipelineConfig + DeployConfig.
|
||||
|
||||
Args:
|
||||
config_path: Path to the YAML configuration file
|
||||
@@ -449,22 +540,75 @@ def load_and_resolve_stage_configs(
|
||||
stage_configs_path: str | None,
|
||||
kwargs: dict | None,
|
||||
default_stage_cfg_factory: Any = None,
|
||||
deploy_config_path: str | None = None,
|
||||
stage_overrides: dict[str, dict[str, Any]] | None = None,
|
||||
cli_explicit_keys: set[str] | None = None,
|
||||
) -> tuple[str, list]:
|
||||
"""Load stage configurations from model or YAML file with fallback to defaults.
|
||||
|
||||
Args:
|
||||
model: Model name or path
|
||||
stage_configs_path: Optional path to YAML file containing stage configurations
|
||||
stage_configs_path: Optional path to legacy YAML (stage_args format)
|
||||
kwargs: Engine arguments to merge with stage configs
|
||||
default_stage_cfg_factory: Optional callable that takes no args and returns
|
||||
default stage config list when no configs are found
|
||||
deploy_config_path: Optional path to deploy YAML (new format).
|
||||
Mutually exclusive with ``stage_configs_path``.
|
||||
stage_overrides: Per-stage overrides from ``--stage-overrides`` JSON.
|
||||
Keys are stage_id strings, values are dicts of overrides.
|
||||
|
||||
Returns:
|
||||
Tuple of (config_path, stage_configs)
|
||||
"""
|
||||
if stage_configs_path is None:
|
||||
if stage_configs_path is not None and deploy_config_path is not None:
|
||||
raise ValueError(
|
||||
"--stage-configs-path and --deploy-config are mutually exclusive: "
|
||||
"they use different path resolution rules and loading paths. "
|
||||
"Use --deploy-config for new-format YAMLs (preferred); "
|
||||
"--stage-configs-path is kept only for the legacy `stage_args` format "
|
||||
"and will be removed in a future release."
|
||||
)
|
||||
if stage_configs_path is not None and deploy_config_path is None:
|
||||
if not os.path.exists(stage_configs_path):
|
||||
raise FileNotFoundError(
|
||||
f"--stage-configs-path {stage_configs_path!r} does not exist. "
|
||||
"Legacy `stage_configs/` yamls were replaced by `vllm_omni/deploy/<model>.yaml`; "
|
||||
"use --deploy-config. See docs/configuration/stage_configs.md."
|
||||
)
|
||||
with open(stage_configs_path, encoding="utf-8") as f:
|
||||
_peek = yaml.safe_load(f) or {}
|
||||
if "stages" in _peek and "stage_args" not in _peek:
|
||||
deploy_config_path = stage_configs_path
|
||||
stage_configs_path = None
|
||||
else:
|
||||
logger.warning(
|
||||
"--stage-configs-path is deprecated; migrate %r and use --deploy-config.",
|
||||
stage_configs_path,
|
||||
)
|
||||
|
||||
if deploy_config_path is not None:
|
||||
config_path = deploy_config_path
|
||||
stage_configs = load_stage_configs_from_model(
|
||||
model,
|
||||
base_engine_args=kwargs,
|
||||
deploy_config_path=deploy_config_path,
|
||||
stage_overrides=stage_overrides,
|
||||
cli_explicit_keys=cli_explicit_keys,
|
||||
)
|
||||
if not stage_configs:
|
||||
if default_stage_cfg_factory is not None:
|
||||
default_stage_cfg = default_stage_cfg_factory()
|
||||
stage_configs = create_config(default_stage_cfg)
|
||||
else:
|
||||
stage_configs = []
|
||||
elif stage_configs_path is None:
|
||||
config_path = resolve_model_config_path(model)
|
||||
stage_configs = load_stage_configs_from_model(model, base_engine_args=kwargs)
|
||||
stage_configs = load_stage_configs_from_model(
|
||||
model,
|
||||
base_engine_args=kwargs,
|
||||
stage_overrides=stage_overrides,
|
||||
cli_explicit_keys=cli_explicit_keys,
|
||||
)
|
||||
if not stage_configs:
|
||||
if default_stage_cfg_factory is not None:
|
||||
default_stage_cfg = default_stage_cfg_factory()
|
||||
|
||||
Reference in new issue
Block a user