Merge branch 'develop' into round_operator

src/onnx/onnx.cpp

@@ -323,9 +323,13 @@ struct onnx_parser
         if(contains(attributes, "pads"))
         {
             if(contains(attributes, "auto_pad"))
+            {
+                auto s = attributes["auto_pad"].s();
+                if(contains(attributes, "pads") and to_upper(s) != "NOTSET")
                 {
                     MIGRAPHX_THROW("auto_pad and padding cannot be specified simultaneously");
                 }
+            }
             std::vector<std::int64_t> padding;
             copy(attributes["pads"].ints(), std::back_inserter(padding));
             if(padding.size() != 4)
@@ -372,7 +376,7 @@ struct onnx_parser
         if(args.size() == 3)
         {
             uint64_t axis = 1;
-            auto l1       = prog.add_instruction(op, args[0], args[1]);
+            auto l1       = prog.add_instruction(op, l0, args[1]);
             auto l2 = prog.add_instruction(op::broadcast{axis, l1->get_shape().lens()}, args[2]);
             return prog.add_instruction(op::add{}, l1, l2);
         }

test/onnx/onnx_test.cpp

@@ -8,6 +8,11 @@
 #include <migraphx/onnx.hpp>
 #include "test.hpp"
 
+TEST_CASE(conv_autopad_fail_test)
+{
+    EXPECT(test::throws([&] { migraphx::parse_onnx("conv_autopad_fail_test.onnx"); }));
+}
+
 TEST_CASE(pytorch_conv_bias_test)
 {
     migraphx::program p;