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

Add show_dtype support for plot_model, update related tests. #40601

Merged
merged 11 commits into from Jun 26, 2020
Merged

Add show_dtype support for plot_model, update related tests. #40601

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3833402
Cast optimizer parameters as python floats during serialization.
jonah-kohn Jun 18, 2020
86770b1
Add show_dtype param to plot_model and model_to_dot.
jonah-kohn Jun 19, 2020
fd3c95a
Include show_dtype param in plot_model tests.
jonah-kohn Jun 19, 2020
4e5c26f
Revert commit 3833402 for modular PRs
jonah-kohn Jun 19, 2020
08a99df
Implement format_dtype as intended.
jonah-kohn Jun 19, 2020
eeb6ccf
Correctly access layer attributes.
jonah-kohn Jun 19, 2020
a2100eb
Respond to linter syntax error
jonah-kohn Jun 22, 2020
9001cc1
Fit linter indentation requirements.
jonah-kohn Jun 22, 2020
1bd0148
Cast optimizer params as floats during serialization.
jonah-kohn Jun 22, 2020
fad1ae2
Revert 1bd0148 for modular PRs
jonah-kohn Jun 23, 2020
513fff7
Correct parameter syntax for vis_utils.plot_model
jonah-kohn Jun 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
29 changes: 25 additions & 4 deletions tensorflow/python/keras/utils/vis_utils.py
View file
Open in desktop
Expand Up @@ -69,6 +69,7 @@ def add_edge(dot, src, dst):
@keras_export('keras.utils.model_to_dot')
def model_to_dot(model,
show_shapes=False,
show_dtype=False,
show_layer_names=True,
rankdir='TB',
expand_nested=False,
Expand All @@ -79,6 +80,7 @@ def model_to_dot(model,
Arguments:
model: A Keras model instance.
show_shapes: whether to display shape information.
show_dtype: whether to display layer dtypes.
show_layer_names: whether to display layer names.
rankdir: `rankdir` argument passed to PyDot,
a string specifying the format of the plot:
Expand Down Expand Up @@ -150,8 +152,11 @@ def model_to_dot(model,
if isinstance(layer, wrappers.Wrapper):
if expand_nested and isinstance(layer.layer,
functional.Functional):
submodel_wrapper = model_to_dot(layer.layer, show_shapes,
show_layer_names, rankdir,
submodel_wrapper = model_to_dot(layer.layer,
show_shapes,
show_dtype,
show_layer_names,
rankdir,
expand_nested,
subgraph=True)
# sub_w : submodel_wrapper
Expand All @@ -165,8 +170,11 @@ def model_to_dot(model,
class_name = '{}({})'.format(class_name, child_class_name)

if expand_nested and isinstance(layer, functional.Functional):
submodel_not_wrapper = model_to_dot(layer, show_shapes,
show_layer_names, rankdir,
submodel_not_wrapper = model_to_dot(layer,
show_shapes,
show_dtype,
show_layer_names,
rankdir,
expand_nested,
subgraph=True)
# sub_n : submodel_not_wrapper
Expand All @@ -180,6 +188,16 @@ def model_to_dot(model,
label = '{}: {}'.format(layer_name, class_name)
else:
label = class_name

# Rebuild the label as a table including the layer's dtype.
if show_dtype:
def format_dtype(dtype):
jonah-kohn marked this conversation as resolved.
Show resolved Hide resolved
if dtype is None:
return '?'
else:
return str(dtype)

label = '%s|%s' % (label, format_dtype(layer.dtype))

# Rebuild the label as a table including input/output shapes.
if show_shapes:
Expand Down Expand Up @@ -260,6 +278,7 @@ def format_shape(shape):
def plot_model(model,
to_file='model.png',
show_shapes=False,
show_dtype=False,
show_layer_names=True,
rankdir='TB',
expand_nested=False,
Expand All @@ -286,6 +305,7 @@ def plot_model(model,
model: A Keras model instance
to_file: File name of the plot image.
show_shapes: whether to display shape information.
show_dtype: whether to display layer dtypes.
show_layer_names: whether to display layer names.
rankdir: `rankdir` argument passed to PyDot,
a string specifying the format of the plot:
Expand All @@ -300,6 +320,7 @@ def plot_model(model,
"""
dot = model_to_dot(model,
show_shapes=show_shapes,
show_dtype=show_dtype,
show_layer_names=show_layer_names,
rankdir=rankdir,
expand_nested=expand_nested,
Expand Down
12 changes: 8 additions & 4 deletions tensorflow/python/keras/utils/vis_utils_test.py
View file
Open in desktop
Expand Up @@ -36,7 +36,8 @@ def test_plot_model_cnn(self):
model.add(keras.layers.Dense(5, name='dense'))
dot_img_file = 'model_1.png'
try:
vis_utils.plot_model(model, to_file=dot_img_file, show_shapes=True)
vis_utils.plot_model(model, to_file=dot_img_file,
show_shapes=True, show_dtype=True)
self.assertTrue(file_io.file_exists(dot_img_file))
file_io.delete_file(dot_img_file)
except ImportError:
Expand All @@ -62,7 +63,8 @@ def test_plot_model_with_wrapped_layers_and_models(self):
dot_img_file = 'model_2.png'
try:
vis_utils.plot_model(
model, to_file=dot_img_file, show_shapes=True, expand_nested=True)
model, to_file=dot_img_file, show_shapes=True,
show_dtype=True, expand_nested=True)
self.assertTrue(file_io.file_exists(dot_img_file))
file_io.delete_file(dot_img_file)
except ImportError:
Expand All @@ -76,7 +78,8 @@ def test_plot_model_with_add_loss(self):
dot_img_file = 'model_3.png'
try:
vis_utils.plot_model(
model, to_file=dot_img_file, show_shapes=True, expand_nested=True)
model, to_file=dot_img_file, show_shapes=True,
show_dtype=True, expand_nested=True)
self.assertTrue(file_io.file_exists(dot_img_file))
file_io.delete_file(dot_img_file)
except ImportError:
Expand All @@ -88,7 +91,8 @@ def test_plot_model_with_add_loss(self):
dot_img_file = 'model_4.png'
try:
vis_utils.plot_model(
model, to_file=dot_img_file, show_shapes=True, expand_nested=True)
model, to_file=dot_img_file, show_shapes=True,
show_dtype=True expand_nested=True)
jonah-kohn marked this conversation as resolved.
Show resolved Hide resolved
self.assertTrue(file_io.file_exists(dot_img_file))
file_io.delete_file(dot_img_file)
except ImportError:
Expand Down