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

src/include/migraphx/onnx.hpp

@@ -33,13 +33,19 @@ inline namespace MIGRAPHX_INLINE_NS {
 /// struct to pass in onnx options to parser
 struct onnx_options
 {
-    /// Old way to set default fixed dimension size (priority over default_dyn_dim_value)
+    /// Old way to set default fixed dimension size
     std::size_t default_dim_value = 0;
-    /// Default dynamic dimension size (if not specified in onnx file)
+    /*!
+     * Default dynamic dimension size (if both default_dim_value and default_dyn_dim_value
+     * set parser throws)
+     */
     shape::dynamic_dimension default_dyn_dim_value = {1, 1, 0};
-    /// Explicitly specify the dims of an input (priority over map_dyn_input_dims)
+    /// Explicitly specify the dims of an input
     std::unordered_map<std::string, std::vector<std::size_t>> map_input_dims = {};
-    /// Explicitly specify dynamic dims of an input
+    /*!
+     * Explicitly specify dynamic dims of an input (if both map_input_dims and
+     * map_dyn_input_dims set parser throws)
+     */
     std::unordered_map<std::string, std::vector<shape::dynamic_dimension>> map_dyn_input_dims = {};
     /// Continue parsing onnx file if an unknown operator is found
     bool skip_unknown_operators = false;

src/include/migraphx/op/allocate.hpp

@@ -26,8 +26,8 @@
 
 #include <migraphx/check_shapes.hpp>
 #include <migraphx/config.hpp>
-#include <migraphx/argument.hpp>
 #include <migraphx/shape.hpp>
+#include <migraphx/argument.hpp>
 
 namespace migraphx {
 inline namespace MIGRAPHX_INLINE_NS {

src/include/migraphx/op/batch_norm_inference.hpp

@@ -26,7 +26,6 @@
 
 #include <migraphx/check_shapes.hpp>
 #include <migraphx/config.hpp>
-#include <migraphx/argument.hpp>
 #include <cmath>
 
 namespace migraphx {

src/include/migraphx/op/convolution.hpp

@@ -28,7 +28,6 @@
 #include <migraphx/check_shapes.hpp>
 #include <migraphx/config.hpp>
 #include <migraphx/value.hpp>
-#include <migraphx/argument.hpp>
 #include <cmath>
 #include <utility>
 

src/include/migraphx/op/gathernd.hpp

@@ -27,6 +27,7 @@
 #include <migraphx/check_shapes.hpp>
 #include <migraphx/shape_for_each.hpp>
 #include <migraphx/par_for.hpp>
+#include <migraphx/argument.hpp>
 
 namespace migraphx {
 inline namespace MIGRAPHX_INLINE_NS {

src/include/migraphx/op/get_tuple_elem.hpp

@@ -26,10 +26,8 @@
 
 #include "migraphx/errors.hpp"
 #include <migraphx/check_shapes.hpp>
-#include <migraphx/stringutils.hpp>
-#include <migraphx/streamutils.hpp>
-#include <migraphx/argument.hpp>
 #include <migraphx/config.hpp>
+#include <migraphx/argument.hpp>
 #include <utility>
 
 namespace migraphx {

src/include/migraphx/op/identity.hpp

@@ -25,6 +25,7 @@
 #define MIGRAPHX_GUARD_OPERATORS_IDENTITY_HPP
 
 #include <migraphx/op/unary.hpp>
+#include <migraphx/argument.hpp>
 
 namespace migraphx {
 inline namespace MIGRAPHX_INLINE_NS {

src/include/migraphx/op/if_op.hpp

@@ -26,7 +26,6 @@
 
 #include <array>
 #include <migraphx/check_shapes.hpp>
-#include <migraphx/argument.hpp>
 #include <migraphx/functional.hpp>
 #include <migraphx/config.hpp>
 #include <migraphx/module.hpp>

src/include/migraphx/op/leaky_relu.hpp

@@ -25,7 +25,6 @@
 #define MIGRAPHX_GUARD_OPERATORS_LEAKY_RELU_HPP
 
 #include <migraphx/check_shapes.hpp>
-#include <migraphx/argument.hpp>
 #include <migraphx/config.hpp>
 
 namespace migraphx {

src/include/migraphx/op/loop.hpp

@@ -25,7 +25,6 @@
 #define MIGRAPHX_GUARD_OPERATORS_LOOP_HPP
 
 #include <migraphx/check_shapes.hpp>
-#include <migraphx/argument.hpp>
 #include <migraphx/functional.hpp>
 #include <migraphx/config.hpp>
 #include <migraphx/module.hpp>

src/include/migraphx/op/nonmaxsuppression.hpp

@@ -36,6 +36,7 @@
 #include <migraphx/shape_for_each.hpp>
 #include <migraphx/check_shapes.hpp>
 #include <migraphx/output_iterator.hpp>
+#include <migraphx/argument.hpp>
 
 namespace migraphx {
 inline namespace MIGRAPHX_INLINE_NS {

src/include/migraphx/op/nonzero.hpp

@@ -29,6 +29,7 @@
 #include <migraphx/config.hpp>
 #include <migraphx/float_equal.hpp>
 #include <migraphx/par_for.hpp>
+#include <migraphx/argument.hpp>
 #include <cmath>
 #include <utility>
 

src/include/migraphx/op/prefix_scan_sum.hpp

@@ -28,7 +28,6 @@
 #include <migraphx/operation.hpp>
 #include <migraphx/check_shapes.hpp>
 #include <migraphx/config.hpp>
-#include <migraphx/argument.hpp>
 #include <migraphx/op/prefix_scan_op.hpp>
 
 namespace migraphx {

src/include/migraphx/op/quant_convolution.hpp

@@ -28,7 +28,6 @@
 #include <migraphx/check_shapes.hpp>
 #include <migraphx/config.hpp>
 #include <migraphx/value.hpp>
-#include <migraphx/argument.hpp>
 #include <cmath>
 #include <utility>
 

src/include/migraphx/op/quant_dot.hpp

@@ -25,7 +25,6 @@
 #define MIGRAPHX_GUARD_OPERATORS_QUANT_DOT_HPP
 
 #include <migraphx/check_shapes.hpp>
-#include <migraphx/argument.hpp>
 #include <migraphx/config.hpp>
 #include <migraphx/gemm.hpp>
 #include <migraphx/value.hpp>

src/include/migraphx/op/reduce_op.hpp

@@ -27,6 +27,7 @@
 #include <migraphx/op/name.hpp>
 #include <migraphx/check_shapes.hpp>
 #include <migraphx/argument.hpp>
+#include <migraphx/tensor_view.hpp>
 #include <migraphx/shape_for_each.hpp>
 #include <migraphx/par_for.hpp>
 #include <migraphx/config.hpp>

src/include/migraphx/op/reverse.hpp

@@ -32,7 +32,6 @@
 #include <migraphx/argument.hpp>
 #include <migraphx/op/normalize_attribute.hpp>
 #include <migraphx/shape_for_each.hpp>
-#include <migraphx/argument.hpp>
 #include <migraphx/value.hpp>
 
 namespace migraphx {

src/include/migraphx/op/scatter.hpp

@@ -26,15 +26,12 @@
 
 #include <array>
 #include <migraphx/check_shapes.hpp>
-#include <migraphx/stringutils.hpp>
-#include <migraphx/streamutils.hpp>
 #include <migraphx/shape_for_each.hpp>
 #include <migraphx/config.hpp>
 #include <migraphx/value.hpp>
 #include <migraphx/op/name.hpp>
 #include <migraphx/op/normalize_attribute.hpp>
-#include <cmath>
-#include <utility>
+#include <migraphx/argument.hpp>
 
 namespace migraphx {
 inline namespace MIGRAPHX_INLINE_NS {

src/include/migraphx/op/scatter_add.hpp

@@ -25,15 +25,7 @@
 #define MIGRAPHX_GUARD_OPERATORS_SCATTER_ADD_HPP
 
 #include <array>
-#include <migraphx/check_shapes.hpp>
-#include <migraphx/stringutils.hpp>
-#include <migraphx/streamutils.hpp>
-#include <migraphx/shape_for_each.hpp>
 #include <migraphx/config.hpp>
-#include <migraphx/value.hpp>
-#include <migraphx/op/normalize_attribute.hpp>
-#include <cmath>
-#include <utility>
 #include <migraphx/op/scatter.hpp>
 
 // Scatter op. with "add" function as reduction.

src/include/migraphx/op/scatter_mul.hpp

@@ -25,15 +25,7 @@
 #define MIGRAPHX_GUARD_OPERATORS_SCATTER_MUL_HPP
 
 #include <array>
-#include <migraphx/check_shapes.hpp>
-#include <migraphx/stringutils.hpp>
-#include <migraphx/streamutils.hpp>
-#include <migraphx/shape_for_each.hpp>
 #include <migraphx/config.hpp>
-#include <migraphx/value.hpp>
-#include <migraphx/op/normalize_attribute.hpp>
-#include <cmath>
-#include <utility>
 #include <migraphx/op/scatter.hpp>
 
 // Scatter op. with "multiply" as the reduction function.