e32014ac1d
### What this PR does / why we need it? Support pooling models (like `bge-reranker-v2-m3`) in vllm-ascend, this pr covered the three model types of embed (cls_token, mean_token, lasttoken). After this [commit](17373dcd93), vllm has provided support for adapting pooling models on the v1 engine. This PR includes corresponding adaptations on the vllm-ascend side. Fixes #1960 - vLLM version: v0.12.0 - vLLM main:ad32e3e19c--------- Signed-off-by: lianyibo <lianyibo1@kunlunit.com> Signed-off-by: MengqingCao <cmq0113@163.com> Co-authored-by: MengqingCao <cmq0113@163.com>
46 lines
1.5 KiB
Python
46 lines
1.5 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 torch
|
|
from vllm.model_executor.models import bert
|
|
|
|
# aclgraph does not support shift operator for now
|
|
# TODO: revert me when aclgraph supports shift operator
|
|
TOKEN_TYPE_SHIFT = 30
|
|
TOKEN_TYPE_MULTIPLIER = 1 << 30
|
|
TOKEN_MASK = TOKEN_TYPE_MULTIPLIER - 1
|
|
|
|
|
|
def _encode_token_type_ids(input_ids: torch.Tensor,
|
|
token_type_ids: torch.Tensor) -> None:
|
|
# input_ids can be padded to the right
|
|
input_ids[:token_type_ids.shape[0]].bitwise_or_(token_type_ids *
|
|
TOKEN_TYPE_MULTIPLIER)
|
|
|
|
|
|
def _decode_token_type_ids(input_ids: torch.Tensor) -> torch.Tensor:
|
|
|
|
token_type_ids = input_ids // TOKEN_TYPE_MULTIPLIER
|
|
|
|
input_ids.bitwise_and_(TOKEN_MASK)
|
|
|
|
return token_type_ids
|
|
|
|
|
|
bert._encode_token_type_ids = _encode_token_type_ids
|
|
bert._decode_token_type_ids = _decode_token_type_ids
|