Skip to content

update: Update MSFT Contrib Ops in OVEP #521

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sfatimar merged 3 commits into from
Feb 11, 2025
Merged

update: Update MSFT Contrib Ops in OVEP #521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0a6fd1a
update: Update MSFT Contrib Ops from OV
ankitm3k Dec 11, 2024
f8a5330
modified data_ops.cc to remove unsupported ops
n1harika Jan 24, 2025
875d055
disabled tests for EmbedLayerNormalisation and MatMulNBits
n1harika Feb 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions onnxruntime/core/providers/openvino/ov_versions/data_ops.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,10 @@ std::vector<SupportedOp> supported_op_mode = {
{"Atan", V_2020_4, {"CPU", "GPU"}},
{"Atanh", V_2020_4, {"CPU"}},
{"Atanh", V_2022_1, {"GPU"}},
{"Attention", V_2023_0, {"CPU", "GPU"}},
{"AveragePool", V_2020_4, {"CPU", "GPU"}},
{"BatchNormalization", V_2020_4, {"CPU", "GPU"}},
{"BiasGelu", V_2023_0, {"CPU", "GPU"}},
{"BitShift", V_2022_1, {"CPU"}},
{"Cast", V_2020_4, {"CPU", "GPU"}},
{"CastLike", V_2023_1, {"CPU", "GPU"}},
Expand All @@ -123,6 +125,7 @@ std::vector<SupportedOp> supported_op_mode = {
{"Dropout", V_2020_4, {"CPU", "GPU"}},
{"Elu", V_2020_4, {"CPU", "GPU"}},
{"Einsum", V_2023_1, {"CPU", "GPU"}},
{"EmbedLayerNormalization", V_2024_5, {"CPU", "GPU"}},
{"EPContext", V_2024_0, {"CPU", "GPU", "NPU"}},
{"Equal", V_2020_4, {"CPU", "GPU"}},
{"Erf", V_2020_4, {"CPU", "GPU"}},
Expand All @@ -131,6 +134,8 @@ std::vector<SupportedOp> supported_op_mode = {
{"EyeLike", V_2022_1, {"CPU"}},
{"Flatten", V_2020_4, {"CPU", "GPU"}},
{"Floor", V_2020_4, {"CPU", "GPU"}},
{"FusedConv", V_2023_0, {"CPU", "GPU"}},
{"FusedGemm", V_2023_0, {"CPU", "GPU"}},
{"Gather", V_2020_4, {"CPU", "GPU"}},
{"GatherElements", V_2022_2, {"CPU", "GPU"}},
{"GatherND", V_2021_4, {"CPU", "GPU"}},
Expand Down Expand Up @@ -164,6 +169,7 @@ std::vector<SupportedOp> supported_op_mode = {
{"LSTM", V_2020_4, {"CPU", "GPU"}},
{"MatMul", V_2020_4, {"CPU", "GPU"}},
{"MatMulInteger", V_2022_1, {"CPU"}},
{"MatMulNBits", V_2024_5, {"CPU", "GPU"}},
{"Max", V_2020_4, {"CPU", "GPU"}},
{"MaxPool", V_2020_4, {"CPU", "GPU"}},
{"Mean", V_2020_4, {"CPU", "GPU"}},
Expand Down Expand Up @@ -222,6 +228,7 @@ std::vector<SupportedOp> supported_op_mode = {
{"Sin", V_2022_1, {"CPU", "GPU"}},
{"Sinh", V_2020_4, {"CPU"}},
{"Size", V_2022_1, {"CPU", "GPU"}},
{"SkipLayerNormalization", V_2024_5, {"CPU", "GPU"}},
{"Slice", V_2020_4, {"CPU", "GPU"}},
{"Softmax", V_2020_4, {"CPU", "GPU"}},
{"Softplus", V_2022_1, {"CPU", "GPU"}},
Expand Down
4 changes: 4 additions & 0 deletions onnxruntime/test/contrib_ops/embed_layer_norm_op_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,11 @@ static void RunTest(const embedlayernorm::OpData& data,
execution_providers.push_back(DefaultDmlExecutionProvider());
tester.Run(OpTester::ExpectResult::kExpectSuccess, "", {}, nullptr, &execution_providers);
} else {
#if defined(USE_OPENVINO)
tester.Run(OpTester::ExpectResult::kExpectSuccess, "", {kOpenVINOExecutionProvider});
#else
tester.Run();
#endif
}
}
}
Expand Down
5 changes: 4 additions & 1 deletion onnxruntime/test/contrib_ops/matmul_4bits_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ struct TestOptions {
std::optional<float> output_rel_error{};
};

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

#if !defined(USE_OPENVINO)

TEST(MatMulNBits, Float32_Accuracy0) {
TestMatMulNBitsTyped<float, 1, 1, 16, 16, 0>();
TestMatMulNBitsTyped<float, 1, 2, 16, 16, 0>();
Expand Down Expand Up @@ -462,6 +464,7 @@ TEST(MatMulNBits, Float16_Accuracy4) {
}
#endif
#endif
#endif

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

Expand Down