Gahow Wang
445e491123
third_party/vllm/ now tracked in git for direct patch management.
Based on vLLM v0.18.1 release with one patch applied:
vllm/v1/core/sched/scheduler.py:
Replace fatal assert with graceful skip when KV transfer callback
arrives for an already-aborted request during PD disaggregated serving.
Future vLLM modifications should be made directly in third_party/vllm/
and committed normally. The patches/ directory is kept as documentation
of what changed from upstream.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
79 lines
2.4 KiB
Python
79 lines
2.4 KiB
Python
# SPDX-License-Identifier: Apache-2.0
|
|
# SPDX-FileCopyrightText: Copyright contributors to the vLLM project
|
|
|
|
from vllm.config import (
|
|
DeviceConfig,
|
|
KVTransferConfig,
|
|
ModelConfig,
|
|
VllmConfig,
|
|
set_current_vllm_config,
|
|
)
|
|
from vllm.distributed.kv_transfer.kv_connector.utils import (
|
|
get_kv_connector_cache_layout,
|
|
)
|
|
from vllm.logger import init_logger
|
|
|
|
logger = init_logger("test_expert_parallel")
|
|
|
|
|
|
def test_get_kv_connector_cache_layout_without_kv_connector():
|
|
vllm_config = VllmConfig(device_config=DeviceConfig("cpu"))
|
|
with set_current_vllm_config(vllm_config):
|
|
# Test with default settings
|
|
layout = get_kv_connector_cache_layout()
|
|
assert layout == "NHD"
|
|
|
|
|
|
def test_get_kv_connector_cache_layout_with_lmcache_connector():
|
|
kv_transfer_config = KVTransferConfig(
|
|
kv_connector="LMCacheConnectorV1",
|
|
kv_role="kv_both",
|
|
)
|
|
vllm_config = VllmConfig(
|
|
device_config=DeviceConfig("cpu"), kv_transfer_config=kv_transfer_config
|
|
)
|
|
with set_current_vllm_config(vllm_config):
|
|
# Test with default settings
|
|
layout = get_kv_connector_cache_layout()
|
|
assert layout == "NHD"
|
|
|
|
|
|
def test_get_kv_connector_cache_layout_with_nixl_connector():
|
|
kv_transfer_config = KVTransferConfig(
|
|
kv_connector="NixlConnector",
|
|
kv_role="kv_both",
|
|
)
|
|
model_config = ModelConfig()
|
|
vllm_config = VllmConfig(
|
|
device_config=DeviceConfig("cpu"),
|
|
model_config=model_config,
|
|
kv_transfer_config=kv_transfer_config,
|
|
)
|
|
with set_current_vllm_config(vllm_config):
|
|
# Test with default settings
|
|
layout = get_kv_connector_cache_layout()
|
|
assert layout == "HND"
|
|
|
|
|
|
def test_get_kv_connector_cache_layout_with_multi_connector():
|
|
kv_transfer_config = KVTransferConfig(
|
|
kv_connector="MultiConnector",
|
|
kv_role="kv_both",
|
|
kv_connector_extra_config={
|
|
"connectors": [
|
|
{"kv_connector": "ExampleConnector", "kv_role": "kv_both"},
|
|
{"kv_connector": "NixlConnector", "kv_role": "kv_both"},
|
|
]
|
|
},
|
|
)
|
|
model_config = ModelConfig()
|
|
vllm_config = VllmConfig(
|
|
device_config=DeviceConfig("cpu"),
|
|
model_config=model_config,
|
|
kv_transfer_config=kv_transfer_config,
|
|
)
|
|
with set_current_vllm_config(vllm_config):
|
|
# Test with default settings
|
|
layout = get_kv_connector_cache_layout()
|
|
assert layout == "HND"
|