Add support for parsing AUTO, HETERO and MULTI from json config

Author: preetha-intel

onnxruntime/core/providers/openvino/backends/basic_backend.cc

@@ -224,6 +224,15 @@ void BasicBackend::PopulateConfigValue(ov::AnyMap& device_config) {
         }
       }
     }
+    auto find_device_type_mode = [&](const std::string& device_type) -> std::string {
+      std::string device_mode="";
+      auto delimiter_pos = device_type.find(':');
+      if (delimiter_pos != std::string::npos) {
+        std::stringstream str_stream(device_type.substr(0, delimiter_pos));
+        std::getline(str_stream, device_mode, ',');
+      }
+      return device_mode;
+    };
 
     // Parse device types like "AUTO:CPU,GPU" and extract individual devices
     auto parse_individual_devices = [&](const std::string& device_type) -> std::vector<std::string> {
@@ -272,8 +281,12 @@ void BasicBackend::PopulateConfigValue(ov::AnyMap& device_config) {
     if (session_context_.device_type.find("AUTO") == 0 ||
         session_context_.device_type.find("HETERO") == 0 ||
         session_context_.device_type.find("MULTI") == 0) {
+      //// Parse to get the device mode (e.g., "AUTO:CPU,GPU" -> "AUTO")
+      auto device_mode = find_device_type_mode(session_context_.device_type);
       // Parse individual devices (e.g., "AUTO:CPU,GPU" -> ["CPU", "GPU"])
       auto individual_devices = parse_individual_devices(session_context_.device_type);
+      if(!device_mode.empty()) individual_devices.emplace_back(device_mode);
+
       // Set properties only for individual devices (e.g., "CPU", "GPU")
       for (const std::string& device : individual_devices) {
         if (target_config.count(device)) {
@@ -284,6 +297,8 @@ void BasicBackend::PopulateConfigValue(ov::AnyMap& device_config) {
         }
       }
     } else {
+      std::unordered_set<std::string> valid_ov_devices = {"CPU", "GPU", "NPU", "AUTO", "HETERO", "MULTI"};
+
       if (target_config.count(session_context_.device_type)) {
         auto supported_properties = OVCore::Get()->core.get_property(session_context_.device_type,
                                                                      ov::supported_properties);

onnxruntime/core/providers/openvino/openvino_provider_factory.cc

@@ -100,8 +100,8 @@ std::string ParseDeviceType(std::shared_ptr<OVCore> ov_core, const ProviderOptio
     default_device = DEVICE_NAME;
 
     // Validate that devices passed are valid
-    int delimit = device_type.find(":");
-    const auto& devices = device_type.substr(delimit + 1);
+    int delimit = default_device.find(":");
+    const auto& devices = default_device.substr(delimit + 1);
     auto device_list = split(devices, ',');
     for (const auto& device : devices) {
       if (!ov_supported_device_types.contains(device)) {
@@ -256,9 +256,9 @@ struct OpenVINO_Provider : Provider {
 
           for (auto& [key, value] : json_config.items()) {
             ov::AnyMap inner_map;
-
+            std::unordered_set<std::string> valid_ov_devices = {"CPU", "GPU", "NPU", "AUTO", "HETERO", "MULTI"};
             // Ensure the key is one of "CPU", "GPU", or "NPU"
-            if (key != "CPU" && key != "GPU" && key != "NPU") {
+            if (valid_ov_devices.find(key) == valid_ov_devices.end()) {
               LOGS_DEFAULT(WARNING) << "Unsupported device key: " << key << ". Skipping entry.\n";
               continue;
             }