Fix onnx test loading.

ROCm · May 29, 2024 · 2542894 · 2542894
1 parent bc7d5cb
commit 2542894
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 70 deletions.
diff --git a/src/onnx/parse_einsum.cpp b/src/onnx/parse_einsum.cpp
@@ -239,7 +239,7 @@ struct parse_einsum : op_parser<parse_einsum>
                               const std::map<char, int>& label_count,
                               size_t ellipsis_ndim) const
     {
-        const auto* it = std::find_if(output_term.begin(), output_term.end(), [&](auto l) {
+        const auto it = std::find_if(output_term.begin(), output_term.end(), [&](auto l) {
             return not contains(label_count, l) and l != '*';
         });
         if(it != output_term.end())

diff --git a/test/onnx/parse/einsum_negative_tests.cpp b/test/onnx/parse/einsum_negative_tests.cpp
@@ -26,89 +26,75 @@
 
 TEST_CASE(einsum_missing_equation_negative_test)
 {
-    EXPECT(
-        test::throws([&] { migraphx::parse_onnx("einsum_missing_equation_negative_test.onnx"); }));
+    EXPECT(test::throws([&] { read_onnx("einsum_missing_equation_negative_test.onnx"); }));
 }
 
 TEST_CASE(einsum_multiple_arrows_negative_test)
 {
-    EXPECT(
-        test::throws([&] { migraphx::parse_onnx("einsum_multiple_arrows_negative_test.onnx"); }));
+    EXPECT(test::throws([&] { read_onnx("einsum_multiple_arrows_negative_test.onnx"); }));
 }
 
 TEST_CASE(einsum_empty_term_before_arrow_negative_test)
 {
-    EXPECT(test::throws(
-        [&] { migraphx::parse_onnx("einsum_empty_term_before_arrow_negative_test.onnx"); }));
+    EXPECT(test::throws([&] { read_onnx("einsum_empty_term_before_arrow_negative_test.onnx"); }));
 }
 
 TEST_CASE(einsum_multiple_ellipses_negative_test)
 {
-    EXPECT(
-        test::throws([&] { migraphx::parse_onnx("einsum_multiple_ellipses_negative_test.onnx"); }));
+    EXPECT(test::throws([&] { read_onnx("einsum_multiple_ellipses_negative_test.onnx"); }));
 }
 
 TEST_CASE(einsum_comma_in_output_negative_test)
 {
-    EXPECT(
-        test::throws([&] { migraphx::parse_onnx("einsum_comma_in_output_negative_test.onnx"); }));
+    EXPECT(test::throws([&] { read_onnx("einsum_comma_in_output_negative_test.onnx"); }));
 }
 
 TEST_CASE(einsum_empty_term_before_comma_negative_test)
 {
-    EXPECT(test::throws(
-        [&] { migraphx::parse_onnx("einsum_empty_term_before_comma_negative_test.onnx"); }));
+    EXPECT(test::throws([&] { read_onnx("einsum_empty_term_before_comma_negative_test.onnx"); }));
 }
 
 TEST_CASE(einsum_last_input_missing_negative_test)
 {
-    EXPECT(test::throws(
-        [&] { migraphx::parse_onnx("einsum_last_input_missing_negative_test.onnx"); }));
+    EXPECT(test::throws([&] { read_onnx("einsum_last_input_missing_negative_test.onnx"); }));
 }
 
 TEST_CASE(einsum_term_input_mismatch_negative_test)
 {
-    EXPECT(test::throws(
-        [&] { migraphx::parse_onnx("einsum_term_input_mismatch_negative_test.onnx"); }));
+    EXPECT(test::throws([&] { read_onnx("einsum_term_input_mismatch_negative_test.onnx"); }));
 }
 
 TEST_CASE(einsum_ellipsis_mismatch_negative_test)
 {
-    EXPECT(
-        test::throws([&] { migraphx::parse_onnx("einsum_ellipsis_mismatch_negative_test.onnx"); }));
+    EXPECT(test::throws([&] { read_onnx("einsum_ellipsis_mismatch_negative_test.onnx"); }));
 }
 
 TEST_CASE(einsum_rank_mismatch_negative_test)
 {
-    EXPECT(test::throws([&] { migraphx::parse_onnx("einsum_rank_mismatch_negative_test.onnx"); }));
+    EXPECT(test::throws([&] { read_onnx("einsum_rank_mismatch_negative_test.onnx"); }));
 }
 
 TEST_CASE(einsum_output_surplus_label_negative_test)
 {
-    EXPECT(test::throws(
-        [&] { migraphx::parse_onnx("einsum_output_surplus_label_negative_test.onnx"); }));
+    EXPECT(test::throws([&] { read_onnx("einsum_output_surplus_label_negative_test.onnx"); }));
 }
 
 TEST_CASE(einsum_output_missing_ellipsis_negative_test)
 {
-    EXPECT(test::throws(
-        [&] { migraphx::parse_onnx("einsum_output_missing_ellipsis_negative_test.onnx"); }));
+    EXPECT(test::throws([&] { read_onnx("einsum_output_missing_ellipsis_negative_test.onnx"); }));
 }
 
 TEST_CASE(einsum_multiple_diagonals_negative_test)
 {
-    EXPECT(test::throws(
-        [&] { migraphx::parse_onnx("einsum_multiple_diagonals_negative_test.onnx"); }));
+    EXPECT(test::throws([&] { read_onnx("einsum_multiple_diagonals_negative_test.onnx"); }));
 }
 
 TEST_CASE(einsum_diagonal_dim_mismatch_negative_test)
 {
-    EXPECT(test::throws(
-        [&] { migraphx::parse_onnx("einsum_diagonal_dim_mismatch_negative_test.onnx"); }));
+    EXPECT(test::throws([&] { read_onnx("einsum_diagonal_dim_mismatch_negative_test.onnx"); }));
 }
 
 TEST_CASE(einsum_right_batch_diagonal_negative_test)
 {
-    EXPECT(test::throws(
-        [&] { migraphx::parse_onnx("einsum_right_batch_diagonal_negative_test.onnx"); }));
+    EXPECT(test::throws([&] { read_onnx("einsum_right_batch_diagonal_negative_test.onnx"); }));
 }