Fix more broken speculative decode tests

[huydhn]

A follow-up PR to fix some more speculative decode tests from #17084. There are 2 fixes:

• After [Chore] Remove Sampler from Model Code #17084, there are now two sampler objects:
  • https://github.com/vllm-project/vllm/blob/main/vllm/spec_decode/multi_step_worker.py#L53
  • and https://github.com/vllm-project/vllm/blob/main/vllm/model_executor/models/mlp_speculator.py#L143

The latter doesn't have include_gpu_probs_tensor set to True, which cause a bunch of failures with pytest -v spec_decode/e2e/test_mlp_correctness.py. @WoosukKwon Please let me know if the fix makes sense to you. This feels like a quick patch to cover the underlying setup from #17084. But it kind of works.

• More block_size update missed by Fix some speculative decode tests with tl.dot #17371

[github-actions]

👋 Hi! Thank you for contributing to the vLLM project.

💬 Join our developer Slack at https://slack.vllm.ai to discuss your PR in #pr-reviews, coordinate on features in #feat- channels, or join special interest groups in #sig- channels.

Just a reminder: PRs would not trigger full CI run by default. Instead, it would only run fastcheck CI which starts running only a small and essential subset of CI tests to quickly catch errors. You can run other CI tests on top of those by going to your fastcheck build on Buildkite UI (linked in the PR checks section) and unblock them. If you do not have permission to unblock, ping simon-mo or khluu to add you in our Buildkite org.

Once the PR is approved and ready to go, your PR reviewer(s) can run CI to test the changes comprehensively before merging.

To run CI, PR reviewers can either: Add ready label to the PR or enable auto-merge.

🚀

[WoosukKwon]

LGTM. @huydhn Thanks for fixing this!

[DarkLight1337]

Nice, now we just have these to worry about:

FAILED spec_decode/e2e/test_eagle_correctness.py::test_eagle_e2e_greedy_correctness_with_preemption[1-4-128-test_llm_kwargs0-baseline_llm_kwargs0-per_test_common_llm_kwargs0-common_llm_kwargs0] - ValueError: 0 is not in list
FAILED spec_decode/e2e/test_medusa_correctness.py::test_medusa_e2e_greedy_correctness_with_preemption[-1-1-4-128-test_llm_kwargs0-baseline_llm_kwargs0-per_test_common_llm_kwargs0-common_llm_kwargs0] - ValueError: 0 is not in list
FAILED spec_decode/test_memory_usage.py::test_memory_usage_no_spec - TypeError: EngineArgs.__init__() got an unexpected keyword argument 'speculative_model'

[huydhn]

Nice, now we just have these to worry about:

FAILED spec_decode/e2e/test_eagle_correctness.py::test_eagle_e2e_greedy_correctness_with_preemption[1-4-128-test_llm_kwargs0-baseline_llm_kwargs0-per_test_common_llm_kwargs0-common_llm_kwargs0] - ValueError: 0 is not in list
FAILED spec_decode/e2e/test_medusa_correctness.py::test_medusa_e2e_greedy_correctness_with_preemption[-1-1-4-128-test_llm_kwargs0-baseline_llm_kwargs0-per_test_common_llm_kwargs0-common_llm_kwargs0] - ValueError: 0 is not in list
FAILED spec_decode/test_memory_usage.py::test_memory_usage_no_spec - TypeError: EngineArgs.__init__() got an unexpected keyword argument 'speculative_model'

Oh darn, more failures are sneaking in I think. They weren't there before I rebased.