From f90f27d2bc66db2135ecb5ca0d53b6a9025939c7 Mon Sep 17 00:00:00 2001 From: LiuXiaoxuanPKU Date: Mon, 30 Sep 2024 13:47:15 -0700 Subject: [PATCH 1/2] fix spec dec test --- .buildkite/test-pipeline.yaml | 2 -- tests/spec_decode/test_multi_step_worker.py | 6 ++++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.buildkite/test-pipeline.yaml b/.buildkite/test-pipeline.yaml index bb42b5f29a72..4791a2dd4ed4 100644 --- a/.buildkite/test-pipeline.yaml +++ b/.buildkite/test-pipeline.yaml @@ -199,8 +199,6 @@ steps: - vllm/spec_decode - tests/spec_decode commands: - # See https://github.com/vllm-project/vllm/issues/5152 - - export VLLM_ATTENTION_BACKEND=XFORMERS - pytest -v -s spec_decode/e2e/test_multistep_correctness.py - pytest -v -s spec_decode --ignore=spec_decode/e2e/test_multistep_correctness.py diff --git a/tests/spec_decode/test_multi_step_worker.py b/tests/spec_decode/test_multi_step_worker.py index e7a0af437763..e6f7f480eebb 100644 --- a/tests/spec_decode/test_multi_step_worker.py +++ b/tests/spec_decode/test_multi_step_worker.py @@ -173,7 +173,6 @@ def test_same_output_for_multi_step(): block_size, num_gpu_blocks, seed, - model_runner_cls=TP1DraftModelRunner, ) worker = create_worker( @@ -673,7 +672,10 @@ def test_use_draft_model_runner_advance_step(): worker.model_runner._gpu_advance_step.side_effect = ValueError( exception_secret) - seq_group_metadata_list, _, _ = create_batch(batch_size, k) + seq_group_metadata_list, _, _ = create_batch(batch_size, + k, + block_size=block_size, + num_gpu_blocks=num_gpu_blocks) # Fallback (should not call) when num_steps=1. execute_model_req = ExecuteModelRequest( From 9b1ef6ba835d7b400a889920518695e905b11559 Mon Sep 17 00:00:00 2001 From: LiuXiaoxuanPKU Date: Mon, 30 Sep 2024 15:32:06 -0700 Subject: [PATCH 2/2] reverse --- tests/spec_decode/test_multi_step_worker.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/spec_decode/test_multi_step_worker.py b/tests/spec_decode/test_multi_step_worker.py index e6f7f480eebb..6fa386ffab12 100644 --- a/tests/spec_decode/test_multi_step_worker.py +++ b/tests/spec_decode/test_multi_step_worker.py @@ -173,6 +173,7 @@ def test_same_output_for_multi_step(): block_size, num_gpu_blocks, seed, + model_runner_cls=TP1DraftModelRunner, ) worker = create_worker(