Commit 30b40654 authored by Paul's avatar Paul
Browse files

Formatting

parent 6d84eb12
...@@ -185,8 +185,10 @@ struct match_add_relu ...@@ -185,8 +185,10 @@ struct match_add_relu
{ {
auto matcher() const auto matcher() const
{ {
return match::name("gpu::relu")(match::used_once(), match::arg(0)( return match::name("gpu::relu")(
match::any_of(match::name("gpu::add"), match::name("hip::triadd")).bind("add"))); match::used_once(),
match::arg(0)(
match::any_of(match::name("gpu::add"), match::name("hip::triadd")).bind("add")));
} }
void apply(program& p, match::matcher_result r) const void apply(program& p, match::matcher_result r) const
...@@ -356,7 +358,10 @@ struct match_conv_bias ...@@ -356,7 +358,10 @@ struct match_conv_bias
struct match_conv_bias_relu struct match_conv_bias_relu
{ {
context* ctx = nullptr; context* ctx = nullptr;
auto matcher() const { return match::name("gpu::relu")(match::used_once(), match::arg(0)(conv_bias())); } auto matcher() const
{
return match::name("gpu::relu")(match::used_once(), match::arg(0)(conv_bias()));
}
void apply(program& p, match::matcher_result r) const void apply(program& p, match::matcher_result r) const
{ {
......
...@@ -180,9 +180,9 @@ struct test_triadd ...@@ -180,9 +180,9 @@ struct test_triadd
{ {
migraph::program p; migraph::program p;
migraph::shape s{migraph::shape::float_type, {3}}; migraph::shape s{migraph::shape::float_type, {3}};
auto x = p.add_parameter("x", s); auto x = p.add_parameter("x", s);
auto y = p.add_parameter("y", s); auto y = p.add_parameter("y", s);
auto z = p.add_parameter("z", s); auto z = p.add_parameter("z", s);
auto sum = p.add_instruction(migraph::op::add{}, x, y); auto sum = p.add_instruction(migraph::op::add{}, x, y);
p.add_instruction(migraph::op::add{}, sum, z); p.add_instruction(migraph::op::add{}, sum, z);
return p; return p;
...@@ -196,10 +196,10 @@ struct test_triadd2 ...@@ -196,10 +196,10 @@ struct test_triadd2
migraph::program p; migraph::program p;
migraph::shape s{migraph::shape::float_type, {2, 3}}; migraph::shape s{migraph::shape::float_type, {2, 3}};
migraph::shape b{migraph::shape::float_type, {3}}; migraph::shape b{migraph::shape::float_type, {3}};
auto x = p.add_parameter("x", s); auto x = p.add_parameter("x", s);
auto y = p.add_parameter("y", s); auto y = p.add_parameter("y", s);
auto z = p.add_parameter("z", b); auto z = p.add_parameter("z", b);
auto zb = p.add_instruction(migraph::op::broadcast{1, s}, z); auto zb = p.add_instruction(migraph::op::broadcast{1, s}, z);
auto sum = p.add_instruction(migraph::op::add{}, x, y); auto sum = p.add_instruction(migraph::op::add{}, x, y);
p.add_instruction(migraph::op::add{}, sum, zb); p.add_instruction(migraph::op::add{}, sum, zb);
return p; return p;
...@@ -282,10 +282,10 @@ struct test_triadd_broadcast ...@@ -282,10 +282,10 @@ struct test_triadd_broadcast
{ {
migraph::program p; migraph::program p;
migraph::shape s{migraph::shape::float_type, {3}}; migraph::shape s{migraph::shape::float_type, {3}};
auto x = p.add_parameter("x", {migraph::shape::float_type, {2, 2, 3}}); auto x = p.add_parameter("x", {migraph::shape::float_type, {2, 2, 3}});
auto y = p.add_parameter("y", {migraph::shape::float_type, {2, 2}}); auto y = p.add_parameter("y", {migraph::shape::float_type, {2, 2}});
auto z = p.add_parameter("z", {migraph::shape::float_type, {2, 2, 3}}); auto z = p.add_parameter("z", {migraph::shape::float_type, {2, 2, 3}});
auto by = p.add_instruction(migraph::op::broadcast{0, x->get_shape()}, y); auto by = p.add_instruction(migraph::op::broadcast{0, x->get_shape()}, y);
auto sum = p.add_instruction(migraph::op::add{}, x, by); auto sum = p.add_instruction(migraph::op::add{}, x, by);
p.add_instruction(migraph::op::add{}, sum, z); p.add_instruction(migraph::op::add{}, sum, z);
return p; return p;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment