Skip to content

Support for different model structures #2

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 16 commits into from
May 20, 2017
Merged

Support for different model structures #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
81d7d0c
override model definition
May 15, 2017
dc9a160
removed unecessary docstrings
May 15, 2017
2891f3a
removed duplicated behaviour in load_model()
May 15, 2017
28763b7
white lines diff
May 15, 2017
7fb918c
code simplification
May 15, 2017
65c244c
pass layer class through load_model
May 15, 2017
0c345fb
default behaviour is now the same as original keras
May 15, 2017
fda2ede
put global definition in the right plcae
May 15, 2017
37d70c3
removed uncessary import
May 15, 2017
c0ff731
remove extra parameter, pass layer_class through custom_objects
May 15, 2017
791c406
code cleanup
May 19, 2017
bf847f2
removed unused import
May 19, 2017
a1f7fe3
refactored code to fallback to default Keras behaviour properly
May 19, 2017
3c5f922
reduce diff to original code
May 19, 2017
43cddbc
remove classify info from custom_objects after use
May 19, 2017
5b45baa
adressing PR comments
May 19, 2017
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
3 changes: 2 additions & 1 deletion keras/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,8 @@ def deserialize(obj):

# instantiate optimizer
training_config = f.attrs.get('training_config')
if training_config is None:
if training_config is None or ('classify' in custom_objects and custom_objects['classify']):
custom_objects.pop('classify', None)
warnings.warn('No training configuration found in save file: '
'the model was *not* compiled. Compile it manually.')
f.close()
Expand Down
7 changes: 7 additions & 0 deletions keras/utils/layer_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,13 @@ def layer_from_config(config, custom_objects=None):
if custom_objects:
get_custom_objects().update(custom_objects)

# New behaviour
if custom_objects and 'layer_class' in custom_objects:
layer_class = custom_objects['layer_class']
# Remove layer class from custom_objects as it's not needed anymore
custom_objects.pop('layer_class', None)
return layer_class.from_config(config['config'], custom_objects=custom_objects)

class_name = config['class_name']

if class_name == 'Sequential':
Expand Down