-
-
Notifications
You must be signed in to change notification settings - Fork 6.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[Model] MLPSpeculator speculative decoding support #4947
Merged
Merged
Changes from 1 commit
Commits
Show all changes
42 commits
Select commit
Hold shift + click to select a range
efb0599
initial commit of mlp_speculator and hidden_states_worker to support …
JRosenkranz 7a8eeff
Merge branch 'main' into mlp_speculator
JRosenkranz 667ef88
removed fms_extras import
JRosenkranz d534ef2
updated with a working non-batch version - a lot hardcoded
JRosenkranz 17541b6
updated experimental with working version - eager
JRosenkranz ac5a1da
fixed bug with speculator outputs
JRosenkranz 6ba9a1e
removed comments; swapped to sampling in the example
JRosenkranz cb3aacf
Introduce MLPSpeculatorWorker and corresponding refactor
tdoublep bf2f102
Fix some issues with correctness + simplify API a bit
tdoublep 6af4629
Merge remote-tracking branch 'refs/remotes/origin/main' into mlp_spec…
njhill e0309a6
Fix typing and formatting
njhill abd42e7
Merge remote-tracking branch 'refs/remotes/origin/main' into mlp_spec…
njhill 314f2ae
Merge remote-tracking branch 'refs/remotes/origin/main' into mlp_spec…
njhill 9dd1c50
Remove separate MLPSpeculatorModelRunner and other cleanup
njhill 0d43097
Use sample_len in mlp_speculator
njhill 9dd1608
Some more rework/simplification, still in progress
njhill ea677bd
Config cleanup
njhill b39c94f
Ignore weird mypi error only happening in CI
njhill ab96c2a
Try again to ignore weird ruff error
njhill e9af7e5
Try to ignore both ruff and mypy errs
njhill 30dc5e6
yapf
njhill 3a61052
Fix leftover HiddenStatesWorker references
njhill cc05972
Merge remote-tracking branch 'refs/remotes/origin/main' into mlp_spec…
njhill 693974e
Fix AutoConfig import, mlp spec worker docstring
njhill f1bafba
Some cleanup/simplification
njhill 455b9a9
Rework handling of accepted tokens
njhill e583ae9
Filter hidden states in Top1Proposer when needed
njhill 7bff0d1
Enable bonus token
njhill 3d04037
Merge remote-tracking branch 'refs/remotes/origin/main' into mlp_spec…
njhill bea97d7
Merge remote-tracking branch 'refs/remotes/origin/main' into mlp_spec…
njhill 3012553
Move hidden state logic to separate class
njhill b116e02
Default num_speculative_tokens based on speculator model config
njhill e7742e7
Move offline_inference example to separate file
njhill ee83331
Merge remote-tracking branch 'refs/remotes/origin/main' into mlp_spec…
njhill 444a709
ruff
njhill bb9fd32
Add comment per review
njhill fcc6606
Some simplification to MLPSpeculatorWorker._prepare_input_tensors
njhill ffc0bcf
Merge remote-tracking branch 'refs/remotes/origin/main' into mlp_spec…
njhill f3dc40a
Add check for TP == 1; TP support will be a fast-follow
njhill 1b7e305
Fix test import
njhill 46ceacd
Revert unrelated commit made by mistake
njhill d9ce339
Fix test mocks
njhill File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Move offline_inference example to separate file
- Loading branch information
commit e7742e75953702f9f302c3da714ec93fa03fc831
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
import gc | ||
import time | ||
from typing import List | ||
|
||
from vllm import LLM, SamplingParams | ||
|
||
|
||
def time_generation(llm: LLM, prompts: List[str], sampling_params: SamplingParams): | ||
# Generate texts from the prompts. The output is a list of RequestOutput | ||
# objects that contain the prompt, generated text, and other information. | ||
# Warmup first | ||
llm.generate(prompts, sampling_params) | ||
llm.generate(prompts, sampling_params) | ||
start = time.time() | ||
outputs = llm.generate(prompts, sampling_params) | ||
end = time.time() | ||
print((end - start) / sum([len(o.outputs[0].token_ids) for o in outputs])) | ||
# Print the outputs. | ||
for output in outputs: | ||
generated_text = output.outputs[0].text | ||
print(f"text: {generated_text!r}") | ||
|
||
|
||
if __name__ == "__main__": | ||
|
||
template = ( | ||
"Below is an instruction that describes a task. Write a response " | ||
"that appropriately completes the request.\n\n### Instruction:\n{}" | ||
"\n\n### Response:\n") | ||
|
||
# Sample prompts. | ||
prompts = [ | ||
"Write about the president of the United States.", | ||
] | ||
prompts = [template.format(prompt) for prompt in prompts] | ||
# Create a sampling params object. | ||
sampling_params = SamplingParams(temperature=0.0, max_tokens=200) | ||
|
||
# Create an LLM without spec decoding | ||
llm = LLM( | ||
model="meta-llama/Llama-2-13b-chat-hf", | ||
) | ||
|
||
print("Without speculation") | ||
time_generation(llm, prompts, sampling_params) | ||
|
||
del llm | ||
gc.collect() | ||
|
||
# Create an LLM with spec decoding | ||
llm = LLM( | ||
model="meta-llama/Llama-2-13b-chat-hf", | ||
speculative_model="ibm-fms/llama-13b-accelerator", | ||
# These are currently required for MLPSpeculator decoding | ||
use_v2_block_manager=True, | ||
enforce_eager=True, | ||
) | ||
|
||
print("With speculation") | ||
time_generation(llm, prompts, sampling_params) |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Impressive! It seems MLPSpeculator + w/o cudagraph is still much faster than Original + cudagraph.