Fix CI

apache · Nov 10, 2019 · 9a84761 · 9a84761
1 parent 93e8257
commit 9a84761
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/src/relay/backend/interpreter.cc b/src/relay/backend/interpreter.cc
@@ -26,6 +26,7 @@
 #include <tvm/relay/expr_functor.h>
 #include <tvm/relay/pattern_functor.h>
 #include <tvm/relay/interpreter.h>
+#include <tvm/relay/transform.h>
 #include <tvm/relay/analysis.h>
 #include <tvm/relay/attrs/debug.h>
 #include <tvm/relay/feature.h>
@@ -789,6 +790,14 @@ CreateInterpreter(
     Module mod,
     DLContext context,
     Target target) {
+  // eta expand to support constructors in argument position
+  transform::Sequential seq({
+    transform::EtaExpand(
+      /* expand_constructor */ true, /* expand_global_var */ false)});
+  transform::PassContext pass_ctx = transform::PassContext::Current();
+  tvm::With<transform::PassContext> ctx(pass_ctx);
+  mod = seq(mod);
+
   auto intrp = std::make_shared<Interpreter>(mod, context, target);
   auto packed = [intrp](Expr expr) {
     auto f = DetectFeature(expr);

diff --git a/src/relay/backend/vm/compiler.cc b/src/relay/backend/vm/compiler.cc
@@ -872,6 +872,7 @@ Module VMCompiler::OptimizeModule(const Module& mod, const TargetsMap& targets)
     pass_seqs.push_back(transform::Legalize());
   }
 
+  // eta expand to support constructors in argument position
   pass_seqs.push_back(transform::EtaExpand(
     /* expand_constructor */ true, /* expand_global_var */ false));
 

diff --git a/src/relay/ir/alpha_equal.cc b/src/relay/ir/alpha_equal.cc
@@ -69,7 +69,7 @@ class AlphaEqualHandler:
       }
       if (lhsm->type_definitions.size() != rhsm->type_definitions.size()) return false;
       for (const auto& p : lhsm->type_definitions) {
-        if (!rhsm->ContainGlobalVar(p.first->var->name_hint) ||
+        if (!rhsm->ContainGlobalTypeVar(p.first->var->name_hint) ||
             !Equal(p.second, rhsm->LookupDef(p.first->var->name_hint))) {
           return false;
         }