[GitHub] [incubator-tvm] mbarrett97 commented on a change in pull request #4771: [Relay] Added Merge Composite pass

[GitBox <gi...@apache.org>]

mbarrett97 commented on a change in pull request #4771: [Relay] Added Merge Composite pass
URL: https://github.com/apache/incubator-tvm/pull/4771#discussion_r371508067
 
 

 ##########
 File path: src/relay/pass/merge_composite.cc
 ##########
 @@ -0,0 +1,192 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/*!
+ * \file src/relay/pass/merge_composite.cc
+ * \brief Merges expressions matching patterns into functions marked
+ * as 'composite'.
+ */
+
+#include <tvm/te/operation.h>
+#include <tvm/relay/analysis.h>
+#include <tvm/relay/expr_functor.h>
+#include <tvm/relay/op_attr_types.h>
+#include <tvm/relay/transform.h>
+
+namespace tvm {
+namespace relay {
+namespace merge_composite {
+
+
+class MergeCompositeWrapper : public ExprMutator {
+ public:
+  explicit MergeCompositeWrapper(const tvm::Map<std::string, Expr>& pattern_map)
+    : pattern_map_(pattern_map) {}
+
+  bool MatchPattern(const Call& pattern, const Call& root) {
+    if (!pattern->op->IsInstance<OpNode>() || !root->op->IsInstance<OpNode>())
+      return false;
+    if (pattern->op.as<OpNode>()->name != root->op.as<OpNode>()->name)
+      return false;
+    if (pattern->args.size() != root->args.size())
+      return false;
+
+    unsigned int i = 0;
+    for (const auto& arg : pattern->args) {
+      if (arg->IsInstance<CallNode>()) {
+        if (!root->args[i]->IsInstance<CallNode>())
+          return false;
+        if (!MatchPattern(Downcast<Call>(arg), Downcast<Call>(root->args[i])))
+          return false;
+      }
+      i++;
+    }
+    return true;
+  }
+
+  Expr ExtractPattern(const Var& pattern, const Expr& root,
+          Map<std::string, Array<Expr>>* var_map) {
+    if (var_map->find(pattern->name_hint()) == var_map->end()) {
+      auto free_var = VarNode::make(pattern->name_hint(), Type());
+      var_map->Set(pattern->name_hint(), Array<Expr>({free_var, root}));
+      return free_var;
+    } else {
+      return (*var_map)[pattern->name_hint()][0];
+    }
+  }
+
+  Expr ExtractPattern(const Constant& pattern, const Expr& root,
+          Map<std::string, Array<Expr>>* var_map) {
+    return root;
+  }
+
+  Expr ExtractPattern(const Call& pattern, const Call& root,
+          Map<std::string, Array<Expr>>* var_map) {
+    Expr expr;
+    Expr empty_expr;
+    if (!pattern->op->IsInstance<OpNode>() || !root->op->IsInstance<OpNode>())
+      return empty_expr;
+    if (pattern->op.as<OpNode>()->name != root->op.as<OpNode>()->name)
+      return empty_expr;
+    if (pattern->args.size() != root->args.size())
+      return empty_expr;
+
+    unsigned int i = 0;
+    Array<Expr> new_args;
+    for (const auto& arg : pattern->args) {
+      if (arg->IsInstance<CallNode>()) {
+        new_args.push_back(ExtractPattern(Downcast<Call>(arg),
+                                          Downcast<Call>(root->args[i]),
+                                          var_map));
+      }
+      if (arg->IsInstance<VarNode>()) {
+        new_args.push_back(ExtractPattern(Downcast<Var>(arg),
+                                          root->args[i],
+                                          var_map));
+      }
+      if (arg->IsInstance<ConstantNode>()) {
+        new_args.push_back(ExtractPattern(Downcast<Constant>(arg),
+                                          root->args[i],
+                                          var_map));
+      }
+      i++;
+    }
+
+    auto new_call = CallNode::make(root->op, new_args, root->attrs);
+    return new_call;
+  }
+
+  Expr VisitExpr_(const CallNode* cn) {
+    Call call = GetRef<Call>(cn);
+    if (call->op->IsInstance<FunctionNode>()) {
+      Function func = Downcast<Function>(call->op);
+      CHECK(func.defined());
+      const auto name_node = FunctionGetAttr(func, attr::kComposite).as<tir::StringImmNode>();
+      if (name_node->value != "") {
+        tvm::Array<tvm::relay::Expr> new_args;
+        for (const auto& arg : call->args) {
+          auto new_e = this->Mutate(arg);
+          new_args.push_back(new_e);
+        }
+        return CallNode::make(call->op, new_args, call->attrs);
+      }
+    }
+
+    Expr expr = ExprMutator::VisitExpr_(cn);
+    call = Downcast<Call>(expr);
+    if (!call->op->IsInstance<OpNode>())
+      return call;
+
+    Op op = Downcast<Op>(call->op);
+    CHECK(op.defined());
+    for (const auto& x : pattern_map_) {
+      Call pattern = Downcast<Call>(x.second);
+      if (Downcast<Op>(pattern->op)->name != op->name)
+        continue;
+
+      if (MatchPattern(pattern, call)) {
+        Map<std::string, Array<Expr>> args_map;
+        auto extract = ExtractPattern(pattern, call, &args_map);
+        auto free_vars = FreeVars(extract);
+        Function new_func = FunctionNode::make(free_vars, extract,
+                call->checked_type_, {}, Attrs());
+        new_func = FunctionSetAttr(new_func, attr::kComposite,
+                                   tir::StringImmNode::make(x.first));
+        new_func = FunctionSetAttr(new_func, attr::kPrimitive,
+            tvm::Integer(1));
+        Array<Expr> args;
+        for (const auto& free_var : free_vars) {
+          args.push_back(args_map[free_var->name_hint()][1]);
+        }
+        auto new_call = CallNode::make(new_func, args);
+        return new_call;
 
 Review comment:
   Yep, this is an oversight. I can fix it pretty easily to work in priority order though and shall update the PR accordingly. I'll add tests for this case.

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services