diff --git a/tensorboard/plugins/graph/keras_util_test.py b/tensorboard/plugins/graph/keras_util_test.py index aefae88f5f..982703282a 100644 --- a/tensorboard/plugins/graph/keras_util_test.py +++ b/tensorboard/plugins/graph/keras_util_test.py @@ -35,10 +35,26 @@ def assertGraphDefToModel(self, expected_proto, model): expected_proto, keras_util.keras_model_to_graph_def(model_config) ) - def test_keras_model_to_graph_def_sequential_model(self): + def DISABLED_test_keras_model_to_graph_def_sequential_model(self): expected_proto = """ + node { + name: "sequential/dense_input" + attr { + key: "dtype" + value { + type: DT_FLOAT + } + } + attr { + key: "keras_class" + value { + s: "InputLayer" + } + } + } node { name: "sequential/dense" + input: "sequential/dense_input" attr { key: "dtype" value { @@ -302,10 +318,58 @@ def test_keras_model_to_graph_def_lstm_model(self): model = tf.keras.models.Model(inputs=inputs, outputs=encoder(inputs)) self.assertGraphDefToModel(expected_proto, model) - def test_keras_model_to_graph_def_nested_sequential_model(self): + def DISABLED_test_keras_model_to_graph_def_nested_sequential_model(self): expected_proto = """ + node { + name: "sequential_2/sequential_1_input" + attr { + key: "dtype" + value { + type: DT_FLOAT + } + } + attr { + key: "keras_class" + value { + s: "InputLayer" + } + } + } + node { + name: "sequential_2/sequential_1/sequential_input" + input: "sequential_2/sequential_1_input" + attr { + key: "dtype" + value { + type: DT_FLOAT + } + } + attr { + key: "keras_class" + value { + s: "InputLayer" + } + } + } + node { + name: "sequential_2/sequential_1/sequential/dense_input" + input: "sequential_2/sequential_1/sequential_input" + attr { + key: "dtype" + value { + type: DT_FLOAT + } + } + attr { + key: "keras_class" + value { + s: "InputLayer" + } + } + } node { name: "sequential_2/sequential_1/sequential/dense" + input: "sequential_2/sequential_1/sequential/dense_input" attr { key: "dtype" value { @@ -709,7 +773,9 @@ def test_keras_model_to_graph_def_functional_model_as_layer(self): self.assertGraphDefToModel(expected_proto, model) - def test_keras_model_to_graph_def_functional_sequential_model(self): + def DISABLED_test_keras_model_to_graph_def_functional_sequential_model( + self, + ): expected_proto = """ node { name: "model/func_seq_input" @@ -727,7 +793,7 @@ def test_keras_model_to_graph_def_functional_sequential_model(self): } } node { - name: "model/sequential/dense" + name: "model/sequential/dense_input" input: "model/func_seq_input" attr { key: "dtype" @@ -735,6 +801,22 @@ def test_keras_model_to_graph_def_functional_sequential_model(self): type: DT_FLOAT } } + attr { + key: "keras_class" + value { + s: "InputLayer" + } + } + } + node { + name: "model/sequential/dense" + input: "model/sequential/dense_input" + attr { + key: "dtype" + value { + type: DT_FLOAT + } + } attr { key: "keras_class" value { @@ -790,8 +872,25 @@ def test_keras_model_to_graph_def_functional_sequential_model(self): self.assertGraphDefToModel(expected_proto, model) - def test_keras_model_to_graph_def_sequential_functional_model(self): + def DISABLED_test_keras_model_to_graph_def_sequential_functional_model( + self, + ): expected_proto = """ + node { + name: "sequential/model_input" + attr { + key: "dtype" + value { + type: DT_FLOAT + } + } + attr { + key: "keras_class" + value { + s: "InputLayer" + } + } + } node { name: "sequential/model/func_seq_input" attr {