### What this PR does / why we need it?
This is a part of
https://github.com/vllm-project/vllm-ascend/issues/4715#issue-3694310762
1. refactor the npugraph_ex config,modified the default configuration of
the static kernel, new default value of static kernel is false
2. support online-infer with static kernel
3. fixed the issue where manually modifying FX graphs caused an abnormal
model return type, and removed the related redundant code.
### Does this PR introduce _any_ user-facing change?
yes,the new config of npugraph_ex is as follow:
```
additional_config={
"npugraph_ex_config": {
"enable": True,
"enable_static_kernel": False
}
}
```
### How was this patch tested?
```
vllm serve /data/DeepSeek-V3.1-Terminus-w4a8 \
--host 0.0.0.0 \
--port 8004 \
--data-parallel-size 4 \
--tensor-parallel-size 4 \
--quantization ascend \
--seed 1024 \
--served-model-name deepseek_v3 \
--enable-expert-parallel \
--max-num-seqs 48 \
--max-model-len 40000 \
--async-scheduling \
--max-num-batched-tokens 9000 \
--trust-remote-code \
--no-enable-prefix-caching \
--speculative-config '{"num_speculative_tokens": 3, "method":"deepseek_mtp","disable_padded_drafter_batch": false}' \
--gpu-memory-utilization 0.9 \
--compilation-config '{"cudagraph_capture_sizes":[4,32,64,112,160,176,192], "cudagraph_mode": "FULL_DECODE_ONLY"}' \
--additional-config \
'{"enable_shared_expert_dp": true,"multistream_overlap_shared_expert": true,"npugraph_ex_config":{"enable":true}}'
```
- vLLM version: v0.13.0
- vLLM main:
2f4e6548ef
---------
Signed-off-by: chencangtao <chencangtao@huawei.com>
Signed-off-by: ChenCangtao <50493711+ChenCangtao@users.noreply.github.com>
Co-authored-by: chencangtao <chencangtao@huawei.com>
156 lines
6.2 KiB
Python
156 lines
6.2 KiB
Python
#
|
|
# Copyright (c) 2025 Huawei Technologies Co., Ltd. All Rights Reserved.
|
|
# This file is a part of the vllm-ascend project.
|
|
#
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
#
|
|
import functools
|
|
from collections.abc import Callable
|
|
from typing import Any
|
|
|
|
import torch
|
|
import torch.fx as fx
|
|
from torch._dynamo.backends.common import aot_autograd
|
|
from torch._inductor.compile_fx import graph_returns_tuple, make_graph_return_tuple
|
|
from torch._inductor.decomposition import select_decomp_table
|
|
from torch.fx import GraphModule
|
|
from vllm.compilation.compiler_interface import CompilerInterface
|
|
from vllm.config import VllmConfig
|
|
from vllm.config.utils import Range
|
|
|
|
from vllm_ascend.ascend_config import NpugraphExConfig, get_ascend_config
|
|
from vllm_ascend.utils import COMPILATION_PASS_KEY
|
|
|
|
|
|
def compile_fx(graph: GraphModule, example_inputs: list, inner_compile: Callable, decompositions: dict) -> Callable:
|
|
recursive_compile_fx = functools.partial(compile_fx, inner_compile=inner_compile, decompositions=decompositions)
|
|
|
|
if not graph_returns_tuple(graph):
|
|
return make_graph_return_tuple(graph, example_inputs, recursive_compile_fx)
|
|
return aot_autograd(fw_compiler=inner_compile)(graph, example_inputs)
|
|
|
|
|
|
def fusion_pass_compile(
|
|
graph: fx.GraphModule,
|
|
example_inputs: list[Any],
|
|
compiler_config: dict[str, Any],
|
|
compile_range: Range,
|
|
key: str | None = None,
|
|
) -> tuple[Callable | None, Any | None]:
|
|
def compile_inner(graph, example_inputs):
|
|
current_pass_manager = compiler_config[COMPILATION_PASS_KEY]
|
|
graph = current_pass_manager(graph)
|
|
return graph
|
|
|
|
decompositions = select_decomp_table()
|
|
|
|
compiled_fn = compile_fx(
|
|
graph=graph,
|
|
example_inputs=example_inputs,
|
|
inner_compile=compile_inner,
|
|
decompositions=decompositions,
|
|
)
|
|
|
|
return compiled_fn, None
|
|
|
|
|
|
def npugraph_ex_compile(
|
|
graph: fx.GraphModule,
|
|
example_inputs: list[Any],
|
|
compiler_config: dict[str, Any],
|
|
vllm_config: VllmConfig,
|
|
npugraph_ex_config: NpugraphExConfig,
|
|
compile_range: Range,
|
|
key: str | None = None,
|
|
) -> tuple[Callable | None, Any | None]:
|
|
# When currently using the FULL_DECODE_ONLY mode,
|
|
# the piecewise compilation level slicing process
|
|
# in vllm is also encountered.
|
|
# This process causes the output to no longer be
|
|
# wrapped as a tuple when the fx graph has a single
|
|
# output, but torch.compile has a mandatory check.
|
|
fx_graph = graph.graph
|
|
if not graph_returns_tuple(graph):
|
|
output_node = fx_graph.output_node()
|
|
with fx_graph.inserting_before(output_node):
|
|
return_value = output_node.args[0]
|
|
tuple_node = fx_graph.create_node("call_function", tuple, args=([return_value],))
|
|
output_node.args = (tuple_node,)
|
|
graph.recompile()
|
|
import torchair
|
|
|
|
# TODO: use a better way to lazy register replacement, instead of import one by one
|
|
# As an example, we directly import here to register replacement.
|
|
# import vllm_ascend.compilation.npugraph_ex_passes.add_rms_norm_quant # noqa
|
|
|
|
torch.npu.set_compile_mode(jit_compile=False)
|
|
config = torchair.CompilerConfig()
|
|
# use aclgraph mode, avoid the transformation from fx graph to Ascend IR.
|
|
config.mode = "reduce-overhead"
|
|
# execute FX graph in eager mode before graph mode to optimize FX graph.
|
|
config.debug.run_eagerly = True
|
|
if npugraph_ex_config.enable_static_kernel:
|
|
config.experimental_config.aclgraph._aclnn_static_shape_kernel = True
|
|
# According to the cudagraph_capture_size configuration, set the shapes
|
|
# that can trigger the compilation of static kernel. If this configuration is
|
|
# not applied, new shapes will trigger the compilation of static kernels,
|
|
# affecting program execution.
|
|
num_spec_tokens = vllm_config.speculative_config.num_speculative_token if vllm_config.speculative_config else 0
|
|
uniform_decode_query_len = num_spec_tokens + 1
|
|
max_num_tokens = vllm_config.scheduler_config.max_num_seq * uniform_decode_query_len
|
|
decode_cudagraph_batch_sizes = [
|
|
x
|
|
for x in vllm_config.compilation_config.cudagraph_capture_size
|
|
if max_num_tokens >= x >= uniform_decode_query_len
|
|
]
|
|
config.experimental_config.aclgraph._aclnn_static_shape_kernel_sym_value_range = decode_cudagraph_batch_sizes
|
|
|
|
npugraph_ex = torchair.get_npu_backend(compiler_config=config)
|
|
|
|
compile_graph = npugraph_ex(graph, example_inputs)
|
|
return compile_graph, None
|
|
|
|
|
|
class AscendCompiler(CompilerInterface):
|
|
"""
|
|
AscendCompiler is a custom compiler interface for the Ascend platform.
|
|
This class provides a method to compile a PyTorch FX graph module with
|
|
specific configurations for graph fusion and decomposition.
|
|
"""
|
|
|
|
name = "AscendCompiler"
|
|
|
|
def compute_hash(self, vllm_config: VllmConfig) -> str:
|
|
npugraph_ex_config = get_ascend_config().npugraph_ex_config
|
|
if npugraph_ex_config.enable:
|
|
self.vllm_config = vllm_config
|
|
return vllm_config.compute_hash()
|
|
|
|
def compile(
|
|
self,
|
|
graph: fx.GraphModule,
|
|
example_inputs: list[Any],
|
|
compiler_config: dict[str, Any],
|
|
compile_range: Range,
|
|
key: str | None = None,
|
|
) -> tuple[Callable | None, Any | None]:
|
|
npugraph_ex_config = get_ascend_config().npugraph_ex_config
|
|
if npugraph_ex_config.enable:
|
|
assert hasattr(self, "vllm_config")
|
|
return npugraph_ex_compile(
|
|
graph, example_inputs, compiler_config, self.vllm_config, npugraph_ex_config, compile_range, key
|
|
)
|
|
else:
|
|
return fusion_pass_compile(graph, example_inputs, compiler_config, compile_range, key)
|