Skip to content

fix model conversion error due to TF 2.3.0 release difference #3685

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
merged 4 commits into from
Jul 29, 2020
Merged

fix model conversion error due to TF 2.3.0 release difference #3685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7d571a9
fix model conversion error due to TF 2.3.0 release difference
pyu10055 Jul 29, 2020
1b8980b
increase TF version to 2.2
pyu10055 Jul 29, 2020
dc07cc4
fix test for python2
pyu10055 Jul 29, 2020
b3d3bb4
Merge branch 'master' into fix_e2e
pyu10055 Jul 29, 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 e2e/integration_tests/convert_predict.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ def _create_saved_model_with_conv2d(save_dir):
return {
"async": False,
"inputs": {
"input_1": {"value": np.ones((1, 24, 24, 3)).tolist(),
"conv2d_input:0": {"value": np.ones((1, 24, 24, 3)).tolist(),
"shape": [1, 24, 24, 3],
"dtype": 'float32'}},
"outputs": {
Expand Down Expand Up @@ -275,7 +275,7 @@ def _create_saved_model_with_prelu(save_dir):
return {
"async": False,
"inputs": {
"input_1": {"value": np.ones((1, 24, 24, 3)).tolist(),
"conv2d_1_input": {"value": np.ones((1, 24, 24, 3)).tolist(),
"shape": [1, 24, 24, 3],
"dtype": 'float32'}},
"outputs": {
Expand Down Expand Up @@ -353,7 +353,7 @@ def _create_saved_model_v2_with_tensorlist_ops(save_dir):
"""
model = tf.keras.Sequential()
model.add(tf.keras.layers.Embedding(100, 20, input_shape=[10]))
model.add(tf.keras.layers.GRU(4, reset_after=True))
model.add(tf.keras.layers.GRU(4))

result = model.predict(tf.ones([1, 10]))

Expand Down
11 changes: 9 additions & 2 deletions tfjs-converter/python/tensorflowjs/converters/tf_saved_model_conversion_v2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,8 +348,13 @@ def _freeze_saved_model_v1(saved_model_dir, saved_model_tags,
return frozen_graph

def _freeze_saved_model_v2(concrete_func, control_flow_v2=False):
if tf.__version__ < '2.2.0':
return convert_to_constants.convert_variables_to_constants_v2(
concrete_func, lower_control_flow=not control_flow_v2).graph

return convert_to_constants.convert_variables_to_constants_v2(
concrete_func, lower_control_flow=not control_flow_v2).graph
concrete_func, lower_control_flow=not control_flow_v2,
aggressive_inlining=True).graph


def _build_signature_def(frozen_graph, input_nodes, output_nodes):
Expand Down Expand Up @@ -483,8 +488,10 @@ def convert_tf_saved_model(saved_model_dir,
except BaseException:
frozen_graph = _freeze_saved_model_v1(saved_model_dir, saved_model_tags,
output_node_names)

inputs = [x for x in concrete_func.inputs if not x.dtype == 'resource']
signature = _build_signature_def(
frozen_graph, concrete_func.inputs, concrete_func.outputs)
frozen_graph, inputs, concrete_func.outputs)

optimize_graph(frozen_graph, signature,
output_graph, model.tensorflow_version,
Expand Down