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

src/onnx/onnx.cpp

@@ -44,13 +44,13 @@ program parse_onnx_from(const onnx_options& options, Ts&&... xs)
     parser.map_input_dims     = options.map_input_dims;
     parser.map_dyn_input_dims = options.map_dyn_input_dims;
     auto dim_val              = options.default_dim_value;
-    if(dim_val != 0)
+    if(dim_val == 0)
     {
-        parser.default_dyn_dim_value = {dim_val, dim_val, 0};
+        parser.default_dyn_dim_value = options.default_dyn_dim_value;
     }
     else
     {
-        parser.default_dyn_dim_value = options.default_dyn_dim_value;
+        parser.default_dyn_dim_value = {dim_val, dim_val, 0};
     }
     parser.skip_unknown_operators = options.skip_unknown_operators;
     parser.max_loop_iterations    = options.max_loop_iterations;

src/onnx/onnx_parser.cpp

@@ -462,7 +462,7 @@ shape onnx_parser::parse_type(const onnx::TypeProto& t,
                            {
                                return default_dyn_dim_value;
                            }
-                           auto tmp = static_cast<std::size_t>(d.dim_value());
+                           std::size_t tmp = d.dim_value();
                            return {tmp, tmp, 0};
                        }
                        else