From eb4ca9b6f716c6d7b4572babb9146b10c3a8cfbb Mon Sep 17 00:00:00 2001
From: Elias Bermudez <dbermudez@nvidia.com>
Date: Thu, 28 Sep 2023 16:18:50 -0700
Subject: [PATCH] Fix includes and map assignment

---
 src/c++/library/common.h                                       | 2 +-
 .../client_backend/triton/triton_client_backend.cc             | 3 +--
 src/c++/perf_analyzer/mock_infer_data_manager.h                | 2 --
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/c++/library/common.h b/src/c++/library/common.h
index 0588762a3..9337a12e0 100644
--- a/src/c++/library/common.h
+++ b/src/c++/library/common.h
@@ -34,11 +34,11 @@
 #include <functional>
 #include <iostream>
 #include <list>
-#include <map>
 #include <memory>
 #include <mutex>
 #include <string>
 #include <thread>
+#include <unordered_map>
 #include <vector>
 
 #ifdef TRITON_INFERENCE_SERVER_CLIENT_CLASS
diff --git a/src/c++/perf_analyzer/client_backend/triton/triton_client_backend.cc b/src/c++/perf_analyzer/client_backend/triton/triton_client_backend.cc
index 67ee4ac12..7672a22ba 100644
--- a/src/c++/perf_analyzer/client_backend/triton/triton_client_backend.cc
+++ b/src/c++/perf_analyzer/client_backend/triton/triton_client_backend.cc
@@ -600,8 +600,7 @@ TritonClientBackend::ParseInferOptionsToTriton(
         static_cast<std::underlying_type<cb::RequestParameterType>::type>(
             map_entry.second.type);
     rp.type = static_cast<tc::RequestParameterType>(val);
-    triton_options->request_parameters.insert(
-        std::make_pair(map_entry.first, rp));
+    triton_options->request_parameters[map_entry.first] = rp;
   }
 }
 
diff --git a/src/c++/perf_analyzer/mock_infer_data_manager.h b/src/c++/perf_analyzer/mock_infer_data_manager.h
index 5d6bfaa0e..8f9cd7ec0 100644
--- a/src/c++/perf_analyzer/mock_infer_data_manager.h
+++ b/src/c++/perf_analyzer/mock_infer_data_manager.h
@@ -32,8 +32,6 @@
 
 namespace triton { namespace perfanalyzer {
 
-// std::unordered_map<std::string, clientbackend::RequestParameter>
-//     request_parameters;
 
 class MockInferDataManagerShm : public InferDataManagerShm {
  public: