Formatting

src/include/migraphx/matcher.hpp

@@ -413,18 +413,18 @@ inline auto either_arg(std::size_t i, std::size_t j)
     };
 }
 
-template<class M>
+template <class M>
 auto same_shape(M m)
 {
     return make_basic_fun_matcher([=](matcher_context& ctx, instruction_ref ins) {
         auto i = m.match(ctx, ins);
-        if (i != ctx.not_found() and i->get_shape() == ins->get_shape())
+        if(i != ctx.not_found() and i->get_shape() == ins->get_shape())
             return ins;
         return ctx.not_found();
     });
 }
 
-template<class... Ms>
+template <class... Ms>
 auto same_shape(Ms... ms)
 {
     return all_of(same_shape(ms)...);

src/simplify_reshapes.cpp

@@ -129,9 +129,7 @@ struct find_nop_reshapes
         auto reshapes = reshaper_names();
         reshapes.insert("transpose");
         reshapes.insert("slice");
-        return match::name(reshapes)(
-            match::same_shape(match::arg(0))
-        );
+        return match::name(reshapes)(match::same_shape(match::arg(0)));
     }
 
     void apply(program& p, match::matcher_result mr) const
@@ -189,15 +187,15 @@ struct find_concat_transpose
         auto ins = mr.result;
         auto s   = ins->inputs().front()->get_shape();
         assert(s.transposed());
-        auto op          = any_cast<op::concat>(ins->get_operator());
-        auto permutation = find_permutation(s);
+        auto op           = any_cast<op::concat>(ins->get_operator());
+        auto permutation  = find_permutation(s);
         auto ipermutation = invert_permutation(permutation);
-        op.axis          = permutation[op.axis];
+        op.axis           = permutation[op.axis];
 
         std::vector<instruction_ref> inputs;
         std::transform(
             ins->inputs().begin(), ins->inputs().end(), std::back_inserter(inputs), [&](auto i) {
-                if (i->name() == "transpose" and i->inputs().front()->get_shape().standard())
+                if(i->name() == "transpose" and i->inputs().front()->get_shape().standard())
                     return i->inputs().front();
                 return p.insert_instruction(ins, op::transpose{permutation}, i);
             });
@@ -217,7 +215,12 @@ void simplify_reshapes::apply(program& p) const
         // Skip possible dead instructions
         if(ins->outputs().empty() and ins != end)
             continue;
-        match::find_matches(p, ins, find_nop_reshapes{}, find_reshaper{}, find_transpose{}, find_concat_transpose{});
+        match::find_matches(p,
+                            ins,
+                            find_nop_reshapes{},
+                            find_reshaper{},
+                            find_transpose{},
+                            find_concat_transpose{});
     }
 }
 

test/simplify_reshapes_test.cpp

@@ -217,8 +217,8 @@ TEST_CASE(transpose_partial3)
 TEST_CASE(nop_transpose1)
 {
     migraphx::program p;
-    auto s  = migraphx::shape{migraphx::shape::float_type, {1, 2, 3}};
-    auto x  = p.add_parameter("x", s);
+    auto s = migraphx::shape{migraphx::shape::float_type, {1, 2, 3}};
+    auto x = p.add_parameter("x", s);
     auto t = p.add_instruction(migraphx::op::transpose{{0, 1, 2}}, x);
     p.add_instruction(pass_op{}, t);
     auto out_shape = p.get_shape();
@@ -248,12 +248,12 @@ TEST_CASE(nop_transpose2)
 TEST_CASE(nop_transpose3)
 {
     migraphx::program p;
-    auto s  = migraphx::shape{migraphx::shape::float_type, {1, 2, 3, 4}};
-    auto x  = p.add_parameter("x", s);
-    auto y  = p.add_parameter("y", s);
+    auto s      = migraphx::shape{migraphx::shape::float_type, {1, 2, 3, 4}};
+    auto x      = p.add_parameter("x", s);
+    auto y      = p.add_parameter("y", s);
     auto concat = p.add_instruction(migraphx::op::concat{3}, x, y);
-    auto t1 = p.add_instruction(migraphx::op::transpose{{0, 1, 2, 3}}, concat);
-    auto t2 = p.add_instruction(migraphx::op::transpose{{0, 1, 3, 2}}, t1);
+    auto t1     = p.add_instruction(migraphx::op::transpose{{0, 1, 2, 3}}, concat);
+    auto t2     = p.add_instruction(migraphx::op::transpose{{0, 1, 3, 2}}, t1);
     p.add_instruction(pass_op{}, t2);
     auto out_shape = p.get_shape();
     auto n         = std::distance(p.begin(), p.end());
@@ -265,27 +265,23 @@ TEST_CASE(nop_transpose3)
 TEST_CASE(concat_transpose1)
 {
     migraphx::program p;
-    auto s  = migraphx::shape{migraphx::shape::float_type, {1, 2, 3, 4}};
-    auto x  = p.add_parameter("x", s);
-    auto y  = p.add_parameter("y", s);
-    auto xt = p.add_instruction(migraphx::op::transpose{{0, 1, 3, 2}}, x);
-    auto yt = p.add_instruction(migraphx::op::transpose{{0, 1, 3, 2}}, y);
+    auto s      = migraphx::shape{migraphx::shape::float_type, {1, 2, 3, 4}};
+    auto x      = p.add_parameter("x", s);
+    auto y      = p.add_parameter("y", s);
+    auto xt     = p.add_instruction(migraphx::op::transpose{{0, 1, 3, 2}}, x);
+    auto yt     = p.add_instruction(migraphx::op::transpose{{0, 1, 3, 2}}, y);
     auto concat = p.add_instruction(migraphx::op::concat{2}, xt, yt);
-    auto t = p.add_instruction(migraphx::op::transpose{{0, 1, 3, 2}}, concat);
+    auto t      = p.add_instruction(migraphx::op::transpose{{0, 1, 3, 2}}, concat);
     p.add_instruction(pass_op{}, t);
     auto out_shape = p.get_shape();
     auto n         = std::distance(p.begin(), p.end());
     p.compile(simplify_reshapes_target{});
     EXPECT(p.get_shape().lens() == out_shape.lens());
     EXPECT(std::distance(p.begin(), p.end()) == n - 3);
-    auto new_concat = std::find_if(p.begin(), p.end(), [](auto ins) {
-        return ins.name() == "concat";
-    });
+    auto new_concat =
+        std::find_if(p.begin(), p.end(), [](auto ins) { return ins.name() == "concat"; });
     EXPECT(bool{new_concat != p.end()});
     EXPECT(migraphx::any_cast<migraphx::op::concat>(new_concat->get_operator()).axis == 3);
 }
 
-
-
 int main(int argc, const char* argv[]) { test::run(argc, argv); }
-