First attempt at adding proper reshape for then/else modules in parse_if

src/onnx/parse_if.cpp

@@ -73,36 +73,38 @@ struct parse_if : op_parser<parse_if>
         {
             MIGRAPHX_THROW("PARSE_IF: " + info.name +
                            " then and else sub_grahps must have same output type! " +
-                           std::to_string(then_out_shapes.at(0).type()) + " vs " +
-                           std::to_string(else_out_shapes.at(0).type()));
+                           then_out_shapes.at(0).type_string() + " vs " +
+                           else_out_shapes.at(0).type_string());
         }
 
-        // If either argument returns non scalar, promote the scalar to a 1D tensor to meet the
-        // shape requirements
-        // if and only if the first dimension matches
-        if(not then_out_shapes.at(0).scalar() || not else_out_shapes.at(0).scalar)
-        {
-            if(then_out_shapes.at(0).scalar())
+        if(not then_out_shapes.at(0).scalar() && not else_out_shapes.at(0).scalar())
         {
+            // First dimension must agree
             if(then_out_shapes.at(0).lens().at(0) != else_out_shapes.at(0).lens().at(0))
             {
-                    MIGRAPHX_THROW("PARSE_IF: " + info.name +
-                                   "then out incompatible output shape with else");
+                MIGRAPHX_THROW("PARSE_IF: " + then_out_shapes.at(0).type_string() + " & " +
+                               else_out_shapes.at(0).type_string() +
+                               " are incompatible output shapes for then/cases");
             }
-                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))
+
+            auto then_out_strides = then_out_shapes.at(0).strides();
+            auto else_out_strides = else_out_shapes.at(0).strides();
+
+            if(then_out_strides.size() > else_out_strides.size())
             {
-                    MIGRAPHX_THROW("PARSE_IF: " + info.name +
-                                   "else out incompatible output shape with then");
+                else_mdl->insert_instruction(
+                    std::prev(else_mdl->end()),
+                    migraphx::make_op(
+                        "reshape", {{"dims", {{else_out_shapes.at(0).lens().at(0), 1}, {1, 1}}}}),
+                    std::prev(else_mdl->end())->inputs().front());
             }
-                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);
+            else if(then_out_strides.size() < else_out_strides.size())
+            {
+                then_mdl->insert_instruction(
+                    std::prev(then_mdl->end()),
+                    migraphx::make_op(
+                        "reshape", {{"dims", {{then_out_shapes.at(0).lens().at(0), 1}, {1, 1}}}}),
+                    std::prev(then_mdl->end())->inputs().front());
             }
         }