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

Skip PushTranspose when broadcast has two un-init inputs #144

Merged
merged 3 commits into from
Sep 4, 2020
Merged

Skip PushTranspose when broadcast has two un-init inputs #144

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
f2ef1a6
Remove broadcast
jiafatom Sep 4, 2020
69156a7
Remove broadcast
jiafatom Sep 4, 2020
181d3a7
Merge branch 'broadcast_two' of https://github.com/jiafatom/onnxconve…
jiafatom Sep 4, 2020
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
13 changes: 1 addition & 12 deletions onnxconverter_common/optimizer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1071,7 +1071,7 @@ def _check_transpose_pass_broadcast(node, node_transpose_pass_name, cur_perm_map
if prev.origin is not None or len(prev.tensors) == 0:
can_process = False
break
elif prev.origin.op_type not in _broadcast_flip_whitelist:
else:
can_process = False
break
return can_process
Expand All @@ -1097,17 +1097,6 @@ def _process_transpose_pass_broadcast(node, node_list, node_transpose_pass_name,
if prev.origin is None:
init_pred_value = numpy_helper.to_array(prev.tensors[0])
_update_broadcast_from_initializers(node, init_pred_value, cur_perm, add_transpose_idx_)
elif prev.origin.op_type in _broadcast_flip_whitelist:
nnode = LinkedNode(
helper.make_node(
'Transpose',
['push_transpose_in_' + str(PushTransposeSolution.transpose_number)],
['push_transpose_out_' + str(PushTransposeSolution.transpose_number)],
perm=_get_reverse_perm(cur_perm),
name='PushTranspose_' + str(PushTransposeSolution.transpose_number)))
PushTransposeSolution.transpose_number += 1
node_list = Solution.add_siso_node(node_list, prev, node, list(prev.output.values())[0], nnode)

return node_list, cur_perm_map


Expand Down
2 changes: 1 addition & 1 deletion tests/test_opt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ def test_merge_common(self):
def test_onnx_models(self):
model_names = ['mobile_segnet_no_opt.onnx', 'srgan_no_opt.onnx', 'test_model_0_no_opt.onnx',
'test_model_1_no_opt.onnx']
num_transpose_list = [2, 3, 11, 5]
num_transpose_list = [2, 3, 11, 6]
dir_path = os.path.dirname(os.path.realpath(__file__))
for idx_, model_name_ in enumerate(model_names):
model_dir = dir_path + '/data/' + model_name_
Expand Down