Support Batch Completion in Server #2529
Merged
+215
−105
Conversation
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
simon-mo
commented
Jan 21, 2024
Comment on lines
+43
to
+60
| if request.echo and request.max_tokens == 0: | ||
| # only return the prompt | ||
| delta_text = res.prompt | ||
| delta_token_ids = res.prompt_token_ids | ||
| top_logprobs = res.prompt_logprobs | ||
| has_echoed[i] = True | ||
| elif request.echo and request.max_tokens > 0 and not has_echoed[i]: | ||
| # echo the prompt and first token | ||
| delta_text = res.prompt + output.text | ||
| delta_token_ids = res.prompt_token_ids + output.token_ids | ||
| top_logprobs = res.prompt_logprobs + (output.logprobs or []) | ||
| has_echoed[i] = True | ||
| else: | ||
| # return just the delta | ||
| delta_text = output.text[len(previous_texts[i]):] | ||
| delta_token_ids = output.token_ids[previous_num_tokens[i]:] | ||
| top_logprobs = output.logprobs[ | ||
| previous_num_tokens[i]:] if output.logprobs else None |
There was a problem hiding this comment.
This part is refactoring for readability
simon-mo
commented
Jan 21, 2024
Comment on lines
+156
to
+184
| if request.echo and request.max_tokens == 0: | ||
| token_ids = prompt_token_ids | ||
| top_logprobs = prompt_logprobs | ||
| output_text = prompt_text | ||
| elif request.echo and request.max_tokens > 0: | ||
| token_ids = prompt_token_ids + output.token_ids | ||
| top_logprobs = prompt_logprobs + output.logprobs | ||
| output_text = prompt_text + output.text | ||
| else: | ||
| token_ids = output.token_ids | ||
| top_logprobs = output.logprobs | ||
| if request.echo: | ||
| token_ids = prompt_token_ids + token_ids | ||
| top_logprobs = prompt_logprobs + top_logprobs | ||
| output_text = output.text | ||
|
|
||
| if request.logprobs is not None: | ||
| logprobs = create_logprobs_fn( | ||
| token_ids=token_ids, | ||
| top_logprobs=top_logprobs, | ||
| num_output_top_logprobs=request.logprobs, | ||
| ) | ||
| else: | ||
| token_ids = prompt_token_ids | ||
| top_logprobs = prompt_logprobs | ||
| logprobs = create_logprobs_fn( | ||
| token_ids=token_ids, | ||
| top_logprobs=top_logprobs, | ||
| num_output_top_logprobs=request.logprobs, | ||
| logprobs = None | ||
|
|
||
| choice_data = CompletionResponseChoice( | ||
| index=len(choices), | ||
| text=output_text, | ||
| logprobs=logprobs, | ||
| finish_reason=output.finish_reason, | ||
| ) | ||
| else: | ||
| logprobs = None | ||
| if not echo_without_generation: | ||
| output_text = output.text | ||
| if request.echo: | ||
| output_text = prompt_text + output_text | ||
| else: | ||
| output_text = prompt_text | ||
| choice_data = CompletionResponseChoice( | ||
| index=output.index, | ||
| text=output_text, | ||
| logprobs=logprobs, | ||
| finish_reason=output.finish_reason, | ||
| ) | ||
| choices.append(choice_data) | ||
|
|
||
| num_prompt_tokens = len(final_res.prompt_token_ids) | ||
| num_generated_tokens = sum( | ||
| len(output.token_ids) for output in final_res.outputs) | ||
| choices.append(choice_data) |
There was a problem hiding this comment.
This part is refactoring for readability
zhuohan123
approved these changes
Jan 24, 2024
Comment on lines
24
to
27
| request: CompletionRequest, raw_request: Request, on_abort, | ||
| result_generator: AsyncIterator[tuple[int, RequestOutput]], | ||
| create_logprobs_fn, request_id, created_time, model_name, | ||
| num_prompts) -> AsyncGenerator[str, None]: |
There was a problem hiding this comment.
Add full type annotation for all parameters?
NikolaBorisov
pushed a commit
to deepinfra/vllm
that referenced
this pull request
Jan 31, 2024
hongxiayang
pushed a commit
to hongxiayang/vllm
that referenced
this pull request
Feb 13, 2024
|
@simon-mo Hi, I am glad that the openai interface in vllm supports multiple batches, but I encountered the following two problems during actual testing:
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
OpenAI completion protocol support inputs for
promptto bea string, array of strings, array of tokens, or array of token arrays.. This PR adds support for that.Closes #2441
Closes #2396