Merge branch 'sahar/session_options' into sahar/session_option_bug_fix

Author: sfatimar

onnxruntime/core/providers/openvino/openvino_provider_factory.cc

@@ -15,7 +15,7 @@
 namespace onnxruntime {
 namespace openvino_ep {
 void ParseConfigOptions(ProviderInfo& pi) {
-  if(pi.config_options==NULL)
+  if (pi.config_options == nullptr)
     return;
 
   pi.so_disable_cpu_ep_fallback = pi.config_options->GetConfigOrDefault(kOrtSessionOptionsDisableCPUEPFallback, "0") == "1";
@@ -201,15 +201,9 @@ struct OpenVINO_Provider : Provider {
     }
 
     std::array<void*, 2> pointers_array = *reinterpret_cast<const std::array<void*, 2>*>(void_params);
-    const ProviderOptions* provider_options_ptr = reinterpret_cast<ProviderOptions*>(pointers_array[0]);
+    const ProviderOptions provider_options = *reinterpret_cast<ProviderOptions*>(pointers_array[0]);
     const ConfigOptions* config_options = reinterpret_cast<ConfigOptions*>(pointers_array[1]);
 
-    if(provider_options_ptr == NULL) {
-      LOGS_DEFAULT(ERROR) << "[OpenVINO EP] Passed NULL ProviderOptions to CreateExecutionProviderFactory()";
-      return nullptr;
-    }
-    const ProviderOptions provider_options = *provider_options_ptr;
-
     ProviderInfo pi;
     pi.config_options = config_options;
 

onnxruntime/core/session/provider_bridge_ort.cc

@@ -1999,7 +1999,7 @@ std::shared_ptr<IExecutionProviderFactory> OpenVINOProviderFactoryCreator::Creat
     const ProviderOptions* provider_options_map, const SessionOptions* session_options) {
   // Append session options applicable for EP to EP Provider options.
   const ConfigOptions* config_options = nullptr;
-  if (session_options !=nullptr) {
+  if (session_options != nullptr) {
     config_options = &session_options->config_options;
   }