Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
xdb4_94051
vllm
Commits
16967258
Unverified
Commit
16967258
authored
Sep 04, 2023
by
Antoni Baum
Committed by
GitHub
Sep 04, 2023
Browse files
Initialize AsyncLLMEngine bg loop correctly (#943)
parent
002800f0
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
7 deletions
+25
-7
vllm/engine/async_llm_engine.py
vllm/engine/async_llm_engine.py
+11
-5
vllm/entrypoints/api_server.py
vllm/entrypoints/api_server.py
+6
-1
vllm/entrypoints/openai/api_server.py
vllm/entrypoints/openai/api_server.py
+8
-1
No files found.
vllm/engine/async_llm_engine.py
View file @
16967258
...
...
@@ -155,11 +155,15 @@ class AsyncLLMEngine:
self
.
finished_requests
:
Set
[
str
]
=
set
()
self
.
background_loop
=
None
if
start_engine_loop
:
self
.
_
start_background_loop
()
self
.
start_background_loop
()
def
_start_background_loop
(
self
)
->
None
:
@
property
def
is_running
(
self
)
->
bool
:
return
self
.
background_loop
is
not
None
def
start_background_loop
(
self
)
->
None
:
"""Start the background loop."""
if
self
.
background_loop
is
not
None
:
if
self
.
is_running
:
raise
RuntimeError
(
"Background loop is already running."
)
self
.
background_loop
=
asyncio
.
get_event_loop
().
create_task
(
self
.
run_engine_loop
())
...
...
@@ -323,7 +327,8 @@ class AsyncLLMEngine:
@
classmethod
def
from_engine_args
(
cls
,
engine_args
:
AsyncEngineArgs
)
->
"AsyncLLMEngine"
:
engine_args
:
AsyncEngineArgs
,
start_engine_loop
:
bool
=
False
)
->
"AsyncLLMEngine"
:
"""Creates an async LLM engine from the engine arguments."""
# Create the engine configs.
engine_configs
=
engine_args
.
create_engine_configs
()
...
...
@@ -338,5 +343,6 @@ class AsyncLLMEngine:
distributed_init_method
,
placement_group
,
log_requests
=
not
engine_args
.
disable_log_requests
,
log_stats
=
not
engine_args
.
disable_log_stats
)
log_stats
=
not
engine_args
.
disable_log_stats
,
start_engine_loop
=
start_engine_loop
)
return
engine
vllm/entrypoints/api_server.py
View file @
16967258
...
...
@@ -30,6 +30,10 @@ async def generate(request: Request) -> Response:
stream
=
request_dict
.
pop
(
"stream"
,
False
)
sampling_params
=
SamplingParams
(
**
request_dict
)
request_id
=
random_uuid
()
if
not
engine
.
is_running
:
engine
.
start_background_loop
()
results_generator
=
engine
.
generate
(
prompt
,
sampling_params
,
request_id
)
# Streaming case
...
...
@@ -75,7 +79,8 @@ if __name__ == "__main__":
args
=
parser
.
parse_args
()
engine_args
=
AsyncEngineArgs
.
from_cli_args
(
args
)
engine
=
AsyncLLMEngine
.
from_engine_args
(
engine_args
)
engine
=
AsyncLLMEngine
.
from_engine_args
(
engine_args
,
start_engine_loop
=
False
)
uvicorn
.
run
(
app
,
host
=
args
.
host
,
...
...
vllm/entrypoints/openai/api_server.py
View file @
16967258
...
...
@@ -191,6 +191,9 @@ async def create_chat_completion(request: ChatCompletionRequest,
"""
logger
.
info
(
f
"Received chat completion request:
{
request
}
"
)
if
not
engine
.
is_running
:
engine
.
start_background_loop
()
error_check_ret
=
await
check_model
(
request
)
if
error_check_ret
is
not
None
:
return
error_check_ret
...
...
@@ -363,6 +366,9 @@ async def create_completion(request: CompletionRequest, raw_request: Request):
"""
logger
.
info
(
f
"Received completion request:
{
request
}
"
)
if
not
engine
.
is_running
:
engine
.
start_background_loop
()
error_check_ret
=
await
check_model
(
request
)
if
error_check_ret
is
not
None
:
return
error_check_ret
...
...
@@ -620,7 +626,8 @@ if __name__ == "__main__":
served_model
=
args
.
model
engine_args
=
AsyncEngineArgs
.
from_cli_args
(
args
)
engine
=
AsyncLLMEngine
.
from_engine_args
(
engine_args
)
engine
=
AsyncLLMEngine
.
from_engine_args
(
engine_args
,
start_engine_loop
=
False
)
engine_model_config
=
asyncio
.
run
(
engine
.
get_model_config
())
max_model_len
=
engine_model_config
.
get_max_model_len
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment