Review Comments Fixed

triton-inference-server · Apr 8, 2024 · 2f69088 · 2f69088
1 parent b6005d0
commit 2f69088
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 15 deletions.
diff --git a/src/command_line_parser.cc b/src/command_line_parser.cc
@@ -2214,7 +2214,7 @@ TritonParser::SetTritonTraceArgs(
         lparams.trace_filepath_ = value;
       } else if (setting == "log-frequency") {
         if (trace_log_frequency_present) {
-          std::cerr << "Warning: Overriding deprecated '--trace-file' "
+          std::cerr << "Warning: Overriding deprecated '--trace-log-frequency' "
                        "in favor of provided file in --trace-config!"
                     << std::endl;
         }

diff --git a/src/grpc/grpc_server.cc b/src/grpc/grpc_server.cc
@@ -1414,12 +1414,19 @@ CommonHandler::RegisterTrace()
         std::to_string(rate));
     (*response->mutable_settings())["trace_count"].add_value(
         std::to_string(count));
-    (*response->mutable_settings())["log_frequency"].add_value(
-        std::to_string(log_frequency));
-    (*response->mutable_settings())["trace_file"].add_value(filepath);
-    (*response->mutable_settings())["trace_mode"].add_value(
-        trace_manager_->InferenceTraceModeString(trace_mode));
+    if (trace_mode == TRACE_MODE_TRITON) {
+      (*response->mutable_settings())["log_frequency"].add_value(
+          std::to_string(log_frequency));
+      (*response->mutable_settings())["trace_file"].add_value(filepath);
+    }
     {
+      std::string trace_mode_lower =
+          trace_manager_->InferenceTraceModeString(trace_mode);
+      std::transform(
+          trace_mode_lower.begin(), trace_mode_lower.end(),
+          trace_mode_lower.begin(),
+          [](unsigned char c) -> unsigned char { return std::tolower(c); });
+      (*response->mutable_settings())["trace_mode"].add_value(trace_mode_lower);
       auto mode_key = std::to_string(trace_mode);
       auto trace_options_it = config_map.find(mode_key);
       if (trace_options_it != config_map.end()) {

diff --git a/src/http_server.cc b/src/http_server.cc
@@ -1995,15 +1995,21 @@ HTTPAPIServer::HandleTrace(evhtp_request_t* req, const std::string& model_name)
       req, trace_response.AddString("trace_rate", std::to_string(rate)));
   RETURN_AND_RESPOND_IF_ERR(
       req, trace_response.AddString("trace_count", std::to_string(count)));
+  if (trace_mode == TRACE_MODE_TRITON) {
+    RETURN_AND_RESPOND_IF_ERR(
+        req, trace_response.AddString(
+                 "log_frequency", std::to_string(log_frequency)));
+    RETURN_AND_RESPOND_IF_ERR(
+        req, trace_response.AddString("trace_file", filepath));
+  }
+  std::string trace_mode_lower =
+      trace_manager_->InferenceTraceModeString(trace_mode);
+  std::transform(
+      trace_mode_lower.begin(), trace_mode_lower.end(),
+      trace_mode_lower.begin(),
+      [](unsigned char c) -> unsigned char { return std::tolower(c); });
   RETURN_AND_RESPOND_IF_ERR(
-      req,
-      trace_response.AddString("log_frequency", std::to_string(log_frequency)));
-  RETURN_AND_RESPOND_IF_ERR(
-      req, trace_response.AddString("trace_file", filepath));
-  RETURN_AND_RESPOND_IF_ERR(
-      req,
-      trace_response.AddString(
-          "trace_mode", trace_manager_->InferenceTraceModeString(trace_mode)));
+      req, trace_response.AddString("trace_mode", trace_mode_lower));
   auto mode_key = std::to_string(trace_mode);
   auto trace_options_it = config_map.find(mode_key);
   if (trace_options_it != config_map.end()) {
@@ -4596,7 +4602,6 @@ HTTPAPIServer::Handle(evhtp_request_t* req)
     } else if (kind == "") {
       // model metadata
       HandleModelMetadata(req, model_name, version);
-
       return;
     }
   }