Revert "[Relay] Keep fixed dim when unifying dynamic shape (#5795)" (#…

…6658) * Revert "[Relay] Keep fixed dim when unifying dynamic shape (#5795)" This reverts commit 782190e. * run infer type on test_sparse_dense_padded_alter_op() to fix CI Co-authored-by: masa <[email protected]>
apache · Oct 10, 2020 · 5a33774 · 5a33774
1 parent 6d0351a
commit 5a33774
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 23 deletions.
diff --git a/src/relay/analysis/type_solver.cc b/src/relay/analysis/type_solver.cc
@@ -186,17 +186,6 @@ class TypeSolver::Unifier : public TypeFunctor<Type(const Type&, const Type&)> {
     if (ulhs.same_as(urhs)) {
       return ulhs;
     }
-
-    if (ulhs.as<AnyNode>() && urhs.as<tvm::IntImmNode>()) {
-      solver_->shape_uf_.Set(urhs, ulhs);
-      return urhs;
-    }
-
-    if (ulhs.as<tvm::IntImmNode>() && urhs.as<AnyNode>()) {
-      solver_->shape_uf_.Set(ulhs, urhs);
-      return ulhs;
-    }
-
     if (ulhs.as<AnyNode>() || urhs.as<AnyNode>()) {
       return Any();
     }

diff --git a/tests/python/relay/test_type_infer.py b/tests/python/relay/test_type_infer.py
@@ -22,7 +22,6 @@
 
 from tvm import IRModule, te, relay, parser
 from tvm.relay import op, transform, analysis
-from tvm.relay import Any
 
 
 def infer_mod(mod, annotate_spans=True):
@@ -388,16 +387,6 @@ def test_let_polymorphism():
     tvm.ir.assert_structural_equal(body.checked_type, relay.TupleType([int32, relay.TupleType([])]))
 
 
-def test_if():
-    choice_t = relay.FuncType([], relay.scalar_type("bool"))
-    f = relay.Var("f", choice_t)
-    true_branch = relay.Var("True", relay.TensorType([Any(), 1], dtype="float32"))
-    false_branch = relay.Var("False", relay.TensorType([Any(), Any()], dtype="float32"))
-    top = relay.Function([f, true_branch, false_branch], relay.If(f(), true_branch, false_branch))
-    ft = infer_expr(top)
-    tvm.ir.assert_structural_equal(ft.ret_type, relay.TensorType([Any(), 1], dtype="float32"))
-
-
 def test_type_arg_infer():
     code = """
 #[version = "0.0.5"]

diff --git a/tests/python/topi/python/test_topi_sparse.py b/tests/python/topi/python/test_topi_sparse.py
@@ -466,7 +466,8 @@ def test_sparse_dense_padded_alter_op():
             ),
         )
         f = relay.Function([], mult)
-        f_ = relay.transform.AlterOpLayout()(tvm.IRModule.from_expr(f))
+        f = relay.transform.InferType()(tvm.IRModule.from_expr(f))
+        f_ = relay.transform.AlterOpLayout()(f)
         assert f_["main"].body.op.name == "nn.internal.sparse_dense_padded"