From 4914466f0bcacf7cfe25b5846e2edd561d97f019 Mon Sep 17 00:00:00 2001 From: tzhouam Date: Tue, 3 Mar 2026 15:09:26 +0000 Subject: [PATCH] Update Dockerfile.ci to install vLLM wheel version 3dd142adb7f7fa3b0b8345ee046ba36a12d9e530 and remove ExtractHiddenStatesProposer references from GPU model runners for cleaner code. Signed-off-by: tzhouam --- docker/Dockerfile.ci | 4 ++-- vllm_omni/worker/gpu_ar_model_runner.py | 5 ++--- vllm_omni/worker/gpu_generation_model_runner.py | 7 ++----- vllm_omni/worker/gpu_model_runner.py | 7 ++----- 4 files changed, 8 insertions(+), 15 deletions(-) diff --git a/docker/Dockerfile.ci b/docker/Dockerfile.ci index 2f62102bf..4b8e7738c 100644 --- a/docker/Dockerfile.ci +++ b/docker/Dockerfile.ci @@ -14,11 +14,11 @@ RUN apt-get update && \ # Install vLLM wheel for the specific commit # URL format: https://wheels.vllm.ai// -# Current vLLM wheel commit: 6521ccf2860eb72cf23a9fa9044bf9721fd9a7c6 +# Current vLLM wheel commit: 3dd142adb7f7fa3b0b8345ee046ba36a12d9e530 (releases/v0.17.0) # Note: --prerelease=allow is required because nightly/commit wheels use # pre-release version numbers (e.g. 2.10.0.dev...) which uv ignores by default, # causing it to fall back to the older stable release from PyPI. -RUN uv pip install --system --upgrade --force-reinstall --prerelease=allow vllm --extra-index-url https://wheels.vllm.ai/6521ccf2860eb72cf23a9fa9044bf9721fd9a7c6 +RUN uv pip install --system --upgrade --force-reinstall --prerelease=allow vllm --extra-index-url https://wheels.vllm.ai/3dd142adb7f7fa3b0b8345ee046ba36a12d9e530 RUN uv pip install --system --no-cache-dir ".[dev]" RUN uv pip install --system --upgrade \ diff --git a/vllm_omni/worker/gpu_ar_model_runner.py b/vllm_omni/worker/gpu_ar_model_runner.py index e423101f0..72ccaa195 100644 --- a/vllm_omni/worker/gpu_ar_model_runner.py +++ b/vllm_omni/worker/gpu_ar_model_runner.py @@ -24,7 +24,6 @@ from vllm.v1.core.sched.output import GrammarOutput, SchedulerOutput from vllm.v1.outputs import AsyncModelRunnerOutput, make_empty_encoder_model_runner_output from vllm.v1.spec_decode.draft_model import DraftModelProposer from vllm.v1.spec_decode.eagle import EagleProposer -from vllm.v1.spec_decode.extract_hidden_states import ExtractHiddenStatesProposer from vllm.v1.structured_output.utils import apply_grammar_bitmask from vllm.v1.utils import record_function_or_nullcontext from vllm.v1.worker.gpu_model_runner import ( @@ -462,12 +461,12 @@ class GPUARModelRunner(OmniGPUModelRunner): <= self.effective_drafter_max_model_len ) use_gpu_toks = ( - spec_config.use_eagle() or spec_config.uses_draft_model() or spec_config.uses_extract_hidden_states() + spec_config.use_eagle() or spec_config.uses_draft_model() ) and not spec_config.disable_padded_drafter_batch if use_gpu_toks: assert isinstance( self.drafter, - EagleProposer | DraftModelProposer | ExtractHiddenStatesProposer, + EagleProposer | DraftModelProposer, ) sampled_token_ids = sampler_output.sampled_token_ids if input_fits_in_drafter: diff --git a/vllm_omni/worker/gpu_generation_model_runner.py b/vllm_omni/worker/gpu_generation_model_runner.py index fbbde44e1..a6f7efafc 100644 --- a/vllm_omni/worker/gpu_generation_model_runner.py +++ b/vllm_omni/worker/gpu_generation_model_runner.py @@ -25,7 +25,6 @@ from vllm.v1.core.sched.output import GrammarOutput, SchedulerOutput from vllm.v1.outputs import AsyncModelRunnerOutput, make_empty_encoder_model_runner_output from vllm.v1.spec_decode.draft_model import DraftModelProposer from vllm.v1.spec_decode.eagle import EagleProposer -from vllm.v1.spec_decode.extract_hidden_states import ExtractHiddenStatesProposer from vllm.v1.utils import record_function_or_nullcontext from vllm.v1.worker.gpu_model_runner import ( EMPTY_MODEL_RUNNER_OUTPUT, @@ -727,13 +726,11 @@ class GPUGenerationModelRunner(OmniGPUModelRunner): hidden_states = outputs hidden_states, multimodal_outputs = self.extract_multimodal_outputs(hidden_states) if self.speculative_config and ( - self.speculative_config.use_eagle() - or self.speculative_config.uses_draft_model() - or self.speculative_config.uses_extract_hidden_states() + self.speculative_config.use_eagle() or self.speculative_config.uses_draft_model() ): assert isinstance( self.drafter, - EagleProposer | DraftModelProposer | ExtractHiddenStatesProposer, + EagleProposer | DraftModelProposer, ) assert self.speculative_config is not None # Eagle currently only supports PIECEWISE cudagraphs. diff --git a/vllm_omni/worker/gpu_model_runner.py b/vllm_omni/worker/gpu_model_runner.py index 9cd65e30f..7734590d7 100644 --- a/vllm_omni/worker/gpu_model_runner.py +++ b/vllm_omni/worker/gpu_model_runner.py @@ -16,7 +16,6 @@ from vllm.utils.import_utils import LazyLoader from vllm.utils.math_utils import cdiv from vllm.v1.spec_decode.draft_model import DraftModelProposer from vllm.v1.spec_decode.eagle import EagleProposer -from vllm.v1.spec_decode.extract_hidden_states import ExtractHiddenStatesProposer from vllm.v1.worker.gpu_input_batch import CachedRequestState from vllm.v1.worker.gpu_model_runner import GPUModelRunner, IntermediateTensors, PerLayerAttnMetadata from vllm.v1.worker.ubatch_utils import maybe_create_ubatch_slices @@ -798,13 +797,11 @@ class OmniGPUModelRunner(GPUModelRunner): hidden_states = outputs hidden_states, multimodal_outputs = self.extract_multimodal_outputs(hidden_states) if self.speculative_config and ( - self.speculative_config.use_eagle() - or self.speculative_config.uses_draft_model() - or self.speculative_config.uses_extract_hidden_states() + self.speculative_config.use_eagle() or self.speculative_config.uses_draft_model() ): assert isinstance( self.drafter, - EagleProposer | DraftModelProposer | ExtractHiddenStatesProposer, + EagleProposer | DraftModelProposer, ) assert self.speculative_config is not None # Eagle currently only supports PIECEWISE cudagraphs.