Skip to content

Commit

Permalink
[ARITH] Bugfix min/max const canonicalize rule (apache#3386)
Browse files Browse the repository at this point in the history
  • Loading branch information
tqchen authored and Wei Chen committed Jun 26, 2019
1 parent 24cb036 commit c034258
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
2 changes: 1 addition & 1 deletion 3rdparty/dmlc-core
7 changes: 5 additions & 2 deletions src/arithmetic/rewrite_simplify.cc
Original file line number Diff line number Diff line change
Expand Up @@ -813,7 +813,9 @@ Mutate_(const Min* op, const Expr& self) {

// canonicalization
TVM_TRY_RECURSIVE_REWRITE(min(min(x, c1), y), min(min(x, y), c1));
TVM_TRY_RECURSIVE_REWRITE(min(c1 - x, c2), c1 - max(x, c2 - c1));
TVM_TRY_RECURSIVE_REWRITE_IF(
min(c1 - x, c2), c1 - max(x, c1 - c2),
c2.Eval()->value != 0);
}

// condition rules.
Expand Down Expand Up @@ -961,7 +963,8 @@ Mutate_(const Max* op, const Expr& self) {

// canonicalization
TVM_TRY_RECURSIVE_REWRITE(max(max(x, c1), y), max(max(x, y), c1));
TVM_TRY_RECURSIVE_REWRITE(max(c1 - x, c2), c1 - min(x, c2 - c1));
TVM_TRY_RECURSIVE_REWRITE_IF(
max(c1 - x, c2), c1 - min(x, c1 - c2), c2.Eval()->value != 0);
}

// condition rules.
Expand Down
2 changes: 2 additions & 0 deletions tests/python/unittest/test_arith_rewrite_simplify.py
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,7 @@ def test_min_index_simplify():
ck.verify(tvm.min(x / 10, y / 10), tvm.min(x, y) / 10)
ck.verify(tvm.min(x / (-10), y / (-10)), tvm.max(x, y) / (-10))
ck.verify(tvm.min(x * 3, 9), tvm.min(x, 3) * 3)
ck.verify(tvm.min(3 - x, 2), 3 - tvm.max(x, 1))


def test_max_index_simplify():
Expand Down Expand Up @@ -448,6 +449,7 @@ def test_max_index_simplify():
ck.verify(tvm.max(x / 10, y / 10), tvm.max(x, y) / 10)
ck.verify(tvm.max(x / (-10), y / (-10)), tvm.min(x, y) / (-10))
ck.verify(tvm.max(x * 3, 9), tvm.max(x, 3) * 3)
ck.verify(tvm.max(3 - x, 1), 3 - tvm.min(x, 2))


def test_cmp_simplify():
Expand Down

0 comments on commit c034258

Please sign in to comment.