revert change

include/tvm/relay/pass.h

@@ -154,11 +154,10 @@ Expr FoldConstant(const Expr& expr);
 /*!
  * \brief Fuse operations into expr into seperate functions.
  * \param expr The expression.
- * \param mod The global module.
  * \param fuse_opt_level Optimization level.
  * \return The optimized expression.
  */
-Expr FuseOps(const Expr& expr, const Module& mod, int fuse_opt_level);
+Expr FuseOps(const Expr& expr, int fuse_opt_level);
 
 /*!
  * \brief Apply rewrite rules to rewrite the expr in post DFS order.

python/tvm/relay/backend/interpreter.py

@@ -218,7 +218,7 @@ def optimize(self, expr):
         """
         # TODO: We need to move this optimization code into the optimizer/pass manager
         ck_expr = ir_pass.infer_type(expr, mod=self.mod)
-        fused_expr = ir_pass.fuse_ops(ck_expr, mod=self.mod)
+        fused_expr = ir_pass.fuse_ops(ck_expr)
         ck_fused = ir_pass.infer_type(fused_expr, mod=self.mod)
         return ck_fused
 

python/tvm/relay/build_module.py

@@ -234,7 +234,7 @@ def build(func,
         func = optimize(func, target, params)
         # Fuse ops before running code gen
         func = ir_pass.infer_type(func)
-        func = ir_pass.fuse_ops(func, mod=None, opt_level=cfg.opt_level)
+        func = ir_pass.fuse_ops(func, cfg.opt_level)
         # Graph code generation
         func = ir_pass.infer_type(func)
         graph_gen = _graph_gen.GraphRuntimeCodegen(mod=None, target=target)

python/tvm/relay/ir_pass.py

@@ -305,17 +305,14 @@ def fold_constant(expr):
     return _ir_pass.FoldConstant(expr)
 
 
-def fuse_ops(expr, mod=None, opt_level=1):
+def fuse_ops(expr, opt_level=1):
     """Fuse operators in expr together.
 
     Parameters
     ----------
     expr : tvm.relay.Expr
         The input expression.
 
-    mod : Optional[tvm.relay.Module]
-        The global module.
-
     opt_level : int
         The level of fuse optimization.
 
@@ -324,7 +321,7 @@ def fuse_ops(expr, mod=None, opt_level=1):
     transformed_expr : tvm.relay.Expr
         Transformed expression, containing fused result.
     """
-    return _ir_pass.FuseOps(expr, mod, opt_level)
+    return _ir_pass.FuseOps(expr, opt_level)
 
 
 def combine_parallel_conv2d(expr):

src/relay/pass/fold_constant.cc

@@ -128,7 +128,7 @@ class ConstantFolder : public ExprMutator {
   // Constant evaluate a expression.
   Expr ConstEvaluate(Expr expr) {
     expr = InferType(expr, Module(nullptr));
-    expr = FuseOps(expr, Module(nullptr), 0);
+    expr = FuseOps(expr, 0);
     expr = InferType(expr, Module(nullptr));
     return ValueToExpr(executor_(expr));
   }

src/relay/pass/fuse_ops.cc

@@ -650,8 +650,6 @@ GraphPartitioner::Partition(const IndexedForwardGraph& graph) {
   return std::move(groups_);
 }
 
-Expr FuseOps(const Expr& expr, const Module& m, int fuse_opt_level, std::set<GlobalVar>* gv);
-
 class FuseMutator : private ExprMutator {
  public:
   // Run the transform
@@ -669,13 +667,8 @@ class FuseMutator : private ExprMutator {
     return this->Mutate(body);
   }
 
-  FuseMutator(const Module& mod, int fuse_opt_level, std::set<GlobalVar>* visited) :
-    mod_(mod), fuse_opt_level_(fuse_opt_level), visited_(visited) { }
 
  private:
-  Module mod_;
-  int fuse_opt_level_;
-  std::set<GlobalVar>* visited_;
   /*! \brief Temporary information from each group. */
   struct GroupInfo {
    public:
@@ -758,16 +751,6 @@ class FuseMutator : private ExprMutator {
     return new_tuple;
   }
 
-  Expr VisitExpr_(const GlobalVarNode* node) {
-    GlobalVar gv = GetRef<GlobalVar>(node);
-    if (visited_->count(gv) == 0) {
-      visited_->insert(gv);
-      mod_->Update(gv,
-                   Downcast<Function>(FuseOps(mod_->Lookup(gv), mod_, fuse_opt_level_, visited_)));
-    }
-    return gv;
-  }
-
   Expr MakeNewFunction(GraphPartitioner::Group* group, Type ret_type, Expr body) {
     const GroupInfo& ginfo = ginfo_[group];
     auto func = FunctionNode::make(ginfo.params, body, ret_type, {});
@@ -807,22 +790,17 @@ class FuseMutator : private ExprMutator {
 };
 
 
-Expr FuseOps(const Expr& expr, const Module& m, int fuse_opt_level) {
-  std::set<GlobalVar> gv;
-  return FuseOps(expr, m, fuse_opt_level, &gv);
-}
-
-Expr FuseOps(const Expr& expr, const Module& m, int fuse_opt_level, std::set<GlobalVar>* gv) {
+Expr FuseOps(const Expr& expr, int fuse_opt_level) {
   // First we convert all chains of fusable ops into
   // abstracted functions which we mark as primtive
   // then we convert these primtive functions into
   // new operators.
-  return FuseMutator(m, fuse_opt_level, gv).Transform(expr, fuse_opt_level);
+  return FuseMutator().Transform(expr, fuse_opt_level);
 }
 
 TVM_REGISTER_API("relay._ir_pass.FuseOps")
 .set_body([](TVMArgs args, TVMRetValue *ret) {
-    *ret = FuseOps(args[0], args[1], args[2]);
+    *ret = FuseOps(args[0], args[1]);
 });
 }  // namespace relay
 }  // namespace tvm