Skip to content

[BugFix][TVMScript] Parser crash #13630

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
junrushao merged 3 commits into from
Dec 18, 2022
Merged

[BugFix][TVMScript] Parser crash #13630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5fec0d0
Fix the crash of parser when the old value of a var is an array but t…
Dec 16, 2022
2de1380
dispatch according to different types.
Dec 17, 2022
57d900d
fix the lint.
Dec 17, 2022
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
8 changes: 6 additions & 2 deletions python/tvm/script/parser/core/parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
from collections import defaultdict
from contextlib import contextmanager
from typing import Any, Callable, Dict, List, Optional, Set, Union
import numpy as np
from tvm._ffi.base import TVMError

from tvm.error import DiagnosticError
Expand Down Expand Up @@ -150,8 +151,11 @@ def add(self, var: str, value: Any, allow_shadowing: bool = False):
The options of whether variable shadowing allwed for this variable.
"""
# Skip if the key and value are equal to those in the var_table
if self.name2value[var] and self.name2value[var][-1] == value:
return
if self.name2value[var] and isinstance(self.name2value[var][-1], type(value)):
if isinstance(value, np.ndarray) and (self.name2value[var][-1] == value).all():
return
elif self.name2value[var][-1] == value:
return
if allow_shadowing and var in self.frames[-1].vars:
# Shadowing
self.name2value[var][-1] = value
Expand Down
15 changes: 15 additions & 0 deletions tests/python/unittest/test_tvmscript_regression.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,20 @@ def test_multi_element_array_in_outmost_namespace():
tvm.ir.assert_structural_equal(func, rt_func)


def test_different_dtype_assignment_to_var():
@T.prim_func
def test_case():
a = T.alloc_buffer((10, 10), dtype="int8")

@T.prim_func
def func_ref():
a = T.alloc_buffer([10, 10], dtype="int8")
T.evaluate(0)

tvm.ir.assert_structural_equal(test_case, func_ref)


if __name__ == "__main__":
a = numpy.zeros((10, 10), dtype="int8")
Copy link
Member

@Hzfengsy Hzfengsy Dec 16, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you move this line to line 49 (under the test_different_dtype_assignment_to_var)?

Copy link
Contributor Author

@lightzhan-intellif lightzhan-intellif Dec 16, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am very sorry that it can not in this case. If we do so, prim function can not capture the var 'a' because it is not a nonlocal variable of func test_case.

test_multi_element_array_in_outmost_namespace()
test_different_dtype_assignment_to_var()