fix naming convention

apache · Jan 16, 2017 · 7988c28 · 7988c28
1 parent 1c1ba2a
commit 7988c28
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 10 deletions.
diff --git a/include/tvm/ir_pass.h b/include/tvm/ir_pass.h
@@ -21,8 +21,21 @@
 namespace tvm {
 namespace ir {
 
-using Halide::Internal::equal;
-using Halide::Internal::simplify;
+inline bool Equal(Expr a, Expr b) {
+  return Halide::Internal::equal(a, b);
+}
+
+inline bool Equal(Stmt a, Stmt b) {
+  return Halide::Internal::equal(a, b);
+}
+
+inline Expr Simplify(Expr a) {
+  return Halide::Internal::simplify(a);
+}
+
+inline Stmt Simplify(Stmt a) {
+  return Halide::Internal::simplify(a);
+}
 
 /*!
  * \brief Schedule s' dependent operations.

diff --git a/src/c_api/c_api_pass.cc b/src/c_api/c_api_pass.cc
@@ -17,20 +17,20 @@ TVM_REGISTER_API(_pass_Simplify)
 .set_body([](const ArgStack& args, RetValue *ret) {
     CHECK(args.at(0).type_id == kNodeHandle);
     if (dynamic_cast<Expr::ContainerType*>(args.at(0).sptr.get())) {
-      *ret = simplify(args.at(0).operator Expr());
+      *ret = Simplify(args.at(0).operator Expr());
     } else {
-      *ret = simplify(args.at(0).operator Stmt());
+      *ret = Simplify(args.at(0).operator Stmt());
     }
   });
 
-TVM_REGISTER_API(_pass_equal)
+TVM_REGISTER_API(_pass_Equal)
 .set_body([](const ArgStack& args, RetValue *ret) {
     CHECK(args.at(0).type_id == kNodeHandle);
     CHECK(args.at(1).type_id == kNodeHandle);
     if (dynamic_cast<Expr::ContainerType*>(args.at(0).sptr.get())) {
-      *ret = equal(args.at(0).operator Expr(), args.at(1).operator Expr());
+      *ret = Equal(args.at(0).operator Expr(), args.at(1).operator Expr());
     } else {
-      *ret = equal(args.at(0).operator Stmt(), args.at(1).operator Stmt());
+      *ret = Equal(args.at(0).operator Stmt(), args.at(1).operator Stmt());
     }
   });
 

diff --git a/tests/python/test_pass_basic.py b/tests/python/test_pass_basic.py
@@ -3,11 +3,11 @@
 def test_simplify():
   x = tvm.Var('x')
   e1 = tvm.ir_pass.Simplify(x + 2 + 1)
-  assert(tvm.ir_pass.equal(e1, x + 3))
+  assert(tvm.ir_pass.Equal(e1, x + 3))
   e2 = tvm.ir_pass.Simplify(x * 3 + 5 * x)
-  assert(tvm.ir_pass.equal(e2, x * 8))
+  assert(tvm.ir_pass.Equal(e2, x * 8))
   e3 = tvm.ir_pass.Simplify(x - x / 3 * 3)
-  assert(tvm.ir_pass.equal(e3, tvm.make.Mod(x, 3)))
+  assert(tvm.ir_pass.Equal(e3, tvm.make.Mod(x, 3)))
 
 
 def test_verify_ssa():