Skip to content
This repository has been archived by the owner on Oct 13, 2021. It is now read-only.

Set axes=[0] for apply_squeeze rather than leaving unset #668

Merged
merged 5 commits into from
Dec 17, 2020
Merged

Set axes=[0] for apply_squeeze rather than leaving unset #668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bf1065c
Set axes=[0] as default for Squeeze
jiafatom Dec 17, 2020
22b8124
Set axes=[0] as default for Squeeze
jiafatom Dec 17, 2020
9ac164e
Merge branch 'squeeze_default_axes' of https://github.com/jiafatom/ke…
jiafatom Dec 17, 2020
39f029f
Merge branch 'squeeze_default_axes' of https://github.com/jiafatom/ke…
jiafatom Dec 17, 2020
d52def6
Merge branch 'squeeze_default_axes' of https://github.com/jiafatom/ke…
jiafatom Dec 17, 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
6 changes: 3 additions & 3 deletions keras2onnx/ke2onnx/lstm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ def build_output_states(scope, operator, container, output_names, bidirectional=
squeeze_names.extend(list(zip(split_names, outputs)))

for split_name, output_name in squeeze_names:
apply_squeeze(scope, split_name, output_name, container)
apply_squeeze(scope, split_name, output_name, container, axes=[0])

else:
output_state = op.return_state
Expand All @@ -234,8 +234,8 @@ def build_output_states(scope, operator, container, output_names, bidirectional=

output_h = operator.outputs[1].full_name
output_c = operator.outputs[2].full_name
apply_squeeze(scope, lstm_h, output_h, container)
apply_squeeze(scope, lstm_c, output_c, container)
apply_squeeze(scope, lstm_h, output_h, container, axes=[0])
apply_squeeze(scope, lstm_c, output_c, container, axes=[0])


def _calculate_keras_lstm_output_shapes(operator):
Expand Down
4 changes: 2 additions & 2 deletions keras2onnx/ke2onnx/simplernn.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,14 +391,14 @@ def build_output_states(scope, operator, container, output_names, bidirectional=
apply_split(scope, rnn_h, split_names, container)

for split_name, output_name in zip(split_names, output_names):
apply_squeeze(scope, split_name, output_name, container)
apply_squeeze(scope, split_name, output_name, container, axes=[0])

else:
output_state = op.return_state

if output_state:
output_h = operator.outputs[1].full_name
apply_squeeze(scope, rnn_h, output_h, container)
apply_squeeze(scope, rnn_h, output_h, container, axes=[0])


def is_time_major(op, bidirectional):
Expand Down