"...nni_cmd/tests/git@developer.sourcefind.cn:OpenDAS/nni.git" did not exist on "5d7c1cd87da801438e8a98f26c10a2e6115b0348"
Commit 47dbf164 authored by Ted Themistokleous's avatar Ted Themistokleous
Browse files

Replace skip_broadcasts with skip_broadcasts_converts

Use this call to also skip converts when running a simplify_algebra pass over a program.
parent cd8c2f8e
...@@ -855,7 +855,8 @@ struct find_zero_div_const ...@@ -855,7 +855,8 @@ struct find_zero_div_const
{ {
auto matcher() const auto matcher() const
{ {
return match::name("div")(match::arg(1)(match::skip_broadcasts(match::has_value(0.0f)))); return match::name("div")(
match::arg(1)(match::skip_broadcasts_converts(match::has_value(0.0f))));
} }
[[noreturn]] void apply(module&, const match::matcher_result&) const [[noreturn]] void apply(module&, const match::matcher_result&) const
...@@ -869,13 +870,13 @@ struct find_unit_ops ...@@ -869,13 +870,13 @@ struct find_unit_ops
auto matcher() const auto matcher() const
{ {
auto mul_1 = match::name("mul")(match::either_arg(0, 1)( auto mul_1 = match::name("mul")(match::either_arg(0, 1)(
match::skip_broadcasts(match::has_value(1.0f)), match::any().bind("x"))); match::skip_broadcasts_converts(match::has_value(1.0f)), match::any().bind("x")));
auto div_1 = match::name("div")( auto div_1 = match::name("div")(match::args(
match::args(match::any().bind("x"), match::skip_broadcasts(match::has_value(1.0f)))); match::any().bind("x"), match::skip_broadcasts_converts(match::has_value(1.0f))));
auto add_0 = match::name("add")(match::either_arg(0, 1)( auto add_0 = match::name("add")(match::either_arg(0, 1)(
match::skip_broadcasts(match::has_value(0.0f)), match::any().bind("x"))); match::skip_broadcasts_converts(match::has_value(0.0f)), match::any().bind("x")));
auto sub_0 = match::name("sub")( auto sub_0 = match::name("sub")(match::args(
match::args(match::any().bind("x"), match::skip_broadcasts(match::has_value(0.0f)))); match::any().bind("x"), match::skip_broadcasts_converts(match::has_value(0.0f))));
return match::any_of(mul_1, div_1, add_0, sub_0); return match::any_of(mul_1, div_1, add_0, sub_0);
} }
...@@ -893,11 +894,11 @@ struct find_neg_unit_ops ...@@ -893,11 +894,11 @@ struct find_neg_unit_ops
auto matcher() const auto matcher() const
{ {
auto mul_neg_1 = match::name("mul")(match::either_arg(0, 1)( auto mul_neg_1 = match::name("mul")(match::either_arg(0, 1)(
match::skip_broadcasts(match::has_value(-1.0f)), match::any().bind("x"))); match::skip_broadcasts_converts(match::has_value(-1.0f)), match::any().bind("x")));
auto div_neg_1 = match::name("div")( auto div_neg_1 = match::name("div")(match::args(
match::args(match::any().bind("x"), match::skip_broadcasts(match::has_value(-1.0f)))); match::any().bind("x"), match::skip_broadcasts_converts(match::has_value(-1.0f))));
auto sub_0 = match::name("sub")( auto sub_0 = match::name("sub")(match::args(
match::args(match::skip_broadcasts(match::has_value(0.0f)), match::any().bind("x"))); match::skip_broadcasts_converts(match::has_value(0.0f)), match::any().bind("x")));
return match::any_of(mul_neg_1, div_neg_1, sub_0); return match::any_of(mul_neg_1, div_neg_1, sub_0);
} }
......
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