A symbol scan over every tracked file found 123 top-level definitions in vllm/ with zero references, including references inside strings. All of them came from features this fork deleted earlier. - Delete dead attention helpers: MLADCPManager, split_prefill_chunks, the reshape helpers, compute_varlen_chunk_metadata, the LINEAR backend's unused BailingLinearAttentionBackend, and the sparse flash-attn entry points. - Delete the CPU and AMX op wrappers from _custom_ops.py: cpu_mla_decode, cpu_mla_extend, cpu_mla_get_scheduler_metadata, gather_mla_context_cache_cpu. - Delete dead quantization helpers: awq_pack, gptq_pack, gptq_quantize_weights, get_and_maybe_dequant_weights, marlin_quant_fp8_torch, the rand_marlin_weight_*_like pair, ocp_mx_weight_dtype_and_rows, get_fp8_block_weight_scale, input_to_float8. - Delete dead model helpers: resolve_visual_encoder_outputs, run_dp_sharded_vision_model, fast_topk, get_layer_index, is_pp_missing_parameter, skip_spec_layers, KimiK3MergedQKVGateLinear, selective_scan_fn, causal_conv1d_update_torch. - Delete dead utils: format_kib, format_mib, chunk_list, prev_power_of_2, split_host_port, join_host_port, make_zmq_path, make_async_with_semaphore, is_meta_module, is_non_overlapping_and_dense, supports_xpu_graph, create_kv_caches_with_random*, and the unused has_* capability probes. - Delete the unreachable deep-gemm mega-MoE warmup path, which imported vllm.models.deepseek_v4.nvidia.model and vllm.models.kimi_k3.nvidia.model, neither of which exists anymore. - Drop the imports and the two now-empty guards left behind. Verified statically: every changed file compiles, no unused import remains, and no deleted name is referenced in vllm, tests or csrc. The runtime gates still need the Python environment rebuilt. Co-authored-by: Hinata <hinata@idihore.id> Signed-off-by: MOVZX <movzx@yahoo.com>
330 lines
12 KiB
Python
330 lines
12 KiB
Python
# SPDX-License-Identifier: Apache-2.0
|
|
# SPDX-FileCopyrightText: Copyright contributors to the vLLM project
|
|
import functools
|
|
import operator
|
|
import time
|
|
from abc import ABC, abstractmethod
|
|
from collections import defaultdict
|
|
from collections.abc import Callable
|
|
from dataclasses import dataclass
|
|
from typing import Any, ClassVar, Generic, ParamSpec, TypeVar
|
|
|
|
import regex as re
|
|
import torch
|
|
import torch._inductor.pattern_matcher as pm
|
|
from torch import fx
|
|
from torch._dynamo.utils import lazy_format_graph_code
|
|
from torch._inductor.pattern_matcher import PatternMatcherPass, PatternPrettyPrinter
|
|
|
|
from vllm.config import VllmConfig
|
|
from vllm.logger import init_logger
|
|
from vllm.platforms import current_platform
|
|
|
|
from .fx_utils import is_func
|
|
from .inductor_pass import InductorPass, enable_fake_mode
|
|
|
|
logger = init_logger(__name__)
|
|
|
|
DEVICE_TYPE = current_platform.device_type
|
|
|
|
|
|
@dataclass
|
|
class InductorCompilationConfig:
|
|
splitting_ops: list[str] | None = None
|
|
use_inductor_graph_partition: bool = False
|
|
|
|
|
|
class VllmInductorPass(InductorPass):
|
|
"""An inductor pass with access to vLLM PassConfig.
|
|
It provides timing, logging, and dumping utilities.
|
|
"""
|
|
|
|
dump_prefix: ClassVar[int | None] = None
|
|
"""Keep track of pass index for debug dump ordering."""
|
|
|
|
def __init__(self, config: VllmConfig):
|
|
# Get only the necessary CompilationConfig for the inductor pass, since
|
|
# full `CompilationConfig` contains pointer to model which is unsafe.
|
|
self.compilation_config = InductorCompilationConfig(
|
|
splitting_ops=config.compilation_config.splitting_ops,
|
|
use_inductor_graph_partition=config.compilation_config.use_inductor_graph_partition,
|
|
)
|
|
self.pass_config = config.compilation_config.pass_config
|
|
self.model_dtype = config.model_config.dtype if config.model_config else None
|
|
self.device: str | None = (
|
|
config.device_config.device if config.device_config else None
|
|
)
|
|
self.pass_name = self.__class__.__name__
|
|
|
|
@staticmethod
|
|
def time_and_log(
|
|
call_fn: Callable[["VllmInductorPass", torch.fx.Graph], None],
|
|
) -> Callable[["VllmInductorPass", torch.fx.Graph], None]:
|
|
@functools.wraps(call_fn)
|
|
def wrapped(self: VllmInductorPass, graph: torch.fx.Graph) -> None:
|
|
self.begin()
|
|
self.dump_graph(graph, "before")
|
|
call_fn(self, graph)
|
|
self.dump_graph(graph, "after")
|
|
self.end_and_log()
|
|
|
|
return wrapped
|
|
|
|
def dump_graph(self, graph: torch.fx.Graph, stage: str) -> None:
|
|
i = VllmInductorPass.dump_prefix
|
|
i_str = "" if i is None else f".{i}"
|
|
lazy_format_graph_code(
|
|
f"post_grad{i_str}.{self.pass_name}.{stage}", graph.owning_module
|
|
)
|
|
|
|
def begin(self) -> None:
|
|
self._start_time = time.perf_counter_ns()
|
|
|
|
def end_and_log(self) -> None:
|
|
self._end_time = time.perf_counter_ns()
|
|
duration_ms = float(self._end_time - self._start_time) / 1.0e6
|
|
logger.debug("%s completed in %.1f ms", self.pass_name, duration_ms)
|
|
|
|
|
|
def get_match_table() -> dict[str, int]:
|
|
"""Return a snapshot of the match table."""
|
|
return dict(VllmPatternMatcherPass.match_table)
|
|
|
|
|
|
class VllmPatternMatcherPass(VllmInductorPass):
|
|
"""A VllmInductorPass that uses the Inductor pattern matcher.
|
|
Provides pattern registration with match counting, debug dumping, and logging.
|
|
"""
|
|
|
|
matched_count: int = 0
|
|
"""The number of matched patterns in the pass."""
|
|
|
|
match_table: ClassVar[defaultdict[str, int]] = defaultdict(int)
|
|
"""Global table mapping pass name to its total match count."""
|
|
|
|
_OP_OVERLOAD_PATTERN: ClassVar[re.Pattern] = re.compile(
|
|
r"<OpOverload\(op='([^']*)', overload='([^']*)'\)>"
|
|
)
|
|
|
|
def _replace_op_overloads(self, string: str) -> str:
|
|
"""Replace <OpOverload(..., ...)> with nicer formulations."""
|
|
return str(
|
|
self._OP_OVERLOAD_PATTERN.sub(
|
|
lambda m: f"torch.ops.{m.group(1)}.{m.group(2)}",
|
|
string,
|
|
)
|
|
)
|
|
|
|
@classmethod
|
|
def log_match_summary(cls) -> None:
|
|
if cls.match_table:
|
|
logger.debug("fusion pass matches: %s", dict(cls.match_table))
|
|
|
|
def dump_patterns(self, config: VllmConfig, pm_pass: PatternMatcherPass) -> None:
|
|
"""If debug dumping is enabled, dump the Inductor pattern-matcher patterns
|
|
into the debug_dump_path folder next to the dumped fx graphs.
|
|
|
|
This method does its best to print something that looks like Python code
|
|
for easier debugging and potentially navigation. If any errors appear in
|
|
the output, please add to this method.
|
|
|
|
TODO(luka): use pattern object to manually produce pattern graph
|
|
"""
|
|
debug_dump_path = config.compile_debug_dump_path()
|
|
if not debug_dump_path:
|
|
return
|
|
|
|
debug_dump_path.mkdir(parents=True, exist_ok=True)
|
|
|
|
from vllm.utils.system_utils import unique_filepath
|
|
|
|
file_path = unique_filepath(
|
|
lambda i: debug_dump_path / f"patterns.{self.pass_name}.{i}.py"
|
|
)
|
|
|
|
with file_path.open("w") as f:
|
|
print(
|
|
f"# This file was produced by VllmPatternMatcherPass."
|
|
f"dump_patterns for {self.pass_name}.\n"
|
|
f"# It does its best to produce valid-Python-looking code but"
|
|
f" please add to dump_patterns if there are any errors.\n\n"
|
|
f"from torch._higher_order_ops.auto_functionalize import "
|
|
f"auto_functionalized as auto_functionalized\n"
|
|
f"from torch._inductor.pattern_matcher import *\n"
|
|
f"vllm = torch.ops.vllm",
|
|
"vllm_ir = torch.ops.vllm_ir",
|
|
file=f,
|
|
)
|
|
|
|
for node, patterns in pm_pass.patterns.items():
|
|
# fix the operator.getitem repr
|
|
if node[1] == operator.getitem:
|
|
node_repr = f"({repr(node[0])}, operator.getitem)"
|
|
else:
|
|
node_repr = repr(node)
|
|
|
|
node_repr = self._replace_op_overloads(node_repr)
|
|
|
|
print(f"\n\n# Patterns for op: {node_repr}", file=f)
|
|
for i, pattern in enumerate(patterns):
|
|
# reserve auto_functionalized ahead of time
|
|
pp = PatternPrettyPrinter()
|
|
pp.namespace.create_name("auto_functionalized", None)
|
|
|
|
# Assemble pattern
|
|
out_node = pp.pretty_print(pattern.pattern)
|
|
pattern_repr = "\n".join(
|
|
[f"def pattern_{i}():"]
|
|
+ [
|
|
f"{pp.memoized_objs_names[key]} = "
|
|
f"{pp.memoized_objs_pp[key]}"
|
|
for key in pp.memoized_objs_names
|
|
]
|
|
+ [f"return {out_node}"]
|
|
).replace("\n", "\n ")
|
|
|
|
pattern_repr = self._replace_op_overloads(pattern_repr)
|
|
print(f"{pattern_repr}\n", file=f)
|
|
|
|
|
|
P = ParamSpec("P")
|
|
R = TypeVar("R")
|
|
|
|
|
|
class VllmPatternReplacement(ABC, Generic[P, R]):
|
|
"""A pattern/replacement pair for FX graph fusion.
|
|
|
|
Implement the three abstract members below, then pass
|
|
instances to VllmFusionPatternMatcherPass.register(). The pass will
|
|
find every occurrence of `pattern` in the graph and substitute it
|
|
with `replacement`.
|
|
"""
|
|
|
|
# TODO(Badr): bound methods work for pattern registration since
|
|
# PyTorch 2.10. Once vLLM requires torch>=2.11, replace these properties
|
|
# with plain methods and drop the closure indirection.
|
|
@property
|
|
@abstractmethod
|
|
def pattern(self) -> Callable[P, R]:
|
|
"""Returns a closure defining the FX subgraph to search for."""
|
|
...
|
|
|
|
@property
|
|
@abstractmethod
|
|
def replacement(self) -> Callable[P, R]:
|
|
"""Returns a closure defining the FX subgraph to
|
|
substitute in place of each match.
|
|
"""
|
|
...
|
|
|
|
@abstractmethod
|
|
def get_inputs(self) -> list[torch.Tensor]:
|
|
"""Example tensors used to trace pattern and replacement."""
|
|
...
|
|
|
|
# Helpers for get_inputs: uninitialized tensors of common dtypes.
|
|
@staticmethod
|
|
def empty(*args, **kwargs) -> torch.Tensor:
|
|
return torch.empty(*args, device=DEVICE_TYPE, **kwargs)
|
|
|
|
@staticmethod
|
|
def empty_bf16(*args, **kwargs) -> torch.Tensor:
|
|
return torch.empty(*args, dtype=torch.bfloat16, device=DEVICE_TYPE, **kwargs)
|
|
|
|
@staticmethod
|
|
def empty_fp16(*args, **kwargs) -> torch.Tensor:
|
|
return torch.empty(*args, dtype=torch.float16, device=DEVICE_TYPE, **kwargs)
|
|
|
|
@staticmethod
|
|
def empty_fp32(*args, **kwargs) -> torch.Tensor:
|
|
return torch.empty(*args, dtype=torch.float32, device=DEVICE_TYPE, **kwargs)
|
|
|
|
@staticmethod
|
|
def empty_i32(*args, **kwargs) -> torch.Tensor:
|
|
return torch.empty(*args, dtype=torch.int32, device=DEVICE_TYPE, **kwargs)
|
|
|
|
|
|
def _fx_view_to_reshape(gm: fx.GraphModule) -> None:
|
|
from torch._inductor.fx_passes.post_grad import view_to_reshape
|
|
|
|
view_to_reshape(gm)
|
|
|
|
|
|
def fold_consecutive_reshapes(gm: fx.GraphModule) -> None:
|
|
"""Fold consecutive reshape ops into a single reshape.
|
|
|
|
``make_fx`` faithfully records every view/reshape the Python code performs,
|
|
so patterns like ``x.reshape(a, b).reshape(c, d)`` produce two reshape
|
|
nodes. Inductor's own optimisation would fold these, but
|
|
``pm.register_replacement``'s ``trace_fn`` runs before Inductor, so we
|
|
must fold them ourselves for the pattern to match the compiled graph.
|
|
|
|
When reshape(A, shape1) feeds only into reshape(result, shape2),
|
|
the first reshape is redundant -- replace with reshape(A, shape2).
|
|
"""
|
|
aten_reshape = torch.ops.aten.reshape.default
|
|
for node in list(gm.graph.nodes):
|
|
if not is_func(node, aten_reshape):
|
|
continue
|
|
inp = node.args[0]
|
|
if not isinstance(inp, fx.Node) or not is_func(inp, aten_reshape):
|
|
continue
|
|
if len(inp.users) != 1:
|
|
continue
|
|
original_input = inp.args[0]
|
|
node.args = (original_input, node.args[1])
|
|
inp.replace_all_uses_with(original_input)
|
|
gm.graph.erase_node(inp)
|
|
|
|
|
|
def _remove_noop_permutes(gm: fx.GraphModule) -> None:
|
|
for node in gm.graph.nodes:
|
|
if not is_func(node, torch.ops.aten.permute.default):
|
|
continue
|
|
dims = node.args[1]
|
|
if any(dim != i for i, dim in enumerate(dims)):
|
|
continue
|
|
node.replace_all_uses_with(node.args[0])
|
|
gm.graph.erase_node(node)
|
|
|
|
|
|
class VllmFusionPatternMatcherPass(VllmPatternMatcherPass):
|
|
"""A VllmPatternMatcherPass for passes that use VllmPatternReplacement objects.
|
|
Subclasses register patterns via self.register() in their own __init__.
|
|
"""
|
|
|
|
def __init__(self, config: VllmConfig, pass_name: str) -> None:
|
|
super().__init__(config)
|
|
self.pass_name = pass_name
|
|
self.pm_pass = PatternMatcherPass(pass_name=pass_name)
|
|
self._pattern_replacements: list[VllmPatternReplacement] = []
|
|
|
|
@enable_fake_mode
|
|
def register(self, pr: VllmPatternReplacement) -> None:
|
|
pm.register_replacement(
|
|
pr.pattern,
|
|
pr.replacement,
|
|
pr.get_inputs(),
|
|
self._trace_fn,
|
|
self.pm_pass,
|
|
)
|
|
self._pattern_replacements.append(pr)
|
|
|
|
def uuid(self) -> str:
|
|
return VllmInductorPass.hash_source(
|
|
type(self),
|
|
*[type(pr) for pr in self._pattern_replacements],
|
|
)
|
|
|
|
@staticmethod
|
|
def _trace_fn(*args: Any, **kwargs: Any) -> fx.GraphModule:
|
|
gm = pm.fwd_only(*args, **kwargs)
|
|
_fx_view_to_reshape(gm)
|
|
_remove_noop_permutes(gm)
|
|
return gm
|
|
|
|
@VllmInductorPass.time_and_log
|
|
def __call__(self, graph: torch.fx.Graph) -> None:
|
|
self.matched_count = self.pm_pass.apply(graph)
|
|
VllmPatternMatcherPass.match_table[self.pass_name] += self.matched_count
|