Skip to content

Commit df8d3d1

Browse files
authored
[Misc] Restrict ray version dependency and update PP feature warning in V1 (#15556)
1 parent 619d3de commit df8d3d1

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

requirements/cuda.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
numba == 0.60.0 # v0.61 doesn't support Python 3.9. Required for N-gram speculative decoding
55

66
# Dependencies for NVIDIA GPUs
7-
ray[cgraph]>=2.43.0 # Ray Compiled Graph, required for pipeline parallelism in V1.
7+
ray[cgraph]>=2.43.0, !=2.44.* # Ray Compiled Graph, required for pipeline parallelism in V1.
88
torch==2.6.0
99
torchaudio==2.6.0
1010
# These must be updated alongside torch

requirements/test.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ vector_quantize_pytorch # required for minicpmo_26 test
1717
vocos # required for minicpmo_26 test
1818
peft
1919
pqdm
20-
ray[cgraph]>=2.43.0 # Ray Compiled Graph, required by pipeline parallelism tests
20+
ray[cgraph]>=2.43.0, !=2.44.* # Ray Compiled Graph, required by pipeline parallelism tests
2121
sentence-transformers # required for embedding tests
2222
soundfile # required for audio tests
2323
jiwer # required for audio tests

vllm/config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ def __init__(
313313
raise ValueError(
314314
"VLLM_ATTENTION_BACKEND is set to FLASHINFER, but flashinfer "
315315
"module was not found."
316-
"See https://github.com/vllm-project/vllm/blob/main/Dockerfile"
316+
"See https://github.com/vllm-project/vllm/blob/main/Dockerfile "
317317
"for instructions on how to install it.")
318318

319319
# The tokenizer version is consistent with the model version by default.

vllm/engine/arg_utils.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1686,8 +1686,11 @@ def _is_v1_supported_oracle(self, model_config: ModelConfig) -> bool:
16861686
if self.enable_lora and _warn_or_fallback("LORA"):
16871687
return False
16881688

1689-
# PP is supported on V1, but off by default for now.
1690-
if self.pipeline_parallel_size > 1 and _warn_or_fallback("PP"):
1689+
# PP is supported on V1 with Ray distributed executor,
1690+
# but off for MP distributed executor for now.
1691+
if (self.pipeline_parallel_size > 1
1692+
and self.distributed_executor_backend == "mp"
1693+
and _warn_or_fallback("PP (MP distributed executor)")):
16911694
return False
16921695

16931696
# ngram is supported on V1, but off by default for now.

0 commit comments

Comments
 (0)