Force scalars to be the same shape when comming out of an if then/else block

src/onnx/parse_if.cpp

@@ -77,27 +77,27 @@ struct parse_if : op_parser<parse_if>
                            std::to_string(else_out_shapes.at(0).type()));
         }
 
-        // Need to check static shapes result
-        if(not then_out_shapes.at(0).dynamic() && not else_out_shapes.at(0).dynamic())
-        {
             if(then_out_shapes.at(0).scalar())
+        {
+            if(then_out_shapes.at(0).lens().at(0) != else_out_shapes.at(0).lens().at(0) ||
+                then_out_shapes.at(0).strides().at(0) != 1)
             {
-                if(then_out_shapes.at(0).lens().at(0) != else_out_shapes.at(0).lens().at(0) ||
-                   then_out_shapes.at(0).strides().at(0) != 1)
-                {
-                    MIGRAPHX_THROW("PARSE_IF: " + info.name +
-                                   "then out incompatible output shape with else");
-                }
+                MIGRAPHX_THROW("PARSE_IF: " + info.name +
+                                "then out incompatible output shape with else");
             }
-            else if(else_out_shapes.at(0).scalar())
+            migraphx::shape s(then_out_shapes.at(0).type(), {then_out_shapes.at(0).lens().at(0), 1} , {1, 1});
+            then_mdl->add_outline(s);
+        }
+        else if(else_out_shapes.at(0).scalar())
+        {
+            if(else_out_shapes.at(0).lens().at(0) != else_out_shapes.at(0).lens().at(0) ||
+                else_out_shapes.at(0).strides().at(0) == 1)
             {
-                if(else_out_shapes.at(0).lens().at(0) != else_out_shapes.at(0).lens().at(0) ||
-                   else_out_shapes.at(0).strides().at(0) == 1)
-                {
-                    MIGRAPHX_THROW("PARSE_IF: " + info.name +
-                                   "else out incompatible output shape with then");
-                }
+                MIGRAPHX_THROW("PARSE_IF: " + info.name +
+                                "else out incompatible output shape with then");
             }
+            migraphx::shape s(else_out_shapes.at(0).type(), {else_out_shapes.at(0).lens().at(0), 1} , {1, 1});
+            else_mdl->add_outline(s);
         }
 
         auto if_ret = info.add_instruction(make_op("if"), args, {then_mdl, else_mdl});