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

[Relay] Fix Fuse #3035

Merged
merged 4 commits into from
Apr 17, 2019
Merged

[Relay] Fix Fuse #3035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c8d46b6
save
MarisaKirisame Apr 15, 2019
348a217
fix
MarisaKirisame Apr 17, 2019
0be345d
Merge branch 'master' into fuse
MarisaKirisame Apr 17, 2019
dd4b3a6
Update fuse_ops.cc
MarisaKirisame Apr 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/relay/pass/fuse_ops.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -865,9 +865,17 @@ class FuseMutator : private ExprMutator {
}

Expr MakeNewFunction(GraphPartitioner::Group* group, Type ret_type, Expr body) {
// If the function has no call, it is not a primitive function.
struct HasCallVisitor : ExprVisitor {
bool has_call = false;
void VisitExpr_(const CallNode* op) final {
has_call = true;
}
} visitor;
visitor(body);
const GroupInfo& ginfo = ginfo_[group];
auto func = FunctionNode::make(ginfo.params, body, ret_type, {});
func = FunctionSetAttr(func, "Primitive", tvm::Integer(1));
func = FunctionSetAttr(func, "Primitive", tvm::Integer(visitor.has_call));
return CallNode::make(func, ginfo.arguments, Attrs());
}

Expand Down
10 changes: 9 additions & 1 deletion tests/python/relay/test_backend_interpreter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,12 @@ def test_tuple_value():
np.testing.assert_allclose(tv[2].asnumpy(), 3)


def test_tuple_getitem():
two = relay.add(relay.const(1), relay.const(1))
func = relay.Function([], relay.TupleGetItem(relay.Tuple([relay.const(1), relay.const(2)]), 0))
check_eval(func, [], 1)


def test_id():
x = relay.var('x', 'float32')
ident = relay.Function([x], x)
Expand Down Expand Up @@ -223,4 +229,6 @@ def test_function_taking_adt_ref_tuple():
test_kwargs_params()
test_ref()
test_tensor_value()
test_function_taking_adt_ref_tuple()
test_tuple_value()
test_tuple_getitem()
test_function_taking_adt_ref_tuple()