Skip to content

Do not mutate GlobalVar's checked_type field. #2026

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

Merged
tqchen merged 2 commits into from
Oct 29, 2018
Merged

Do not mutate GlobalVar's checked_type field. #2026

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3bf18c7
Do not mutate GlobalVar's checked_type field.
jroesch Oct 29, 2018
12fd4ef
Add test case which demonstrated previous bug.
jroesch Oct 29, 2018
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
2 changes: 1 addition & 1 deletion src/relay/pass/type_infer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ class TypeInferencer::Resolver : public ExprMutator {
}

Expr VisitExpr_(const GlobalVarNode* op) final {
return AttachCheckedType(op);
return GetRef<GlobalVar>(op);
}

Expr VisitExpr_(const OpNode* op) final {
Expand Down
11 changes: 11 additions & 0 deletions tests/python/relay/test_type_infer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,16 @@ def f(x) {
assert relay.ir_pass.infer_type(f).checked_type == relay.FuncType([a], a)
assert relay.ir_pass.infer_type(fx).checked_type == a

def test_global_var_cow_issue():
env = relay.env.Environment({})
gv = relay.GlobalVar("foo")
x = relay.var('x', shape=[])
func = relay.Function([x], relay.Call(gv, [x]), relay.TensorType([], 'float32'))
env[gv] = func
# They should both point to the same global variable if global variables are
# stable across type checking.
assert gv == func.body.op

if __name__ == "__main__":
test_free_expr()
test_dual_op()
Expand All @@ -134,3 +144,4 @@ def f(x) {
test_free_expr()
test_type_args()
test_self_reference()
test_global_var_cow_issue()