diff --git a/onnxruntime/core/providers/openvino/backends/basic_backend.cc b/onnxruntime/core/providers/openvino/backends/basic_backend.cc index b0d2d7fd9204..f9517d794266 100644 --- a/onnxruntime/core/providers/openvino/backends/basic_backend.cc +++ b/onnxruntime/core/providers/openvino/backends/basic_backend.cc @@ -129,7 +129,7 @@ void BasicBackend::PopulateConfigValue(ov::AnyMap& device_config) { #if defined(OPENVINO_2023_0) || (OPENVINO_2023_1) if (global_context_.device_type.find("VPUX") != std::string::npos) { std::pair device_property; - device_property = std::make_pair("VPUX_COMPILER_TYPE", "MLIR"); + device_property = std::make_pair("VPU_COMPILER_TYPE", "MLIR"); device_config.emplace(ov::device::properties("VPUX", device_property)); } #endif diff --git a/onnxruntime/core/providers/openvino/openvino_provider_factory.cc b/onnxruntime/core/providers/openvino/openvino_provider_factory.cc index 0543fdb561db..f116b360186d 100644 --- a/onnxruntime/core/providers/openvino/openvino_provider_factory.cc +++ b/onnxruntime/core/providers/openvino/openvino_provider_factory.cc @@ -73,7 +73,7 @@ struct OpenVINO_Provider : Provider { bool enable_opencl_throttling = false; // [enable_opencl_throttling]: Enables OpenCL queue throttling for GPU // device (Reduces CPU Utilization when using GPU) bool enable_dynamic_shapes = false; // [enable_dynamic_shapes]: Enables Dynamic Shapes feature for CPU device) - void* context; + void* context=nullptr; if (provider_options_map.find("device_type") != provider_options_map.end()) { device_type = provider_options_map.at("device_type").c_str(); diff --git a/onnxruntime/core/providers/openvino/ov_versions/data_ops.cc b/onnxruntime/core/providers/openvino/ov_versions/data_ops.cc index 3bfe4a8c5d7f..70118c94f9ff 100644 --- a/onnxruntime/core/providers/openvino/ov_versions/data_ops.cc +++ b/onnxruntime/core/providers/openvino/ov_versions/data_ops.cc @@ -36,6 +36,7 @@ std::set ops_supported_only_in_model = { "ConstantOfShape", "DequantizeLinear", "Dropout", + "Einsum", "Exp", "Expand", "EyeLike", @@ -127,7 +128,7 @@ std::vector supported_op_mode = { {"Dropout", V_2023_0, {"VPUX"}}, {"Elu", V_2020_4, {"CPU", "GPU"}}, {"Elu", V_2023_0, {"VPUX"}}, - {"Einsum", V_2023_0, {"CPU", "GPU"}}, + // {"Einsum", V_2023_0, {"CPU", "GPU"}}, {"Equal", V_2020_4, {"CPU", "GPU"}}, {"Equal", V_2023_0, {"VPUX"}}, // Added for whisper decoder model. {"Erf", V_2020_4, {"CPU", "GPU"}}, diff --git a/onnxruntime/core/providers/openvino/ov_versions/utils.cc b/onnxruntime/core/providers/openvino/ov_versions/utils.cc index 73ae71acb672..be509b674362 100644 --- a/onnxruntime/core/providers/openvino/ov_versions/utils.cc +++ b/onnxruntime/core/providers/openvino/ov_versions/utils.cc @@ -47,6 +47,7 @@ bool IsOpSupportedOnlyInModel(std::string name) { "Concat", "ConstantOfShape", "Dropout", + "Einsum", "Expand", "EyeLike", "Exp", diff --git a/onnxruntime/test/providers/cpu/math/einsum_test.cc b/onnxruntime/test/providers/cpu/math/einsum_test.cc index b7758fd2fd19..05b936a41e3c 100644 --- a/onnxruntime/test/providers/cpu/math/einsum_test.cc +++ b/onnxruntime/test/providers/cpu/math/einsum_test.cc @@ -22,7 +22,7 @@ TEST(Einsum, ExplicitEinsumAsIdentity_1D_input) { test.AddAttribute("equation", "i->i"); test.AddInput("x", {5}, {0.9f, 2.5f, 2.3f, 1.5f, -4.5f}); test.AddOutput("y", {5}, {0.9f, 2.5f, 2.3f, 1.5f, -4.5f}); - test.Run(); + test.Run(OpTester::ExpectResult::kExpectSuccess, "", {kOpenVINOExecutionProvider}); } // Implicit @@ -31,7 +31,7 @@ TEST(Einsum, ImplicitEinsumAsIdentity_1D_input) { test.AddAttribute("equation", "i"); test.AddInput("x", {5}, {0.9f, 2.5f, 2.3f, 1.5f, -4.5f}); test.AddOutput("y", {5}, {0.9f, 2.5f, 2.3f, 1.5f, -4.5f}); - test.Run(); + test.Run(OpTester::ExpectResult::kExpectSuccess, "", {kOpenVINOExecutionProvider}); } // Theme: Transpose/Permutation