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

…)" (apache#6658)

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

This reverts commit 782190e.

* run infer type on test_sparse_dense_padded_alter_op() to fix CI

Co-authored-by: masa <masa@pop-os.localdomain>

tests/python/relay/test_type_infer.py

@@ -387,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"]

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"