### What this PR does / why we need it?
**Scope of Changes**:
| File Path |
| :--- |
|`vllm_ascend/ops/layer_shard_linear.py`|
|`vllm_ascend/ops/linear.py`|
|`vllm_ascend/ops/linear_op.py`|
|`vllm_ascend/worker/worker.py`|
| ` vllm_ascend/patch/worker/patch_bert.py` |
| ` vllm_ascend/patch/worker/patch_deepseek.py` |
| ` vllm_ascend/patch/worker/patch_distributed.py` |
| ` vllm_ascend/patch/worker/patch_module.py` |
| ` vllm_ascend/patch/worker/patch_multimodal_merge.py` |
| ` vllm_ascend/patch/worker/patch_qwen3_next.py` |
| ` vllm_ascend/patch/worker/patch_qwen3_next_mtp.py` |
| ` vllm_ascend/patch/worker/patch_rejection_sampler.py` |
| ` vllm_ascend/patch/worker/patch_rope.py` |
| ` vllm_ascend/patch/worker/patch_triton.py` |
| ` vllm_ascend/patch/worker/patch_unquantized_gemm.py` |
| ` vllm_ascend/patch/worker/patch_v2_egale.py` |
|` vllm_ascend/worker/npu_input_batch.py`|
|` vllm_ascend/worker/v2/aclgraph_utils.py`|
|` vllm_ascend/worker/v2/attn_utils.py`|
|` vllm_ascend/worker/v2/model_runner.py`|
|` vllm_ascend/worker/v2/sample/gumbel.py`|
|` vllm_ascend/worker/v2/sample/penalties.py`|
|` vllm_ascend/worker/v2/sample/sampler.py`|
|` vllm_ascend/worker/v2/spec_decode/__init__.py`|
|` vllm_ascend/worker/v2/spec_decode/eagle.py`|
|` vllm_ascend/worker/v2/states.py`|
### Does this PR introduce _any_ user-facing change?
### How was this patch tested?
- vLLM version: v0.14.0
- vLLM main:
d68209402d
Signed-off-by: MrZ20 <2609716663@qq.com>
Signed-off-by: SILONG ZENG <2609716663@qq.com>
Signed-off-by: wangxiyuan <wangxiyuan1007@gmail.com>
Co-authored-by: wangxiyuan <wangxiyuan1007@gmail.com>
104 lines
3.4 KiB
Python
104 lines
3.4 KiB
Python
# Adapt from https://github.com/vllm-project/vllm/blob/main/vllm/v1/worker/gpu/states.py
|
|
# SPDX-License-Identifier: Apache-2.0
|
|
# SPDX-FileCopyrightText: Copyright contributors to the vLLM project
|
|
# Copyright (c) 2025 Huawei Technologies Co., Ltd. All Rights Reserved.
|
|
#
|
|
# 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.
|
|
# This file is a part of the vllm-ascend project.
|
|
#
|
|
|
|
from contextlib import contextmanager
|
|
|
|
import torch
|
|
import vllm
|
|
from vllm.v1.utils import CpuGpuBuffer
|
|
from vllm.v1.worker.gpu.states import RequestState
|
|
|
|
|
|
class AscendRequestState(RequestState):
|
|
"""Request state for Ascend NPUs."""
|
|
|
|
def __init__(
|
|
self,
|
|
max_num_reqs: int,
|
|
max_model_len: int,
|
|
max_num_batched_tokens: int,
|
|
num_speculative_steps: int,
|
|
vocab_size: int,
|
|
device: torch.device,
|
|
pin_memory: bool,
|
|
):
|
|
super().__init__(
|
|
max_num_reqs,
|
|
max_model_len,
|
|
max_num_batched_tokens,
|
|
num_speculative_steps,
|
|
vocab_size,
|
|
device,
|
|
pin_memory,
|
|
)
|
|
# because we will override these attribute, delete these attribute to
|
|
# make sure it's collected by python gc immediately.
|
|
del self.prefill_token_ids
|
|
# vllm gpu_model_runner_v2 deprecate the seqs_lens_cpu attribute,
|
|
# because they think most attention backends do not need it.
|
|
# However, Ascend attention backend muse uses seqs_lens_cpu,
|
|
# so we keep num_computed_tokens_cpu here, seq_lens_cpu need to be
|
|
# calculated by num_computed_tokens_cpu + decode_token_per_req outside.
|
|
self.num_computed_tokens_cpu: torch.Tensor = torch.zeros(
|
|
self.max_num_reqs,
|
|
dtype=torch.int32,
|
|
device="cpu",
|
|
)
|
|
# NOTE(Ronald1995): Ascend NPUs do not support UVA yet,
|
|
# so we use CpuGpuBuffer to allocate prefill_token_ids buffer.
|
|
self.prefill_token_ids: CpuGpuBuffer = self._make_buffer( # type: ignore
|
|
(self.max_num_reqs, self.max_model_len), dtype=torch.int32
|
|
)
|
|
|
|
def add_request(
|
|
self,
|
|
req_id,
|
|
prompt_len,
|
|
prefill_token_ids,
|
|
num_computed_tokens,
|
|
sampling_params,
|
|
lora_request,
|
|
):
|
|
super().add_request(
|
|
req_id,
|
|
prompt_len,
|
|
prefill_token_ids,
|
|
num_computed_tokens,
|
|
sampling_params,
|
|
lora_request,
|
|
)
|
|
req_idx = self.req_id_to_index[req_id]
|
|
self.num_computed_tokens_cpu[req_idx] = num_computed_tokens
|
|
|
|
|
|
@contextmanager
|
|
def uva_wrapper():
|
|
"""Context manager to disable UVA for Ascend NPUs."""
|
|
|
|
class UvaBufferWrapper:
|
|
def __init__(self, *args, **kwargs):
|
|
pass
|
|
|
|
try:
|
|
# TODO(Ronald1995): rectify this when NPU support uva.
|
|
vllm.v1.worker.gpu.states.UvaBuffer = UvaBufferWrapper
|
|
yield
|
|
finally:
|
|
pass
|