Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix super() visit function in PyExprVisitor and PyExprMutator #15189

Merged
merged 1 commit into from
Jun 30, 2023
Merged

Fix super() visit function in PyExprVisitor and PyExprMutator #15189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 28 additions & 4 deletions src/relax/ir/py_expr_functor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,12 +568,24 @@ TVM_REGISTER_GLOBAL("relax.ExprVisitorVisitBinding")

TVM_REGISTER_GLOBAL("relax.ExprVisitorVisitBindingBlock")
.set_body_typed([](PyExprVisitor visitor, const BindingBlock& block) {
visitor->ExprVisitor::VisitBindingBlock(block);
if (const auto* ptr = block.as<DataflowBlockNode>()) {
visitor->ExprVisitor::VisitBindingBlock_(ptr);
} else if (const auto* ptr = block.as<BindingBlockNode>()) {
visitor->ExprVisitor::VisitBindingBlock_(ptr);
} else {
LOG(FATAL) << "TypeError: Invalid type: " << block->GetTypeKey();
}
});

TVM_REGISTER_GLOBAL("relax.ExprVisitorVisitVarDef")
.set_body_typed([](PyExprVisitor visitor, const Var& var) {
visitor->ExprVisitor::VisitVarDef(var);
if (const auto* node = var.as<DataflowVarNode>()) {
visitor->ExprVisitor::VisitVarDef_(node);
} else if (const auto* node = var.as<VarNode>()) {
visitor->ExprVisitor::VisitVarDef_(node);
} else {
LOG(FATAL) << "TypeError: Invalid type: " << var->GetTypeKey();
}
});

TVM_REGISTER_GLOBAL("relax.ExprVisitorVisitSpan")
Expand Down Expand Up @@ -621,12 +633,24 @@ TVM_REGISTER_GLOBAL("relax.ExprMutatorVisitBinding")

TVM_REGISTER_GLOBAL("relax.ExprMutatorVisitBindingBlock")
.set_body_typed([](PyExprMutator mutator, const BindingBlock& block) {
return mutator->ExprMutator::VisitBindingBlock(block);
if (const auto* node = block.as<DataflowBlockNode>()) {
return mutator->ExprMutator::VisitBindingBlock_(node);
} else if (const auto* node = block.as<BindingBlockNode>()) {
return mutator->ExprMutator::VisitBindingBlock_(node);
} else {
LOG(FATAL) << "TypeError: Invalid type: " << block->GetTypeKey();
}
});

TVM_REGISTER_GLOBAL("relax.ExprMutatorVisitVarDef")
.set_body_typed([](PyExprMutator mutator, const Var& var) {
return mutator->ExprMutator::VisitVarDef(var);
if (const auto* node = var.as<DataflowVarNode>()) {
return mutator->ExprMutator::VisitVarDef_(node);
} else if (const auto* node = var.as<VarNode>()) {
return mutator->ExprMutator::VisitVarDef_(node);
} else {
LOG(FATAL) << "TypeError: Invalid type: " << var->GetTypeKey();
}
});

TVM_REGISTER_GLOBAL("relax.PyExprMutatorVisitExprPostOrder")
Expand Down
75 changes: 71 additions & 4 deletions tests/python/relax/test_expr_functor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,7 +678,10 @@ def visit_call_(self, op: Call) -> None:
@R.function
def dummy(x: R.Tensor((10, 10))):
lv = R.add(x, R.const(1))
return lv
with R.dataflow():
gv = lv
R.output(gv)
return gv


def test_call_visitor_super():
Expand All @@ -688,6 +691,14 @@ def __init__(self) -> None:
super().__init__()
self.log = ASTLog()

def visit_binding_block_(self, block: relax.BindingBlock) -> None:
self.log.add("BindingBlock")
super().visit_binding_block_(block)

def visit_dataflow_block_(self, block: DataflowBlock) -> None:
self.log.add("DataflowBlock")
super().visit_dataflow_block_(block)

def visit_var_binding_(self, binding: relax.VarBinding) -> None:
self.log.add("VarBinding")
super().visit_var_binding_(binding)
Expand All @@ -696,6 +707,14 @@ def visit_call_(self, op: Call) -> None:
self.log.add("InternalCall")
super().visit_call_(op) # call PyExprVisitor.visit_call_

def visit_var_def_(self, var: Var) -> None:
self.log.add("VarDef")
super().visit_var_def_(var)

def visit_dataflow_var_def_(self, var: Var) -> None:
self.log.add("DataflowVarDef")
super().visit_dataflow_var_def_(var)

def visit_var_(self, op: Var) -> None:
self.log.add("Var")

Expand All @@ -719,7 +738,23 @@ def visit_call_(self, op: Call) -> None:

lv = LeafVisitor()
lv.visit_expr(dummy)
assert str(lv.log) == "\n".join(["VarBinding", "LeafCall", "InternalCall", "Op", "Var", "Var"])
assert str(lv.log) == "\n".join(
[
"VarDef",
"BindingBlock",
"VarBinding",
"LeafCall",
"InternalCall",
"Op",
"Var",
"VarDef",
"DataflowBlock",
"VarBinding",
"Var",
"VarDef",
"Var",
]
)


def test_call_mutator_super():
Expand All @@ -729,14 +764,30 @@ def __init__(self) -> None:
super().__init__()
self.log = ASTLog()

def visit_binding_block_(self, block: relax.BindingBlock) -> None:
self.log.add("BindingBlock")
return super().visit_binding_block_(block)

def visit_dataflow_block_(self, block: DataflowBlock) -> None:
self.log.add("DataflowBlock")
return super().visit_dataflow_block_(block)

def visit_var_binding_(self, binding: relax.VarBinding) -> None:
self.log.add("VarBinding")
super().visit_var_binding_(binding)
return super().visit_var_binding_(binding)

def visit_call_(self, op: Call) -> None:
self.log.add("InternalCall")
return super().visit_call_(op) # call PyExprMutator.visit_call_

def visit_var_def_(self, var: Var) -> None:
self.log.add("VarDef")
return super().visit_var_def_(var)

def visit_dataflow_var_def_(self, var: Var) -> None:
self.log.add("DataflowVarDef")
return super().visit_dataflow_var_def_(var)

def visit_var_(self, op: Var) -> None:
self.log.add("Var")
return super().visit_var_(op) # call PyExprMutator.visit_var_
Expand All @@ -762,7 +813,23 @@ def visit_call_(self, op: Call) -> None:

lm = LeafMutator()
lm.visit_expr(dummy)
assert str(lm.log) == "\n".join(["VarBinding", "LeafCall", "InternalCall", "Op", "Var", "Var"])
assert str(lm.log) == "\n".join(
[
"VarDef",
"BindingBlock",
"VarBinding",
"LeafCall",
"InternalCall",
"Op",
"Var",
"VarDef",
"DataflowBlock",
"VarBinding",
"Var",
"VarDef",
"Var",
]
)


if __name__ == "__main__":
Expand Down