Fix tidy issue

src/include/migraphx/op/reshape.hpp

@@ -29,6 +29,7 @@
 #include <migraphx/config.hpp>
 #include <migraphx/value.hpp>
 #include <migraphx/dyn_output.hpp>
+#include <migraphx/optional.hpp>
 
 namespace migraphx {
 inline namespace MIGRAPHX_INLINE_NS {
@@ -127,43 +128,14 @@ struct reshape
                           });
     }
 
-    shape static_compute_shape(std::vector<shape> inputs, std::size_t n_neg_dims) const
-    {
-        check_shapes{inputs, *this}.has(1);
-        auto&& idims    = inputs.front().lens();
-        auto&& istrides = inputs.front().strides();
-        std::vector<std::size_t> rdims(dims.begin(), dims.end());
-
-        for(std::size_t i = 0; i < dims.size(); i++)
+    static optional<shape> reshape_dims(const shape& input, const std::vector<std::size_t>& rdims)
     {
-            if(dims[i] == 0)
-                rdims[i] = idims[i];
-
-            // since rdims using size_t type, -1 is the max value
-            // is size_t that cause later compuation incorrect
-            if(dims[i] == -1)
-                rdims[i] = 1;
-        }
+        if(input.standard())
+            return shape{input.type(), rdims};
 
-        if(n_neg_dims > 0)
-        {
-            size_t missing_dim =
-                inputs.front().elements() /
-                std::accumulate(rdims.begin(), rdims.end(), 1, std::multiplies<int64_t>());
-            for(std::size_t i = 0; i < rdims.size(); i++)
-            {
-                if(dims[i] == -1)
-                    rdims[i] = missing_dim;
-            }
-        }
+        const auto& idims    = input.lens();
+        const auto& istrides = input.strides();
 
-        shape s;
-        if(inputs.front().standard())
-        {
-            s = shape{inputs.front().type(), rdims};
-        }
-        else
-        {
         std::vector<std::size_t> rstrides;
         std::size_t i = 0;
         std::size_t r = 0;
@@ -181,26 +153,26 @@ struct reshape
                 auto start = idims.begin() + i;
                 auto it    = compute_end_dim(start, idims.end(), rdim);
                 if(it == start)
-                        break;
+                    return nullopt;
                 auto n = it - start;
                 if((i + n) > istrides.size())
-                        break;
+                    return nullopt;
                 if(not can_strides_merge(
                        start, it + 1, istrides.begin() + i, istrides.begin() + i + n + 1))
-                        break;
+                    return nullopt;
                 i += n;
                 rstrides.push_back(istrides[i]);
             }
             // unsqueeze
-                else if(rdim < idim)
+            else // if(rdim < idim)
             {
                 auto start = rdims.begin() + i;
                 auto it    = compute_end_dim(start, rdims.end(), idim);
                 if(it == start)
-                        break;
+                    return nullopt;
                 auto n = it - start;
                 if((r + n) > rdims.size())
-                        break;
+                    return nullopt;
                 auto stride = istrides[i] * idim;
                 std::for_each(start, it + 1, [&](auto dim) {
                     stride /= dim;
@@ -219,24 +191,58 @@ struct reshape
             for(auto d : range(rdims.begin() + rstrides.size(), rdims.end()))
             {
                 if(d != 1)
-                        break;
+                    return nullopt;
                 rstrides.push_back(stride);
             }
         }
 
         if(rdims.size() != rstrides.size())
-                MIGRAPHX_THROW("Reshape on axis that is not standard");
+            return nullopt;
 
-            s = shape{inputs.front().type(), rdims, rstrides};
+        return shape{input.type(), rdims, rstrides};
     }
 
-        if(s.elements() != inputs.front().elements())
+    shape static_compute_shape(std::vector<shape> inputs, std::size_t n_neg_dims) const
+    {
+        check_shapes{inputs, *this}.has(1);
+        auto&& idims    = inputs.front().lens();
+        // auto&& istrides = inputs.front().strides();
+        std::vector<std::size_t> rdims(dims.begin(), dims.end());
+
+        for(std::size_t i = 0; i < dims.size(); i++)
+        {
+            if(dims[i] == 0)
+                rdims[i] = idims[i];
+
+            // since rdims using size_t type, -1 is the max value
+            // is size_t that cause later compuation incorrect
+            if(dims[i] == -1)
+                rdims[i] = 1;
+        }
+
+        if(n_neg_dims > 0)
+        {
+            size_t missing_dim =
+                inputs.front().elements() /
+                std::accumulate(rdims.begin(), rdims.end(), 1, std::multiplies<int64_t>());
+            for(std::size_t i = 0; i < rdims.size(); i++)
+            {
+                if(dims[i] == -1)
+                    rdims[i] = missing_dim;
+            }
+        }
+
+        auto s = reshape_dims(inputs.front(), rdims);
+        if (not s.has_value())
+            MIGRAPHX_THROW("Reshape on axis that is not packed.");
+
+        if(s->elements() != inputs.front().elements())
             MIGRAPHX_THROW("Reshape: Wrong number of elements for reshape: reshape has " +
-                           std::to_string(s.elements()) + " elements whereas the input has " +
+                           std::to_string(s->elements()) + " elements whereas the input has " +
                            std::to_string(inputs.front().elements()));
 
-        assert(s.bytes() == inputs.front().bytes());
-        return s;
+        assert(s->bytes() == inputs.front().bytes());
+        return *s;
     }
 
     shape compute_shape(std::vector<shape> inputs) const