Fixing issue in ResolveBackendConfigs (#175)

* Fixing issue in ResolveBackendConfigs

* Simplified logic for resolving the situation when the specific setting overrides global setting

* Deleted unnecessary code

Author: oandreeva-nv

src/backend_model.cc

@@ -26,6 +26,7 @@
 
 #include "backend_model.h"
 
+#include <map>
 #include <vector>
 
 #include "backend_config.h"
@@ -259,65 +260,23 @@ TritonModel::ResolveBackendConfigs(
 {
   const auto& global_itr = backend_cmdline_config_map.find(std::string());
   const auto& specific_itr = backend_cmdline_config_map.find(backend_name);
-  if (specific_itr == backend_cmdline_config_map.end() &&
-      global_itr != backend_cmdline_config_map.end()) {
-    for (auto setting : global_itr->second) {
-      config.push_back(setting);
+  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){
+      lconfig[setting.first] = setting.second;
     }
-  } else if (
-      specific_itr != backend_cmdline_config_map.end() &&
-      global_itr == backend_cmdline_config_map.end()) {
-    for (auto setting : specific_itr->second) {
-      config.push_back(setting);
-    }
-  } else if (
-      specific_itr != backend_cmdline_config_map.end() &&
-      global_itr != backend_cmdline_config_map.end()) {
-    triton::common::BackendCmdlineConfig global_backend_config =
-        global_itr->second;
-    triton::common::BackendCmdlineConfig specific_backend_config =
-        specific_itr->second;
-
-    std::sort(global_backend_config.begin(), global_backend_config.end());
-    std::sort(specific_backend_config.begin(), specific_backend_config.end());
-
-    size_t global_index = 0;
-    size_t specific_index = 0;
-    while (global_index < global_backend_config.size() &&
-           specific_index < specific_backend_config.size()) {
-      auto& current_global_setting = global_backend_config.at(global_index);
-      auto& current_specific_setting =
-          specific_backend_config.at(specific_index);
-      if (current_specific_setting.first.compare(
-              current_global_setting.first) == 0) {
-        // specific setting overrides global setting
-        config.push_back(current_specific_setting);
-        ++global_index;
-        ++specific_index;
-      } else if (
-          current_specific_setting.first.compare(current_global_setting.first) <
-          0) {
-        config.push_back(current_specific_setting);
-        ++specific_index;
-      } else {
-        config.push_back(current_global_setting);
-        ++global_index;
-      }
-    }
-
-    // add the rest of the global configs
-    if (global_index < global_backend_config.size()) {
-      auto& current_global_setting = global_backend_config.at(global_index);
-      config.push_back(current_global_setting);
-    }
-
-    // add the rest of the specific settings
-    if (specific_index < specific_backend_config.size()) {
-      auto& current_specific_setting =
-          specific_backend_config.at(specific_index);
-      config.push_back(current_specific_setting);
+  }
+  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){
+      lconfig[setting.first] = setting.second;
     }
-  }  // else empty config
+  } 
+  for (auto& final_setting : lconfig){
+      config.emplace_back(final_setting);
+  }
 
   return Status::Success;
 }