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

Fix decoupled gpu output error handling #362

Merged
merged 2 commits into from
Jun 3, 2024
Merged

Fix decoupled gpu output error handling #362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bef1eae
Fix decoupled gpu output error handling
kthui May 20, 2024
2a48913
Return full error string upon exception from model
kthui May 21, 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
4 changes: 2 additions & 2 deletions src/pb_stub.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -735,9 +735,9 @@ Stub::ProcessRequests(RequestBatch* request_batch_shm_ptr)
"Failed to process the request(s) for model '" + name_ +
"', message: ") +
error_string;
LOG_INFO << err_message.c_str();
LOG_ERROR << err_message.c_str();
response_batch_shm_ptr->has_error = true;
error_string_shm = PbString::Create(shm_pool_, error_string);
error_string_shm = PbString::Create(shm_pool_, err_message);
response_batch_shm_ptr->error = error_string_shm->ShmHandle();
response_batch_shm_ptr->is_error_set = true;
}
Expand Down
39 changes: 22 additions & 17 deletions src/response_sender.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,22 +147,38 @@ ResponseSender::Send(
}

if (has_gpu_output) {
ScopedDefer _([send_message_payload] {
bi::scoped_lock<bi::interprocess_mutex> guard{send_message_payload->mu};
send_message_payload->is_stub_turn = false;
send_message_payload->cv.notify_one();
while (!send_message_payload->is_stub_turn) {
// Wait for the stub process to send the response and populate error
// message if any.
send_message_payload->cv.wait(guard);
}
});

AllocatedSharedMemory<GPUBuffersShm> gpu_buffers_handle =
shm_pool_->Load<GPUBuffersShm>(
send_message_payload->gpu_buffers_handle);
if (!gpu_buffers_handle.data_->success) {
std::unique_ptr<PbString> error = PbString::LoadFromSharedMemory(
shm_pool_, gpu_buffers_handle.data_->error);
throw PythonBackendException(
"Failed to load GPU buffers: " + error->String());
}

AllocatedSharedMemory<bi::managed_external_buffer::handle_t>
gpu_buffers_handle_shm =
shm_pool_->Load<bi::managed_external_buffer::handle_t>(
gpu_buffers_handle.data_->buffers);
uint64_t gpu_buffer_count = gpu_buffers_handle.data_->buffer_count;
if (gpu_tensors.size() != gpu_buffer_count) {
LOG_ERROR
<< (std::string(
"GPU buffers size does not match the provided buffers: ") +
std::to_string(gpu_tensors.size()) +
" != " + std::to_string(gpu_buffer_count));
return;
throw PythonBackendException(
std::string(
"GPU buffers size does not match the provided buffers: ") +
std::to_string(gpu_tensors.size()) +
" != " + std::to_string(gpu_buffer_count));
}

std::vector<std::unique_ptr<PbMemory>> dst_buffers;
Expand All @@ -175,17 +191,6 @@ ResponseSender::Send(
std::shared_ptr<PbTensor>& src_buffer = gpu_tensors[i];
PbMemory::CopyBuffer(dst_buffers[i], src_buffer->Memory());
}

{
bi::scoped_lock<bi::interprocess_mutex> guard{send_message_payload->mu};
send_message_payload->is_stub_turn = false;
send_message_payload->cv.notify_one();
while (!send_message_payload->is_stub_turn) {
// Wait for the stub process to send the response and populate error
// message if any.
send_message_payload->cv.wait(guard);
}
}
}

if (send_message_payload->has_error) {
Expand Down
Loading