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

Jump to bottom

[frontend][keras] Add support for TimeDistributed #7006

Merged
merged 20 commits into from
Jan 21, 2022
+264 −100
Merged

[frontend][keras] Add support for TimeDistributed #7006

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
0c1de75
First pass on modifying Keras importer to handle TimeDistributed
slyubomirsky Nov 26, 2020
ef6475d
Use squeeze inside TimeDistributed, add tests
slyubomirsky Dec 1, 2020
869c705
linter fixes
slyubomirsky Dec 1, 2020
1816f9a
More linting
slyubomirsky Dec 1, 2020
661a808
Even more linting
slyubomirsky Dec 1, 2020
71825e2
Fix unused argument annotations
slyubomirsky Dec 2, 2020
0a79f9a
Forgot one pylint annotation
slyubomirsky Dec 2, 2020
50d1f5c
Forgot to set up data layout in _convert_activation
slyubomirsky Dec 2, 2020
901f766
Decouple data_layout from etab
slyubomirsky Dec 8, 2020
1e9f642
Linting fix
slyubomirsky Dec 8, 2020
d50375d
Forgot to set data_layout argument
slyubomirsky Dec 8, 2020
50a3230
Missed an etab.data_format, also test_conv1d was not in the test file…
slyubomirsky Dec 8, 2020
a50848f
Rebase fixes
slyubomirsky Jan 21, 2022
dd55b40
Linting fix
slyubomirsky Jan 21, 2022
b2e0413
_convert_lambda needs a data layout argument too
slyubomirsky Jan 21, 2022
2247789
linting fix too
slyubomirsky Jan 21, 2022
ffee4a9
Lint the test file too
slyubomirsky Jan 21, 2022
a2494e1
Redundant variables
slyubomirsky Jan 21, 2022
d83d8cf
Simplify further
slyubomirsky Jan 21, 2022
8ed61ae
Another simplification
slyubomirsky Jan 21, 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
Prev Previous commit
Next Next commit
Fix unused argument annotations
  • Loading branch information
@slyubomirsky
slyubomirsky committed Jan 21, 2022
commit 71825e2bbaddd5d087a230858ee7332339c51aa5
30 changes: 15 additions & 15 deletions python/tvm/relay/frontend/keras.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ def _convert_recurrent_activation(inexpr, keras_layer):

