Merge branch 'dyn_conv' of github.com:ROCmSoftwarePlatform/AMDMIGraphX into dyn_nms

src/include/migraphx/operation.hpp

@@ -69,8 +69,10 @@ struct operation
      *
      * @param ctx This is the context created by the `target` during compilation. Implementations
      * can use the target's `context` class rather than the `context` interface class.
-     * @param output This is the output shape. It is equivalent to running `compute_shape` with each
-     * `shape` of the `argument`.
+     * @param output Equivalent to running `compute_shape` with each `shape` of the `argument`.
+     * For a fixed shape, the returned argument will have the same shape as `output`.
+     * For a dynamic shape, the returned `argument` will be a fixed shape within the bounds
+     * set in the dynamic shape `output`.
      * @param input This is the `argument` result from the previous instruction's computation.
      * @return Return an `argument` of the result computation. The `shape` of `argument` should be
      * the same the `output` shape.

src/program.cpp

@@ -279,56 +279,6 @@ void preview_argument(std::ostream& os, const argument& a)
         });
 }
 
-template <class Ins, class T, class F>
-void process_op(context& ctx,
-                Ins ins,
-                T trace,
-                F make_trace,
-                std::vector<argument>& values,
-                std::unordered_map<instruction_ref, argument>& results)
-{
-    values.resize(ins->inputs().size());
-    std::transform(
-        ins->inputs().begin(), ins->inputs().end(), values.begin(), [&](instruction_ref i) {
-            assert(results.find(i) != results.end());
-            return results[i];
-        });
-
-    shape output_shape;
-    auto ins_shape = ins->get_shape();
-    if(ins_shape.dynamic())
-    {
-        // Make into a std::vector<instruction_ref> of inputs
-        auto to_shapes = [](std::vector<argument> args) {
-            std::vector<shape> shapes(args.size());
-            std::transform(args.begin(), args.end(), shapes.begin(), [](const argument& i) {
-                return i.get_shape();
-            });
-            return shapes;
-        };
-        // TODO: Consider how this will be handled when memoized.
-        // Could memoize these output shapes into a map so not recalculating
-        // TODO: Issue with possibly wanting to use new padding/strides/dilation
-        output_shape = ins->get_operator().compute_shape(to_shapes(values));
-    }
-    else
-    {
-        output_shape = ins_shape;
-    }
-
-    const auto& mod_args = ins->module_inputs();
-    auto module_eval     = [&](module_ref smod,
-                           const std::unordered_map<std::string, argument>& inputs) {
-        auto ssctx = ctx;
-        return generic_eval(smod, ssctx, inputs, results, make_trace);
-    };
-
-    results.emplace(ins, trace(ins, [&] {
-                        return ins->normalized_operator().compute(
-                            ctx, output_shape, values, mod_args, module_eval);
-                    }));
-}
-
 template <class F>
 std::vector<argument> generic_eval(const module* mod,
                                    context& ctx,
@@ -356,12 +306,13 @@ std::vector<argument> generic_eval(const module* mod,
                     auto param_name = any_cast<builtin::param>(ins->get_operator()).parameter;
                     if(not contains(params, param_name))
                         MIGRAPHX_THROW("Parameter not found: " + param_name);
-
                     auto param = params[param_name];
                     // TODO: may want to check correct number of dimensions and/or was within bounds
                     if(not ins->get_shape().dynamic() and param.get_shape() != ins->get_shape())
+                    {
                         MIGRAPHX_THROW("Incorrect shape {" + to_string(param.get_shape()) +
                                        "} for parameter: " + param_name);
+                    }
                     return param;
                 }));
         }
@@ -384,7 +335,24 @@ std::vector<argument> generic_eval(const module* mod,
         }
         else
         {
-            process_op(ctx, ins, trace, make_trace, values, results);
+            values.resize(ins->inputs().size());
+            std::transform(
+                ins->inputs().begin(), ins->inputs().end(), values.begin(), [&](instruction_ref i) {
+                    assert(results.find(i) != results.end());
+                    return results[i];
+                });
+
+            const auto& mod_args = ins->module_inputs();
+            auto module_eval     = [&](module_ref smod,
+                                   const std::unordered_map<std::string, argument>& inputs) {
+                auto ssctx = ctx;
+                return generic_eval(smod, ssctx, inputs, results, make_trace);
+            };
+
+            results.emplace(ins, trace(ins, [&] {
+                                return ins->normalized_operator().compute(
+                                    ctx, ins->get_shape(), values, mod_args, module_eval);
+                            }));
         }
         assert(results.find(ins) != results.end());
         if(not ins->get_shape().dynamic())

src/targets/ref/lowering.cpp

@@ -231,11 +231,13 @@ struct ref_convolution : auto_register_op<ref_convolution<Op>>
     {
         return op.normalize_compute_shape(inputs);
     }
+
     argument compute(context&, shape output_shape, std::vector<argument> args) const
     {
         if(output_shape.dynamic())
         {
-            op.normalize_compute_shape({args.at(0).get_shape(), args.at(1).get_shape()});
+            output_shape =
+                op.normalize_compute_shape({args.at(0).get_shape(), args.at(1).get_shape()});
         }
         argument result{output_shape};
         visit_quantize(result, args[0], args[1])([&](auto output, auto input, auto weights) {

tools/include/operation.hpp

@@ -68,8 +68,10 @@ struct operation
      *
      * @param ctx This is the context created by the `target` during compilation. Implementations
      * can use the target's `context` class rather than the `context` interface class.
-     * @param output This is the output shape. It is equivalent to running `compute_shape` with each
-     * `shape` of the `argument`.
+     * @param output Equivalent to running `compute_shape` with each `shape` of the `argument`.
+     * For a fixed shape, the returned argument will have the same shape as `output`.
+     * For a dynamic shape, the returned `argument` will be a fixed shape within the bounds
+     * set in the dynamic shape `output`.
      * @param input This is the `argument` result from the previous instruction's computation.
      * @return Return an `argument` of the result computation. The `shape` of `argument` should be
      * the same the `output` shape.
@@ -137,7 +139,7 @@ auto compute_shape_op(rank<2>, const T& x, const std::vector<shape>& inputs)
     -> decltype(x.normalize_compute_shape(inputs))
 {
     dependent_type<operation, T> y = x;
-    normalize_attributes(y, inputs[0].lens());
+    normalize_attributes(y, inputs[0]);
     return any_cast<T>(y).normalize_compute_shape(inputs);
 }