rebase and fix

Author: kevinthesun

python/tvm/autotvm/util.py

@@ -177,11 +177,11 @@ def get_const_tuple(in_tuple):
     """
     ret = []
     for elem in in_tuple:
-        if isinstance(elem, tvm.expr.Var):
+        if isinstance(elem, expr.Var):
             ret.append(elem)
-        elif not isinstance(elem, (tvm.expr.IntImm, tvm.expr.UIntImm, int)):
+        elif not isinstance(elem, (expr.IntImm, expr.UIntImm, int)):
             elem = tvm.ir_pass.Simplify(elem)
-            if not isinstance(elem, (tvm.expr.IntImm, tvm.expr.UIntImm)):
+            if not isinstance(elem, (expr.IntImm, expr.UIntImm)):
                 ret.append(elem)
         else:
             ret.append(get_const_int(elem))

src/lang/data_layout.cc

@@ -292,7 +292,7 @@ inline Array<Expr> TransformShape(const Array<Expr>& src_shape,
   for (size_t i = 0; i < src_shape.size(); ++i) {
     Expr orig_shape = src_shape[i];
     IterVar orig_axis = src_axis[i];
-    if (orig_shape->type_key() == ir::Any().type_key()) {
+    if (orig_shape.as<ir::Any>()) {
       symbolic_var_set.insert(orig_axis->var->name_hint);
     }
     if (!LayoutAxis::Get(orig_axis).IsPrimal()) {