Skip to content

Commit f84614c

Browse files
ankitm3kn1harika
authored andcommitted
update: Update MSFT Contrib Ops in OVEP (#521)
* update: Update MSFT Contrib Ops from OV * modified data_ops.cc to remove unsupported ops * disabled tests for EmbedLayerNormalisation and MatMulNBits --------- Co-authored-by: n1harika <[email protected]>
1 parent 9a44bb3 commit f84614c

File tree

3 files changed

+15
-1
lines changed

3 files changed

+15
-1
lines changed

onnxruntime/core/providers/openvino/ov_versions/data_ops.cc

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,10 @@ std::vector<SupportedOp> supported_op_mode = {
9595
{"Atan", V_2020_4, {"CPU", "GPU"}},
9696
{"Atanh", V_2020_4, {"CPU"}},
9797
{"Atanh", V_2022_1, {"GPU"}},
98+
{"Attention", V_2023_0, {"CPU", "GPU"}},
9899
{"AveragePool", V_2020_4, {"CPU", "GPU"}},
99100
{"BatchNormalization", V_2020_4, {"CPU", "GPU"}},
101+
{"BiasGelu", V_2023_0, {"CPU", "GPU"}},
100102
{"BitShift", V_2022_1, {"CPU"}},
101103
{"Cast", V_2020_4, {"CPU", "GPU"}},
102104
{"CastLike", V_2023_1, {"CPU", "GPU"}},
@@ -123,6 +125,7 @@ std::vector<SupportedOp> supported_op_mode = {
123125
{"Dropout", V_2020_4, {"CPU", "GPU"}},
124126
{"Elu", V_2020_4, {"CPU", "GPU"}},
125127
{"Einsum", V_2023_1, {"CPU", "GPU"}},
128+
{"EmbedLayerNormalization", V_2024_5, {"CPU", "GPU"}},
126129
{"EPContext", V_2024_0, {"CPU", "GPU", "NPU"}},
127130
{"Equal", V_2020_4, {"CPU", "GPU"}},
128131
{"Erf", V_2020_4, {"CPU", "GPU"}},
@@ -131,6 +134,8 @@ std::vector<SupportedOp> supported_op_mode = {
131134
{"EyeLike", V_2022_1, {"CPU"}},
132135
{"Flatten", V_2020_4, {"CPU", "GPU"}},
133136
{"Floor", V_2020_4, {"CPU", "GPU"}},
137+
{"FusedConv", V_2023_0, {"CPU", "GPU"}},
138+
{"FusedGemm", V_2023_0, {"CPU", "GPU"}},
134139
{"Gather", V_2020_4, {"CPU", "GPU"}},
135140
{"GatherElements", V_2022_2, {"CPU", "GPU"}},
136141
{"GatherND", V_2021_4, {"CPU", "GPU"}},
@@ -164,6 +169,7 @@ std::vector<SupportedOp> supported_op_mode = {
164169
{"LSTM", V_2020_4, {"CPU", "GPU"}},
165170
{"MatMul", V_2020_4, {"CPU", "GPU"}},
166171
{"MatMulInteger", V_2022_1, {"CPU"}},
172+
{"MatMulNBits", V_2024_5, {"CPU", "GPU"}},
167173
{"Max", V_2020_4, {"CPU", "GPU"}},
168174
{"MaxPool", V_2020_4, {"CPU", "GPU"}},
169175
{"Mean", V_2020_4, {"CPU", "GPU"}},
@@ -222,6 +228,7 @@ std::vector<SupportedOp> supported_op_mode = {
222228
{"Sin", V_2022_1, {"CPU", "GPU"}},
223229
{"Sinh", V_2020_4, {"CPU"}},
224230
{"Size", V_2022_1, {"CPU", "GPU"}},
231+
{"SkipLayerNormalization", V_2024_5, {"CPU", "GPU"}},
225232
{"Slice", V_2020_4, {"CPU", "GPU"}},
226233
{"Softmax", V_2020_4, {"CPU", "GPU"}},
227234
{"Softplus", V_2022_1, {"CPU", "GPU"}},

onnxruntime/test/contrib_ops/embed_layer_norm_op_test.cc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,11 @@ static void RunTest(const embedlayernorm::OpData& data,
158158
execution_providers.push_back(DefaultDmlExecutionProvider());
159159
tester.Run(OpTester::ExpectResult::kExpectSuccess, "", {}, nullptr, &execution_providers);
160160
} else {
161+
#if defined(USE_OPENVINO)
162+
tester.Run(OpTester::ExpectResult::kExpectSuccess, "", {kOpenVINOExecutionProvider});
163+
#else
161164
tester.Run();
165+
#endif
162166
}
163167
}
164168
}

onnxruntime/test/contrib_ops/matmul_4bits_test.cc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ struct TestOptions {
8585
std::optional<float> output_rel_error{};
8686
};
8787

88-
std::ostream& operator<<(std::ostream& os, const TestOptions& opts) {
88+
[[maybe_unused]] std::ostream& operator<<(std::ostream& os, const TestOptions& opts) {
8989
return os << "M:" << opts.M << ", N:" << opts.N << ", K:" << opts.K
9090
<< ", block_size:" << opts.block_size
9191
<< ", accuracy_level:" << opts.accuracy_level
@@ -327,6 +327,8 @@ void TestMatMulNBitsTyped() {
327327
#endif // !defined(USE_DML) && !defined(USE_WEBGPU)
328328
}
329329

330+
#if !defined(USE_OPENVINO)
331+
330332
TEST(MatMulNBits, Float32_Accuracy0) {
331333
TestMatMulNBitsTyped<float, 1, 1, 16, 16, 0>();
332334
TestMatMulNBitsTyped<float, 1, 2, 16, 16, 0>();
@@ -462,6 +464,7 @@ TEST(MatMulNBits, Float16_Accuracy4) {
462464
}
463465
#endif
464466
#endif
467+
#endif
465468

466469
#if defined(USE_CUDA) || defined(USE_ROCM) || defined(USE_DML) || defined(USE_WEBGPU)
467470

0 commit comments

Comments
 (0)