[Compatible] more apache/tvm#13785

awslabs · Jan 23, 2023 · 55165b6 · 55165b6
1 parent aad3d37
commit 55165b6
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 12 deletions.
diff --git a/src/impl/ir_ext.cc b/src/impl/ir_ext.cc
@@ -112,7 +112,7 @@ std::string AsText(const ObjectRef& node, bool show_meta_data) {
           }
         }
         if (expr.as<CallNode>() && Downcast<Expr>(expr)->checked_type_.defined()) {
-          auto meta = tvm::TextMetaDataContext();
+          auto meta = tvm::relay::TextMetaDataContext();
           tvm::relay::RelayTextPrinter printer(false, &meta, nullptr);
           os << " /* ty=" << printer.Print(Downcast<Expr>(expr)->checked_type()).str() << " */";
         }
@@ -123,7 +123,7 @@ std::string AsText(const ObjectRef& node, bool show_meta_data) {
         return String(os.str());
       });
 
-  std::string ret = tvm::AsText(node, show_meta_data, annotate);
+  std::string ret = tvm::relay::AsText(node, show_meta_data, annotate);
   size_t index = 0;
   while (true) {
     index = ret.find("-114514i64", index);

diff --git a/src/impl/vm/compiler.cc b/src/impl/vm/compiler.cc
@@ -11,6 +11,7 @@
 #include <tvm/ir/type_functor.h>
 #include <tvm/target/target.h>
 #include <tvm/tir/op.h>
+#include <tvm/relay/base.h>
 #include <tvm/relay/transform.h>
 #include <tvm/relay/analysis.h>
 #include <tvm/relay/attrs/memory.h>
@@ -40,6 +41,7 @@ using namespace raf::value;
 using binding::LookupBinding;
 using binding::NDArrayBinding;
 using raf::distributed::DistConfig;
+using tvm::relay::PrettyPrint;
 using tvm::relay::Shape;
 
 /*!

diff --git a/src/impl/vm/compiler.h b/src/impl/vm/compiler.h
@@ -8,7 +8,7 @@
  * \brief The RAF virtual machine compiler.
  */
 #pragma once
-#include <tvm/ir/error.h>
+#include <tvm/relay/error.h>
 #include <tvm/relay/expr_functor.h>
 #include <tvm/relay/transform.h>
 #include <memory>
@@ -45,7 +45,7 @@ struct VMCompilerContext {
   // The module context for the compilation
   IRModule module;
   // Error reporter
-  tvm::ErrorReporter err_reporter;
+  tvm::relay::ErrorReporter err_reporter;
   // Map from a unique integer to ADT constructor tag
   TagNameMap tag_index_map;
   // Map from ADT constructor tag to a unique integer

diff --git a/src/impl/vm/vm.cc b/src/impl/vm/vm.cc
@@ -61,6 +61,7 @@ using namespace raf::requests;
 using namespace raf::device_api;
 using namespace raf::stream_pool;
 using namespace raf::distributed::communicator;
+using tvm::relay::PrettyPrint;
 
 namespace utils {
 inline std::shared_ptr<Event> GetEventById(const VMContext& ctx, Index device_id, Index event_id) {

diff --git a/src/pass/fuse_tvm.cc b/src/pass/fuse_tvm.cc
@@ -643,14 +643,15 @@ class FuseMutator : private ExprMutator {
 
   // Debug function, dump the group assignment in text.
   void DebugDumpGroup(const Expr& body) {
-    std::string text = AsText(body, false, [this](const ObjectRef& expr) -> std::string {
-      auto it = gmap_.find(expr.get());
-      if (it == gmap_.end()) return "";
-      std::ostringstream os;
-      auto* group = it->second->FindRoot();
-      os << " /* group=" << group << " */";
-      return os.str();
-    });
+    std::string text =
+        tvm::relay::AsText(body, false, [this](const ObjectRef& expr) -> std::string {
+          auto it = gmap_.find(expr.get());
+          if (it == gmap_.end()) return "";
+          std::ostringstream os;
+          auto* group = it->second->FindRoot();
+          os << " /* group=" << group << " */";
+          return os.str();
+        });
     LOG(INFO) << "Dump of group info:\n" << text;
   }
 };

diff --git a/src/pass/type_infer.cc b/src/pass/type_infer.cc
@@ -27,6 +27,7 @@ namespace type_infer {
 
 using namespace raf::op;
 using namespace raf::value;
+using tvm::relay::PrettyPrint;
 
 Type Unify(const Type& src, const Type& dst);