From 8e93bf6625bc46d06486a0ac8b1def13b5bb65df Mon Sep 17 00:00:00 2001 From: Joe Runde Date: Wed, 26 Feb 2025 17:09:30 -0700 Subject: [PATCH 1/2] :bug: handle rename to LoRANotSupportedWorkerBase Signed-off-by: Joe Runde --- vllm_spyre/worker/spyre_worker.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/vllm_spyre/worker/spyre_worker.py b/vllm_spyre/worker/spyre_worker.py index 5f351be..b46e354 100644 --- a/vllm_spyre/worker/spyre_worker.py +++ b/vllm_spyre/worker/spyre_worker.py @@ -13,8 +13,7 @@ from vllm.model_executor import set_random_seed from vllm.platforms import current_platform from vllm.sequence import ExecuteModelRequest -from vllm.worker.worker_base import (LocalOrDistributedWorkerBase, - LoraNotSupportedWorkerBase, WorkerBase, +from vllm.worker.worker_base import (LocalOrDistributedWorkerBase, WorkerBase, WorkerInput) import vllm_spyre.envs as envs_spyre @@ -24,8 +23,15 @@ # from vllm.worker.spyre_model_runner import SpyreModelRunner from vllm_spyre.worker.spyre_model_runner import SpyreModelRunner +# Post 0.7.3 this class was renamed +try: + from vllm.worker.worker_base import LoRANotSupportedWorkerBase +except ImportError: + from vllm.worker.worker_base import ( + LoraNotSupportedWorkerBase as LoRANotSupportedWorkerBase) -class SpyreWorker(LoraNotSupportedWorkerBase, LocalOrDistributedWorkerBase): + +class SpyreWorker(LoRANotSupportedWorkerBase, LocalOrDistributedWorkerBase): """A worker class that executes the model on a group of Spyre cores. """ From a76d9d225b4dfb1776999c39d290776b18d73ba4 Mon Sep 17 00:00:00 2001 From: Yannick Schnider Date: Thu, 6 Mar 2025 17:49:55 +0100 Subject: [PATCH 2/2] disabling yapf for conflicting lines with isort (as done by joerunde) Signed-off-by: Yannick Schnider --- vllm_spyre/worker/spyre_worker.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vllm_spyre/worker/spyre_worker.py b/vllm_spyre/worker/spyre_worker.py index 1ee4dd8..83a2cb7 100644 --- a/vllm_spyre/worker/spyre_worker.py +++ b/vllm_spyre/worker/spyre_worker.py @@ -25,11 +25,14 @@ from vllm_spyre.worker.spyre_model_runner import SpyreModelRunner # Post 0.7.3 this class was renamed +# yapf conflicts with isort for this block +# yapf: disable try: from vllm.worker.worker_base import LoRANotSupportedWorkerBase except ImportError: from vllm.worker.worker_base import ( LoraNotSupportedWorkerBase as LoRANotSupportedWorkerBase) +# yapf: enable class SpyreWorker(LoRANotSupportedWorkerBase, LocalOrDistributedWorkerBase):