Skip to content

Updated logging of tables and protobuf to use new macros #355

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 12 commits into from
May 20, 2024
Merged

Updated logging of tables and protobuf to use new macros #355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3c6e3b3
updated to use log table macro
nnshah1 May 11, 2024
6abc092
Adding new logging format support
nnshah1 May 14, 2024
2bd45da
updated based on review comments
nnshah1 May 15, 2024
2bf1045
updated based on review comments
nnshah1 May 15, 2024
5fbee60
updated based on review comments
nnshah1 May 15, 2024
232e709
updated
nnshah1 May 15, 2024
9895080
updated to remove blank line
nnshah1 May 15, 2024
94ebe0e
removing c api for logging json - will add to seperate PR after 24.05…
nnshah1 May 16, 2024
e2229b4
update
nnshah1 May 16, 2024
ff5b64d
updated name to match requirement
nnshah1 May 18, 2024
3b95658
revert change in name
nnshah1 May 18, 2024
f734527
Merge branch 'main' into nnshah1-log-format
nnshah1 May 19, 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/model_config_utils.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -677,8 +677,8 @@ GetNormalizedModelConfig(
// to auto-complete.
RETURN_IF_ERROR(
AutoCompleteBackendFields(model_name, std::string(path), config));
LOG_VERBOSE(1) << "Server side auto-completed config: "
<< config->DebugString();

LOG_PROTOBUF_VERBOSE(1, "Server side auto-completed config: ", (*config));

RETURN_IF_ERROR(NormalizeModelConfig(min_compute_capability, config));

Expand Down
11 changes: 5 additions & 6 deletions src/server.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,8 +603,7 @@ InferenceServer::PrintBackendAndModelSummary()
repoagent_record.emplace_back(repoagent_pair.second);
repoagents_table.InsertRow(repoagent_record);
}
std::string repoagents_table_string = repoagents_table.PrintTable();
LOG_INFO << repoagents_table_string;
LOG_TABLE_INFO(repoagents_table);

// Backends Summary
std::vector<std::string> backend_headers;
Expand All @@ -630,8 +629,8 @@ InferenceServer::PrintBackendAndModelSummary()
}
backends_table.InsertRow(backend_record);
}
std::string backends_table_string = backends_table.PrintTable();
LOG_INFO << backends_table_string;

LOG_TABLE_INFO(backends_table);

// Models Summary
auto model_states = model_repository_manager_->ModelStates();
Expand Down Expand Up @@ -673,8 +672,8 @@ InferenceServer::PrintBackendAndModelSummary()
}
}
}
std::string models_table_string = models_table.PrintTable();
LOG_INFO << models_table_string;

LOG_TABLE_INFO(models_table);

return Status::Success;
}
Expand Down
3 changes: 1 addition & 2 deletions src/tritonserver.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2554,8 +2554,7 @@ TRITONSERVER_ServerNew(
options_table.InsertRow(std::vector<std::string>{
"cache_enabled", std::to_string(lserver->ResponseCacheEnabled())});

std::string options_table_string = options_table.PrintTable();
LOG_INFO << options_table_string;
LOG_TABLE_INFO(options_table);

if (!status.IsOk()) {
if (loptions->ExitOnError()) {
Expand Down