Skip to content

Return full error when custom batcher init fails #196

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

Merged
merged 1 commit into from
May 2, 2023
Merged

Return full error when custom batcher init fails #196

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 19 additions & 14 deletions src/backend_model.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,19 +316,19 @@ TritonModel::ResolveBackendConfigs(
std::map<std::string, std::string> lconfig;
if (global_itr != backend_cmdline_config_map.end()) {
// Accumulate all global settings
for (auto& setting : global_itr->second){
for (auto& setting : global_itr->second) {
lconfig[setting.first] = setting.second;
}
}
if (specific_itr != backend_cmdline_config_map.end()) {
// Accumulate backend specific settings and override
// global settings with specific configs if needed
for (auto& setting : specific_itr->second){
// global settings with specific configs if needed
for (auto& setting : specific_itr->second) {
lconfig[setting.first] = setting.second;
}
}
for (auto& final_setting : lconfig){
config.emplace_back(final_setting);
}
for (auto& final_setting : lconfig) {
config.emplace_back(final_setting);
}

return Status::Success;
Expand Down Expand Up @@ -591,9 +591,11 @@ TritonModel::SetBatchingStrategy(const std::string& batch_libpath)
TRITONSERVER_Error* err = batcher_init_fn_(
Batcher(), reinterpret_cast<TRITONBACKEND_Model*>(this));
if (err) {
auto err_message = TRITONSERVER_ErrorMessage(err);
auto status = Status(
TritonCodeToStatusCode(TRITONSERVER_ErrorCode(err)),
TRITONSERVER_ErrorMessage(err));
TRITONSERVER_ErrorDelete(err);
return Status(Status::Code::INVALID_ARG, err_message);
return status;
}
}

Expand Down Expand Up @@ -1312,8 +1314,9 @@ TRITONBACKEND_RequestParameter(
return TRITONSERVER_ErrorNew(
TRITONSERVER_ERROR_INVALID_ARG,
("out of bounds index " + std::to_string(index) +
std::string(": request has ") + std::to_string(parameters.size()) +
" parameters").c_str());
std::string(": request has ") + std::to_string(parameters.size()) +
" parameters")
.c_str());
}

const InferenceParameter& param = parameters[index];
Expand Down Expand Up @@ -1405,7 +1408,8 @@ TRITONBACKEND_InputBuffer(
InferenceRequest::Input* ti =
reinterpret_cast<InferenceRequest::Input*>(input);
Status status = ti->DataBuffer(
index, buffer, reinterpret_cast<size_t*>(buffer_byte_size), memory_type, memory_type_id);
index, buffer, reinterpret_cast<size_t*>(buffer_byte_size), memory_type,
memory_type_id);
if (!status.IsOk()) {
*buffer = nullptr;
*buffer_byte_size = 0;
Expand Down Expand Up @@ -1445,10 +1449,11 @@ TRITONBACKEND_InputBufferForHostPolicy(
Status status =
(host_policy_name == nullptr)
? ti->DataBuffer(
index, buffer, reinterpret_cast<size_t*>(buffer_byte_size), memory_type, memory_type_id)
index, buffer, reinterpret_cast<size_t*>(buffer_byte_size),
memory_type, memory_type_id)
: ti->DataBufferForHostPolicy(
index, buffer, reinterpret_cast<size_t*>(buffer_byte_size), memory_type, memory_type_id,
host_policy_name);
index, buffer, reinterpret_cast<size_t*>(buffer_byte_size),
memory_type, memory_type_id, host_policy_name);
if (!status.IsOk()) {
*buffer = nullptr;
*buffer_byte_size = 0;
Expand Down