Merge branch 'develop' of https://github.com/ROCmSoftwarePlatform/AMDMIGraphX into nhwc_workaround

tools/include/operation.hpp

@@ -261,11 +261,13 @@ auto compute_op(rank<1>,
 template <class T, class F>
 argument compute_op(rank<0>,
                     const T& x,
-                    const shape&,
-                    const std::vector<argument>&,
-                    const std::vector<module_ref>&,
+                    const shape& output,
+                    const std::vector<argument>& inputs,
+                    const std::vector<module_ref>& module_args,
                     F)
 {
+    if(module_args.empty())
+        return compute_op(x, output, inputs);
     std::string name = x.name();
     MIGRAPHX_THROW("Not computable: " + name);
 }

tools/include/target.hpp

@@ -45,6 +45,8 @@
 namespace migraphx {
 inline namespace MIGRAPHX_INLINE_NS {
 
+struct value;
+
 #ifdef DOXYGEN
 
 /// An interface for a compilation target
@@ -123,28 +125,41 @@ supported_segments target_find_supported(T&, const_module_ref, support_metric)
 }
 
 <%
-interface('target',
-     virtual('name', returns='std::string', const=True),
-     virtual('get_passes', ctx='context&', options='const compile_options&', returns='std::vector<pass>', const=True),
-     virtual('get_context', returns='context', const=True),
-     virtual('find_supported', returns='supported_segments', mod='const_module_ref', m='support_metric', const=True, default='target_find_supported'),
-     virtual('copy_to',
-             returns = 'argument',
-             input   = 'const argument&',
-             const   = True,
-             default = 'copy_to_target'),
-     virtual('copy_from',
-             returns = 'argument',
-             input   = 'const argument&',
-             const   = True,
-             default = 'copy_from_target'),
-    virtual('allocate', s='const shape&', returns='argument', const=True,
-             default = 'target_allocate')
-)
-%>
+ interface('target',
+           virtual('name', returns = 'std::string', const = True),
+           virtual('get_passes',
+                   ctx     = 'context&',
+                   options = 'const compile_options&',
+                   returns = 'std::vector<pass>',
+                   const   = True),
+           virtual('get_context', returns = 'context', const = True),
+           virtual('find_supported',
+                   returns = 'supported_segments',
+                   mod     = 'const_module_ref',
+                   m       = 'support_metric',
+                   const   = True,
+                   default = 'target_find_supported'),
+           virtual('copy_to',
+                   returns = 'argument',
+                   input   = 'const argument&',
+                   const   = True,
+                   default = 'copy_to_target'),
+           virtual('copy_from',
+                   returns = 'argument',
+                   input   = 'const argument&',
+                   const   = True,
+                   default = 'copy_from_target'),
+           virtual('allocate',
+                   s       = 'const shape&',
+                   returns = 'argument',
+                   const   = True,
+                   default = 'target_allocate')) %>
 
 #endif
 
+void migraphx_to_value(value& v, const target& t);
+void migraphx_from_value(const value& v, target& t);
+
 } // namespace MIGRAPHX_INLINE_NS
 } // namespace migraphx