### What this PR does / why we need it?
Upgrade vllm commit to 0113 (11b6af5280d6d6dfb8953af16e67b25f819b3be9)
- Modify import paths due to the refactors
https://github.com/vllm-project/vllm/pull/31916
https://github.com/vllm-project/vllm/pull/32054
- Fix `TypeError: NPUOffloadingSpec.__init__() takes 2 positional
arguments but 3 were given` due to
https://github.com/vllm-project/vllm/pull/24498
- Skip the async-scheduling tests in
`tests/e2e/multicard/4-cards/long_sequence/test_mtp.py`, which are never
verified
https://github.com/vllm-project/vllm/pull/31998
- Skip some pooling tests, which are caused by
https://github.com/vllm-project/vllm/pull/32148
where vllm is also failed
https://buildkite.com/vllm/ci/builds/46705/steps/canvas?jid=019bb329-3834-4685-862b-1613b8e0f5d4
We will reopen those tests when main2main reachs
https://github.com/vllm-project/vllm/pull/32243
- Skip some cases in
`tests/e2e/multicard/4-cards/long_sequence/test_mtp.py`, which are
broken by
https://github.com/vllm-project/vllm/pull/32118
### Does this PR introduce _any_ user-facing change?
### How was this patch tested?
- vLLM version: v0.13.0
- vLLM main:
2f4e6548ef
Signed-off-by: wjunLu <wjunlu217@gmail.com>
Signed-off-by: hfadzxy <starmoon_zhang@163.com>
Co-authored-by: hfadzxy <starmoon_zhang@163.com>
78 lines
2.9 KiB
Python
78 lines
2.9 KiB
Python
from collections.abc import Iterator
|
|
from typing import Optional
|
|
|
|
import torch
|
|
from vllm.config import VllmConfig
|
|
from vllm.v1.kv_offload.abstract import LoadStoreSpec, OffloadingManager
|
|
from vllm.v1.kv_offload.backends.cpu import CPUBackend
|
|
from vllm.v1.kv_offload.lru_manager import LRUOffloadingManager
|
|
from vllm.v1.kv_offload.mediums import CPULoadStoreSpec, GPULoadStoreSpec
|
|
from vllm.v1.kv_offload.spec import OffloadingSpec
|
|
from vllm.v1.kv_offload.worker.worker import OffloadingHandler
|
|
from vllm.v1.kv_cache_interface import KVCacheConfig
|
|
|
|
from vllm_ascend.kv_offload.cpu_npu import CpuNpuOffloadingHandler
|
|
from vllm_ascend.utils import vllm_version_is
|
|
|
|
# isort: off
|
|
if vllm_version_is('0.13.0'):
|
|
from vllm.attention.backends.abstract import AttentionBackend # type: ignore
|
|
else:
|
|
from vllm.v1.attention.backend import AttentionBackend # type: ignore
|
|
# isort: on
|
|
|
|
|
|
class NPUOffloadingSpec(OffloadingSpec):
|
|
|
|
def __init__(self,
|
|
vllm_config: VllmConfig,
|
|
kv_cache_config: Optional[KVCacheConfig] = None):
|
|
if vllm_version_is('0.13.0'):
|
|
super().__init__(vllm_config)
|
|
else:
|
|
super().__init__(vllm_config, kv_cache_config)
|
|
|
|
num_cpu_blocks = self.extra_config.get("num_cpu_blocks")
|
|
if not num_cpu_blocks:
|
|
raise Exception(
|
|
"num_cpu_blocks must be specified in kv_connector_extra_config"
|
|
)
|
|
self.num_cpu_blocks: int = num_cpu_blocks
|
|
|
|
# scheduler-side
|
|
self._manager: Optional[OffloadingManager] = None
|
|
|
|
# worker-side
|
|
self._handler: Optional[OffloadingHandler] = None
|
|
|
|
def get_manager(self) -> OffloadingManager:
|
|
if not self._manager:
|
|
kv_events_config = self.vllm_config.kv_events_config
|
|
enable_events = (kv_events_config is not None
|
|
and kv_events_config.enable_kv_cache_events)
|
|
self._manager = LRUOffloadingManager(
|
|
CPUBackend(block_size=self.offloaded_block_size,
|
|
num_blocks=self.num_cpu_blocks),
|
|
enable_events=enable_events,
|
|
)
|
|
return self._manager
|
|
|
|
def get_handlers(
|
|
self,
|
|
kv_caches: dict[str, torch.Tensor],
|
|
attn_backends: dict[str, type[AttentionBackend]],
|
|
) -> Iterator[tuple[type[LoadStoreSpec], type[LoadStoreSpec],
|
|
OffloadingHandler]]:
|
|
if not self._handler:
|
|
self._handler = CpuNpuOffloadingHandler(
|
|
attn_backends=attn_backends,
|
|
gpu_block_size=self.gpu_block_size,
|
|
cpu_block_size=self.offloaded_block_size,
|
|
num_cpu_blocks=self.num_cpu_blocks,
|
|
gpu_caches=kv_caches,
|
|
)
|
|
|
|
assert self._handler is not None
|
|
yield GPULoadStoreSpec, CPULoadStoreSpec, self._handler
|
|
yield CPULoadStoreSpec, GPULoadStoreSpec, self._handler
|