Skip to content

Commit 06a5c79

Browse files
heheda12345choprahetarth
authored andcommitted
[Hybrid Allocator] Support Pipeline Parallel (vllm-project#23974)
Signed-off-by: Chen Zhang <[email protected]>
1 parent f485e35 commit 06a5c79

File tree

7 files changed

+457
-220
lines changed

7 files changed

+457
-220
lines changed

tests/distributed/test_pipeline_parallel.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -215,9 +215,7 @@ def iter_params(self, model_id: str):
215215
EMBEDDING_MODELS = { # type: ignore[var-annotated]
216216
# [Text-only]
217217
"intfloat/e5-mistral-7b-instruct": PPTestSettings.fast(runner="pooling"),
218-
# TODO: re-enable when https://github.com/vllm-project/vllm/issues/23883
219-
# is fixed
220-
#"BAAI/bge-multilingual-gemma2": PPTestSettings.fast(runner="pooling"),
218+
"BAAI/bge-multilingual-gemma2": PPTestSettings.fast(runner="pooling"),
221219
"Qwen/Qwen2.5-Math-RM-72B": PPTestSettings.fast(
222220
load_format="dummy", runner="pooling"
223221
),

tests/models/test_initialization.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from vllm.config import ModelImpl
1111
from vllm.engine.llm_engine import LLMEngine as V0LLMEngine
1212
from vllm.utils import GiB_bytes
13-
from vllm.v1.core.kv_cache_utils import get_kv_cache_config
13+
from vllm.v1.core.kv_cache_utils import get_kv_cache_configs
1414
from vllm.v1.engine.core import EngineCore as V1EngineCore
1515

1616
from ..utils import create_new_process_for_each_test
@@ -68,11 +68,11 @@ def _initialize_kv_caches_v0(self) -> None:
6868

6969
def _initialize_kv_caches_v1(self, vllm_config):
7070
kv_cache_specs = self.model_executor.get_kv_cache_specs()
71-
scheduler_kv_cache_config = get_kv_cache_config(
71+
scheduler_kv_cache_config = get_kv_cache_configs(
7272
vllm_config,
73-
kv_cache_specs[0],
74-
10 * GiB_bytes,
75-
)
73+
kv_cache_specs,
74+
[10 * GiB_bytes],
75+
)[0]
7676

7777
# gpu_blocks (> 0), cpu_blocks, scheduler_kv_cache_config
7878
return 1, 0, scheduler_kv_cache_config

0 commit comments

Comments
 (0)