Skip to content
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.

Sign up for GitHub

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

perf: Check for cancellation on response thread #54

Merged
merged 7 commits into from
Aug 7, 2024
Merged

perf: Check for cancellation on response thread #54

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4cf6462
Move streaming cancellation check into response loop
kthui Jul 29, 2024
efe0419
Check for cancellation every other response
kthui Jul 30, 2024
1187ce9
Revert "Check for cancellation every other response"
kthui Jul 30, 2024
29942e2
Refactor response state object
kthui Jul 31, 2024
0b996e8
Update cancellation message
kthui Jul 31, 2024
6b7e241
Update cancellation message 2
kthui Aug 6, 2024
4c19f87
Merge branch 'main' of github.com:triton-inference-server/vllm_backen…
kthui Aug 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 29 additions & 3 deletions src/model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,9 +287,13 @@ def response_loop(self):
# To signal shutdown a None item will be added to the queue.
if item is None:
break
response_sender, response, response_flag = item
response_state, response, response_flag = item
response_sender = response_state["response_sender"]
try:
response_sender.send(response, response_flag)
# Stop checking for cancellation if the last response is generated.
if not response_state["last_response_generated"]:
response_state["is_cancelled"] = response_sender.is_cancelled()
except Exception as e:
self.logger.log_error(
f"An error occurred while sending a response: {e}"
Expand Down Expand Up @@ -338,6 +342,11 @@ async def generate(self, request):
Forwards single request to LLM engine and returns responses.
"""
response_sender = request.get_response_sender()
response_state = {
"response_sender": response_sender,
"is_cancelled": False,
"last_response_generated": False, # last response ready but not yet sent
}
self.ongoing_request_count += 1
decrement_ongoing_request_count = True
try:
Expand Down Expand Up @@ -399,10 +408,26 @@ async def generate(self, request):
)

async for output in response_iterator:
if response_sender.is_cancelled():
is_cancelled = response_state["is_cancelled"]
oandreeva-nv marked this conversation as resolved.
Show resolved Hide resolved
if not stream:
is_cancelled = response_sender.is_cancelled()
if is_cancelled:
self.logger.log_info("[vllm] Cancelling the request")
await self.llm_engine.abort(request_id)
self.logger.log_info("[vllm] Successfully cancelled the request")
if stream:
response_state["last_response_generated"] = True
response = pb_utils.InferenceResponse(
error=pb_utils.TritonError(
oandreeva-nv marked this conversation as resolved.
Show resolved Hide resolved
message="Request was cancelled",
code=pb_utils.TritonError.CANCELLED,
)
)
flags = pb_utils.TRITONSERVER_RESPONSE_COMPLETE_FINAL
decrement_ongoing_request_count = False
self._response_queue.put_nowait(
(response_state, response, flags)
)
break
if stream:
prev_outputs_lengths = None
Expand All @@ -414,9 +439,10 @@ async def generate(self, request):
response = self.create_stream_response(output, prev_outputs_lengths)
flags = 0
if output.finished:
response_state["last_response_generated"] = True
flags = pb_utils.TRITONSERVER_RESPONSE_COMPLETE_FINAL
decrement_ongoing_request_count = False
self._response_queue.put_nowait((response_sender, response, flags))
self._response_queue.put_nowait((response_state, response, flags))
prev_outputs = output

last_output = output
Expand Down
Loading