Merge branch 'ovep-develop' into ovep-develop

Author: bopeng1234

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

@@ -2,6 +2,8 @@
 // Licensed under the MIT License
 
 #include <map>
+#include <unordered_set>
+
 #include <string>
 #include <memory>
 #include <sstream>
@@ -222,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> {
@@ -270,8 +281,14 @@ 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")
+      std::unordered_set<std::string> supported_mode = {"AUTO", "HETERO", "MULTI"};
+      auto device_mode = find_device_type_mode(session_context_.device_type);
+      ORT_ENFORCE(supported_mode.find(device_mode)!=supported_mode.end(), " Invalid device mode is passed : " , 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)) {

onnxruntime/core/providers/openvino/openvino_provider_factory.cc

@@ -2,6 +2,8 @@
 // Licensed under the MIT License
 
 #include <map>
+#include <set>
+
 #include <utility>
 #include "core/providers/shared_library/provider_api.h"
 #include "core/providers/openvino/openvino_provider_factory.h"
@@ -216,9 +218,9 @@ struct OpenVINO_Provider : Provider {
 
           for (auto& [key, value] : json_config.items()) {
             ov::AnyMap inner_map;
-
+            std::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;
             }