Skip to content

Update keras_h5_conversion_test.py #3794

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 10 commits into from
Aug 15, 2020
Merged

Update keras_h5_conversion_test.py #3794

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2ed9a94
Update keras_h5_conversion_test.py
rthadur Aug 13, 2020
c752fe7
Update keras_h5_conversion_test.py
rthadur Aug 13, 2020
5b8aeea
Merge branch 'master' into rthadur-patch-4
rthadur Aug 13, 2020
8bfc36c
Merge branch 'master' into rthadur-patch-4
rthadur Aug 13, 2020
30d8ac7
Merge branch 'master' into rthadur-patch-4
rthadur Aug 14, 2020
110445e
Update keras_h5_conversion_test.py
rthadur Aug 14, 2020
de46776
Merge branch 'master' into rthadur-patch-4
rthadur Aug 14, 2020
23391ce
Merge branch 'master' into rthadur-patch-4
rthadur Aug 14, 2020
b7e3cd1
Update keras_h5_conversion_test.py
rthadur Aug 14, 2020
536490e
Update keras_h5_conversion_test.py
rthadur Aug 14, 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
11 changes: 9 additions & 2 deletions tfjs-converter/python/tensorflowjs/converters/keras_h5_conversion_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import shutil
import tempfile
import unittest
import six

import h5py
import numpy as np
Expand Down Expand Up @@ -169,7 +170,10 @@ def testConvertMergedModelFromSimpleModelNoSplitByLayer(self):
model = tf.keras.models.Model(inputs=[input_tensor], outputs=[output])
h5_path = os.path.join(self._tmp_dir, 'MyModelMerged.h5')
model.save(h5_path)
config_json = json.loads(model.to_json(), encoding='utf8')
if six.PY3:
config_json = json.loads(model.to_json())
else:
config_json = json.loads(model.to_json(), encoding='utf8')

# Load the saved weights as a JSON string.
out, groups = conversion.h5_merged_saved_model_to_tfjs_format(
Expand Down Expand Up @@ -215,7 +219,10 @@ def testConvertMergedModelFromSimpleModelSplitByLayer(self):
model = tf.keras.models.Model(inputs=[input_tensor], outputs=[output])
h5_path = os.path.join(self._tmp_dir, 'MyModelMerged.h5')
model.save(h5_path)
config_json = json.loads(model.to_json(), encoding='utf8')
if six.PY3:
config_json = json.loads(model.to_json())
else:
config_json = json.loads(model.to_json(), encoding='utf8')

# Load the saved weights as a JSON string.
out, groups = conversion.h5_merged_saved_model_to_tfjs_format(
Expand Down