Merge pull request #1050 from intel/rajeev/contrib_ops_test

CVS-165537 Minor fixes to partially enable contrib op tests

Author: RajeevSekar

onnxruntime/test/contrib_ops/embed_layer_norm_op_test.cc

@@ -153,7 +153,12 @@ static void RunTest(const embedlayernorm::OpData& data,
       execution_providers.push_back(DefaultDmlExecutionProvider());
       tester.Run(OpTester::ExpectResult::kExpectSuccess, "", {}, nullptr, &execution_providers);
     } else {
-      tester.Run(OpTester::ExpectResult::kExpectSuccess, "", {kOpenVINOExecutionProvider});
+      if (sum_output) {
+        // OpenVINO EP only supports 2 outputs for EmbedLayerNormalization, skip when 3rd output (embedding_sum) is requested
+        tester.Run(OpTester::ExpectResult::kExpectSuccess, "", {kOpenVINOExecutionProvider});
+      } else {
+        tester.Run();
+      }
     }
   }
 }

onnxruntime/test/contrib_ops/fused_matmul_op_test.cc

@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
+#include <unordered_set>
+
 #include "gtest/gtest.h"
 #include "test/providers/provider_test_utils.h"
 #include "test/common/cuda_op_test_utils.h"
@@ -212,8 +214,13 @@ void RunFusedMatMulTest(const char* op_name, int32_t opset_version = 7, bool tra
 
     test.AddOutput<T>("Y", t.expected_dims, t.expected_vals);
 
-    // Disable OpenVINO, TensorRT because of unsupported data type
-    test.Run(OpTester::ExpectResult::kExpectSuccess, "", {kTensorrtExecutionProvider, kOpenVINOExecutionProvider, kQnnExecutionProvider});
+    // Disable TensorRT because of unsupported data type.
+    // Disable OpenVINO for scale (alpha != 1.0) and transBatch cases due to OV compilation errors.
+    std::unordered_set<std::string> excluded_eps = {kTensorrtExecutionProvider, kQnnExecutionProvider};
+    if (alpha != 1.0f || is_trans_batch_a || is_trans_batch_b) {
+      excluded_eps.insert(kOpenVINOExecutionProvider);
+    }
+    test.Run(OpTester::ExpectResult::kExpectSuccess, "", excluded_eps);
   }
 }
 

onnxruntime/test/contrib_ops/matmul_4bits_test.cc

@@ -293,6 +293,8 @@ void TestMatMulNBitsTyped(std::optional<float> abs_error = std::nullopt,
     base_opts.output_abs_error = 0.1f;
   } else if constexpr (std::is_same<AType, MLFloat16>::value) {
     base_opts.output_abs_error = 0.055f;
+  } else {
+    base_opts.output_abs_error = 0.05f;
   }
 
   if (rel_error.has_value()) {
@@ -301,6 +303,8 @@ void TestMatMulNBitsTyped(std::optional<float> abs_error = std::nullopt,
     base_opts.output_rel_error = 0.02f;
   } else if constexpr (std::is_same<AType, MLFloat16>::value) {
     base_opts.output_rel_error = 0.02f;
+  } else {
+    base_opts.output_rel_error = 0.02f;
   }
 
   {
@@ -357,8 +361,6 @@ void TestMatMulNBitsTyped(std::optional<float> abs_error = std::nullopt,
 #endif
 }
 
-#if !defined(USE_OPENVINO)
-
 TEST(MatMulNBits, Float32_4b_Accuracy0) {
   TestMatMulNBitsTyped<float, 1, 1, 16, 16, 0>();
   TestMatMulNBitsTyped<float, 1, 2, 16, 16, 0>();
@@ -591,7 +593,6 @@ TEST(MatMulNBits, Float32_4b_Accuracy4_Batch) {
   RunTest<float>(opts);
 }
 
-#endif
 #endif
 #endif