def _convert_activation(
inexpr, keras_layer, _, input_shape=None, data_layout=None
): # pylint: disable=unused_argument
): # pylint: disable=unused-argument
if isinstance(keras_layer, str):
act_type = keras_layer
else:
Expand Down Expand Up @@ -250,7 +250,7 @@ def _convert_embedding(

def _convert_dense(
inexpr, keras_layer, etab, input_shape=None, data_layout=None
): # pylint: disable=unused_argument
): # pylint: disable=unused-argument
weightList = keras_layer.get_weights()
weight = etab.new_const(weightList[0].transpose([1, 0]))
params = {"weight": weight, "units": weightList[0].shape[1]}
Expand Down Expand Up @@ -613,7 +613,7 @@ def _convert_separable_convolution(inexpr, keras_layer, etab, input_shape=None,

def _convert_flatten(
inexpr, keras_layer, etab, input_shape=None, data_layout=None
): # pylint: disable=unused_argument
): # pylint: disable=unused-argument
_check_data_format(keras_layer)
if data_layout is None:
data_layout = etab.data_layout
Expand All @@ -626,7 +626,7 @@ def _convert_flatten(

def _convert_pooling(
inexpr, keras_layer, etab, input_shape=None, data_layout=None
): # pylint: disable=unused_argument
): # pylint: disable=unused-argument
_check_data_format(keras_layer)
if data_layout is None:
data_layout = etab.data_layout
Expand Down Expand Up @@ -725,7 +725,7 @@ def _convert_pooling3d(inexpr, keras_layer, etab, input_shape=None, data_layout=

def _convert_global_pooling3d(
inexpr, keras_layer, etab, input_shape=None, data_layout=None
): # pylint: disable=unused_argument
): # pylint: disable=unused-argument
_check_data_format(keras_layer)
if data_layout is None:
data_layout = etab.data_layout
Expand All @@ -747,7 +747,7 @@ def _convert_global_pooling3d(

def _convert_upsample(
inexpr, keras_layer, etab, input_shape=None, data_layout=None
): # pylint: disable=unused_argument
): # pylint: disable=unused-argument
_check_data_format(keras_layer)
if data_layout is None:
data_layout = etab.data_layout
Expand Down Expand Up @@ -780,7 +780,7 @@ def _convert_upsample(

def _convert_upsample3d(
inexpr, keras_layer, etab, input_shape=None, data_layout=None
): # pylint: disable=unused_argument
): # pylint: disable=unused-argument
_check_data_format(keras_layer)
if data_layout is None:
data_layout = etab.data_layout
Expand All @@ -798,7 +798,7 @@ def _convert_upsample3d(

def _convert_cropping(
inexpr, keras_layer, etab, input_shape=None, data_layout=None
): # pylint: disable=unused_argument
): # pylint: disable=unused-argument
_check_data_format(keras_layer)
crop_type = type(keras_layer).__name__
if input_shape is None:
Expand Down Expand Up @@ -857,7 +857,7 @@ def _convert_batchnorm(inexpr, keras_layer, etab, input_shape=None, data_layout=

def _convert_padding(
inexpr, keras_layer, etab, input_shape=None, data_layout=None
): # pylint: disable=unused_argument
): # pylint: disable=unused-argument
_check_data_format(keras_layer)
if data_layout is None:
data_layout = etab.data_layout
Expand Down Expand Up @@ -891,7 +891,7 @@ def _convert_padding(

def _convert_padding3d(
inexpr, keras_layer, etab, input_shape=None, data_layout=None
): # pylint: disable=unused_argument
): # pylint: disable=unused-argument
_check_data_format(keras_layer)
if data_layout is None:
data_layout = etab.data_layout
Expand Down Expand Up @@ -938,7 +938,7 @@ def _convert_padding3d(

def _convert_concat(
inexpr, keras_layer, etab, input_shape=None, data_layout=None
): # pylint: disable=unused_argument
): # pylint: disable=unused-argument
_check_data_format(keras_layer)
if input_shape is None:
input_shape = keras_layer.input_shape
Expand Down Expand Up @@ -974,7 +974,7 @@ def _convert_reshape(inexpr, keras_layer, etab, input_shape=None, data_layout=No

def _convert_lstm(
inexpr, keras_layer, etab, input_shape=None, data_layout=None
): # pylint: disable=unused_argument
): # pylint: disable=unused-argument
_check_data_format(keras_layer)
if input_shape is None:
input_shape = keras_layer.input_shape
Expand Down Expand Up @@ -1017,7 +1017,7 @@ def _convert_lstm(

def _convert_simple_rnn(
inexpr, keras_layer, etab, input_shape=None, data_layout=None
): # pylint: disable=unused_argument
): # pylint: disable=unused-argument
_check_data_format(keras_layer)
if not isinstance(inexpr, list):
buf = np.zeros((1, keras_layer.units), "float32")
Expand All @@ -1043,7 +1043,7 @@ def _convert_simple_rnn(

def _convert_gru(
inexpr, keras_layer, etab, input_shape=None, data_layout=None
): # pylint: disable=unused_argument
): # pylint: disable=unused-argument
_check_data_format(keras_layer)
if not isinstance(inexpr, list):
buf = np.zeros((1, keras_layer.units), "float32")
Expand Down Expand Up @@ -1088,7 +1088,7 @@ def _convert_gru(

def _convert_repeat_vector(
inexpr, keras_layer, etab, input_shape=None, data_layout=None
): # pylint: disable=unused_argument
): # pylint: disable=unused-argument
if input_shape is None:
input_shape = keras_layer.input_shape
input_shape = list(input_shape)
Expand Down