Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
OpenDAS
vllm_cscc
Commits
3770071e
Unverified
Commit
3770071e
authored
Oct 23, 2024
by
Woosuk Kwon
Committed by
GitHub
Oct 23, 2024
Browse files
[V1][Bugfix] Clean up requests when aborted (#9629)
Signed-off-by:
Woosuk Kwon
<
woosuk.kwon@berkeley.edu
>
parent
836e8ef6
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
3 deletions
+12
-3
vllm/v1/engine/llm_engine.py
vllm/v1/engine/llm_engine.py
+12
-3
No files found.
vllm/v1/engine/llm_engine.py
View file @
3770071e
...
@@ -300,6 +300,7 @@ class LLMEngine:
...
@@ -300,6 +300,7 @@ class LLMEngine:
def
abort_request
(
self
,
request_id
:
Union
[
str
,
Iterable
[
str
]])
->
None
:
def
abort_request
(
self
,
request_id
:
Union
[
str
,
Iterable
[
str
]])
->
None
:
self
.
scheduler
.
finish_requests
(
request_id
,
self
.
scheduler
.
finish_requests
(
request_id
,
RequestStatus
.
FINISHED_ABORTED
)
RequestStatus
.
FINISHED_ABORTED
)
self
.
_free_request
(
request_id
)
def
get_num_unfinished_requests
(
self
)
->
int
:
def
get_num_unfinished_requests
(
self
)
->
int
:
"""Gets the number of unfinished requests."""
"""Gets the number of unfinished requests."""
...
@@ -361,6 +362,11 @@ class LLMEngine:
...
@@ -361,6 +362,11 @@ class LLMEngine:
num_reqs
=
len
(
detokenizer_output
.
req_ids
)
num_reqs
=
len
(
detokenizer_output
.
req_ids
)
for
i
in
range
(
num_reqs
):
for
i
in
range
(
num_reqs
):
req_id
=
detokenizer_output
.
req_ids
[
i
]
req_id
=
detokenizer_output
.
req_ids
[
i
]
if
req_id
not
in
self
.
requests
:
# The request has been aborted while the detokenizer was
# processing the outputs.
continue
req
=
self
.
requests
[
req_id
]
req
=
self
.
requests
[
req_id
]
req
.
output_text
+=
detokenizer_output
.
detokenized_texts
[
i
]
req
.
output_text
+=
detokenizer_output
.
detokenized_texts
[
i
]
...
@@ -373,9 +379,7 @@ class LLMEngine:
...
@@ -373,9 +379,7 @@ class LLMEngine:
req_outputs
.
append
(
req_output
)
req_outputs
.
append
(
req_output
)
if
finished
:
if
finished
:
del
self
.
requests
[
req_id
]
self
.
_free_request
(
req_id
)
del
self
.
num_lagged_steps
[
req_id
]
del
self
.
request_outputs
[
req_id
]
return
req_outputs
return
req_outputs
def
terminate_detokenizer
(
self
)
->
None
:
def
terminate_detokenizer
(
self
)
->
None
:
...
@@ -440,6 +444,11 @@ class LLMEngine:
...
@@ -440,6 +444,11 @@ class LLMEngine:
req_output
.
finished
=
finished
req_output
.
finished
=
finished
return
req_output
return
req_output
def
_free_request
(
self
,
request_id
:
str
)
->
None
:
self
.
requests
.
pop
(
request_id
,
None
)
self
.
num_lagged_steps
.
pop
(
request_id
,
None
)
self
.
request_outputs
.
pop
(
request_id
,
None
)
def
check_health
(
self
)
->
None
:
def
check_health
(
self
)
->
None
:
if
self
.
tokenizer
:
if
self
.
tokenizer
:
self
.
tokenizer
.
check_health
()
self
.
tokenizer
.
check_health
()
...
...
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