Skip to content

[Relay]Frontend][Onnx] Remove pop that interferes with nested loops. #7781

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
tmoreau89 merged 3 commits into from
Apr 4, 2021
Merged

[Relay]Frontend][Onnx] Remove pop that interferes with nested loops. #7781

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fd4b884
Remove popping that interferes with nested loops.
Apr 1, 2021
289b6ca
Only check user inputs in the outer-most graph scope.
Apr 1, 2021
a765b70
Fix style.
Apr 1, 2021
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
16 changes: 10 additions & 6 deletions python/tvm/relay/frontend/onnx.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2981,6 +2981,7 @@ def __init__(self, shape, dtype, freeze_params=False):
self._num_input = 0
self._num_param = 0
self._shape = shape if shape else {}
self._input_names = []
self._dtype = dtype
self.opset = None
self._freeze_params = freeze_params
Expand Down Expand Up @@ -3062,8 +3063,9 @@ def from_onnx(self, graph, opset, get_output_expr=False):
continue
else:
self._num_input += 1
self._input_names.append(i_name)
if i_name in self._shape:
i_shape = self._shape.pop(i_name)
i_shape = self._shape[i_name]
else:
if "?" in str(i_shape):
warning_msg = (
Expand All @@ -3078,11 +3080,13 @@ def from_onnx(self, graph, opset, get_output_expr=False):
dtype = d_type
self._nodes[i_name] = new_var(i_name, shape=i_shape, dtype=dtype)
self._inputs[i_name] = self._nodes[i_name]
assert (
len(self._shape) == 0
), "User specified the shape for inputs that weren't found in the graph: " + str(
self._shape
)
# Only check user inputs in the outer-most graph scope.
if self._old_manager is None:
assert all(
[name in self._input_names for name in self._shape.keys()]
), "User specified the shape for inputs that weren't found in the graph: " + str(
self._shape
)
# get list of unsupported ops
convert_map = _get_convert_map(opset)
unsupported_ops = set()
Expand Down