Work in progress. Getting segfaults now with eval

src/include/migraphx/op/reshape.hpp

@@ -127,7 +127,7 @@ struct reshape
             }
         }
 
-        return shape{inputs.front().type(), rdims};
+        return {inputs.front().type(), rdims};
     }
 
     shape compute_shape(std::vector<shape> inputs) const
@@ -152,9 +152,9 @@ struct reshape
         assert(dyn_out.computed_shape.standard());
         argument result{dyn_out.computed_shape};
 
-        auto resh = args[0].reshape_lazy(dyn_out.computed_shape);
+        //auto resh = args[0](dyn_out.computed_shape);
 
-        visit_all(result, resh)([&](auto output, auto input) {
+        visit_all(result, args[0])([&](auto output, auto input) {
             shape_for_each(output.get_shape(), [&](const auto& idx) {
                 output(idx.begin(), idx.end()) = input(idx.begin(), idx.end());
             });

src/include/migraphx/op/reshape_lazy.hpp

@@ -233,7 +233,7 @@ struct reshape_lazy
             }
         }
 
-        std::cout << rdims.size() << std::endl;
+        //std::cout << rdims.size() << std::endl;
 
         auto s = reshape_lazy_dims(inputs.front(), rdims);
         if(not s.has_value())

src/targets/gpu/lowering.cpp

@@ -116,7 +116,7 @@ struct miopen_apply
         add_neg_op();
         add_nms_op();
         add_select_module_op();
-        add_reshape_lazy_op();
+        //add_reshape_lazy_op();
     }
 
     void copy_params() const
@@ -380,29 +380,28 @@ struct miopen_apply
     }
 
     /**
-    *  Adds reshape lazy to reshape ops that can be aliased instead of copied
-    */
-    void add_reshape_lazy_op()
+     *  Adds reshape lazy to reshape ops that can be aliased instead of copied
+     */
+    /*void add_reshape_lazy_op()
     {
         apply_map.emplace("reshape", [=](instruction_ref ins) {
-                ins->debug_print();
-                /* Attempt lazy reshape to allow for aliasing. Potentially throws in get_shape if unable to alias */
-                return mod->replace_instruction(ins, make_op("reshape_lazy", {{"dims", {ins->get_operator().to_value()}}}), ins->inputs(), ins->module_inputs());
-            try 
-            {   
-
+            /* Attempt lazy reshape to allow for aliasing. Potentially throws in get_shape if unable
+             * to alias 
+            try
+            {
+                auto lazy_ins =  mod->replace_instruction(
+                ins,
+                    make_op("reshape_lazy", {{"dims", {ins->get_operator().to_value().at("dims")}}}),
+                    ins->inputs(),
+                    ins->module_inputs());
+                    return lazy_ins;
             }
-            catch (...)
+            catch(...)
             {
-                //std::cout << "catch reshape_lazy_fail" << std::endl;
-                /* can't alias so require an allocate for output and a contiguous */
-                auto s                              = ins->get_shape();
-                std::vector<instruction_ref> inputs = ins->inputs();
-                auto output                         = insert_allocation(ins, s);
-                return mod->insert_instruction(std::next(ins), make_op("gpu::contiguous"), ins, output);
+                return ins;
             }
         });
-    }
+    }*/
 };
 
 void lowering::apply(module_pass_manager& mpm) const

src/tf/parse_reshape.cpp

@@ -46,7 +46,7 @@ struct parse_reshape : op_parser<parse_reshape>
         std::vector<int64_t> dims;
         s.visit([&](auto v) { copy(v, std::back_inserter(dims)); });
         return info.add_instruction(make_op("reshape", {{"dims", dims}}),
-                                         info.make_contiguous(args[0]));
+                                    info.make_contiguous(args[0]));
     }
 };