From da930ea7fd16c903346ff36f5f57548dbea98bdc Mon Sep 17 00:00:00 2001 From: josephyearsley Date: Tue, 21 Aug 2018 08:17:29 +0100 Subject: Updated golden --- tensorflow/tools/api/golden/v1/tensorflow.pbtxt | 4 ---- 1 file changed, 4 deletions(-) (limited to 'tensorflow/tools') diff --git a/tensorflow/tools/api/golden/v1/tensorflow.pbtxt b/tensorflow/tools/api/golden/v1/tensorflow.pbtxt index 509ceff9df..e65ffeb12e 100644 --- a/tensorflow/tools/api/golden/v1/tensorflow.pbtxt +++ b/tensorflow/tools/api/golden/v1/tensorflow.pbtxt @@ -832,10 +832,6 @@ tf_module { name: "broadcast_static_shape" argspec: "args=[\'shape_x\', \'shape_y\'], varargs=None, keywords=None, defaults=None" } - member_method { - name: "broadcast_to" - argspec: "args=[\'input\', \'shape\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], " - } member_method { name: "case" argspec: "args=[\'pred_fn_pairs\', \'default\', \'exclusive\', \'strict\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'False\', \'case\'], " -- cgit v1.2.3 From 459accb2b7bdea542415f3a744cbe9e348f847d6 Mon Sep 17 00:00:00 2001 From: josephyearsley Date: Tue, 21 Aug 2018 21:02:13 +0100 Subject: Updated layers --- tensorflow/tools/api/golden/v1/tensorflow.layers.pbtxt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tensorflow/tools') diff --git a/tensorflow/tools/api/golden/v1/tensorflow.layers.pbtxt b/tensorflow/tools/api/golden/v1/tensorflow.layers.pbtxt index df74c32e1f..5d9ea2e5a3 100644 --- a/tensorflow/tools/api/golden/v1/tensorflow.layers.pbtxt +++ b/tensorflow/tools/api/golden/v1/tensorflow.layers.pbtxt @@ -122,7 +122,7 @@ tf_module { } member_method { name: "flatten" - argspec: "args=[\'inputs\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], " + argspec: "args=[\'inputs\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'channels_last\', \'None\'], " } member_method { name: "max_pooling1d" -- cgit v1.2.3 From a58135a6a9637db0908c88f39df22b69bafaec3d Mon Sep 17 00:00:00 2001 From: Joe Yearsley Date: Sat, 25 Aug 2018 16:04:34 +0100 Subject: Updated protobuf --- tensorflow/tools/api/golden/v1/tensorflow.pbtxt | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'tensorflow/tools') diff --git a/tensorflow/tools/api/golden/v1/tensorflow.pbtxt b/tensorflow/tools/api/golden/v1/tensorflow.pbtxt index e65ffeb12e..509ceff9df 100644 --- a/tensorflow/tools/api/golden/v1/tensorflow.pbtxt +++ b/tensorflow/tools/api/golden/v1/tensorflow.pbtxt @@ -832,6 +832,10 @@ tf_module { name: "broadcast_static_shape" argspec: "args=[\'shape_x\', \'shape_y\'], varargs=None, keywords=None, defaults=None" } + member_method { + name: "broadcast_to" + argspec: "args=[\'input\', \'shape\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], " + } member_method { name: "case" argspec: "args=[\'pred_fn_pairs\', \'default\', \'exclusive\', \'strict\', \'name\'], varargs=None, keywords=None, defaults=[\'None\', \'False\', \'False\', \'case\'], " -- cgit v1.2.3 From 8e87c649fc290c758c4240bf202de0c7f0f3a4ad Mon Sep 17 00:00:00 2001 From: Joe Yearsley Date: Sat, 29 Sep 2018 17:38:44 +0100 Subject: Updated v2 --- tensorflow/tools/api/golden/v2/tensorflow.layers.pbtxt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tensorflow/tools') diff --git a/tensorflow/tools/api/golden/v2/tensorflow.layers.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.layers.pbtxt index df74c32e1f..5fd6ba1192 100644 --- a/tensorflow/tools/api/golden/v2/tensorflow.layers.pbtxt +++ b/tensorflow/tools/api/golden/v2/tensorflow.layers.pbtxt @@ -122,8 +122,8 @@ tf_module { } member_method { name: "flatten" - argspec: "args=[\'inputs\', \'name\'], varargs=None, keywords=None, defaults=[\'None\'], " - } + argspec: "args=[\'inputs\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'channels_last\', \'None\'], " +} member_method { name: "max_pooling1d" argspec: "args=[\'inputs\', \'pool_size\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'valid\', \'channels_last\', \'None\'], " -- cgit v1.2.3 From 32059ed204ecbee7828057d23a1c1daf561c87fd Mon Sep 17 00:00:00 2001 From: Joe Yearsley Date: Sat, 29 Sep 2018 17:42:52 +0100 Subject: Update tensorflow.layers.pbtxt --- tensorflow/tools/api/golden/v2/tensorflow.layers.pbtxt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tensorflow/tools') diff --git a/tensorflow/tools/api/golden/v2/tensorflow.layers.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.layers.pbtxt index 5fd6ba1192..5d9ea2e5a3 100644 --- a/tensorflow/tools/api/golden/v2/tensorflow.layers.pbtxt +++ b/tensorflow/tools/api/golden/v2/tensorflow.layers.pbtxt @@ -122,8 +122,8 @@ tf_module { } member_method { name: "flatten" - argspec: "args=[\'inputs\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'channels_last\', \'None\'], " -} + argspec: "args=[\'inputs\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'channels_last\', \'None\'], " + } member_method { name: "max_pooling1d" argspec: "args=[\'inputs\', \'pool_size\', \'strides\', \'padding\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'valid\', \'channels_last\', \'None\'], " -- cgit v1.2.3 From 1a56a3299e904d5a3352a3a15e4cf7401f72bbc3 Mon Sep 17 00:00:00 2001 From: joe yearsley Date: Tue, 2 Oct 2018 16:33:37 +0100 Subject: Updated ordering for kwargs --- tensorflow/python/layers/core.py | 6 +++--- tensorflow/tools/api/golden/v1/tensorflow.layers.pbtxt | 2 +- tensorflow/tools/api/golden/v2/tensorflow.layers.pbtxt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'tensorflow/tools') diff --git a/tensorflow/python/layers/core.py b/tensorflow/python/layers/core.py index 5919fa543e..e06e9aba4a 100644 --- a/tensorflow/python/layers/core.py +++ b/tensorflow/python/layers/core.py @@ -292,17 +292,17 @@ class Flatten(keras_layers.Flatten, base.Layer): @tf_export('layers.flatten') -def flatten(inputs, data_format='channels_last', name=None): +def flatten(inputs, name=None, data_format='channels_last'): """Flattens an input tensor while preserving the batch axis (axis 0). Arguments: inputs: Tensor input. + name: The name of the layer (string). data_format: A string, one of `channels_last` (default) or `channels_first`. The ordering of the dimensions in the inputs. `channels_last` corresponds to inputs with shape `(batch, height, width, channels)` while `channels_first` corresponds to inputs with shape `(batch, channels, height, width)`. - name: The name of the layer (string). Returns: Reshaped tensor. @@ -319,7 +319,7 @@ def flatten(inputs, data_format='channels_last', name=None): # now `y` has shape `(None, None)` ``` """ - layer = Flatten(data_format=data_format, name=name) + layer = Flatten(name=name, data_format=data_format) return layer.apply(inputs) diff --git a/tensorflow/tools/api/golden/v1/tensorflow.layers.pbtxt b/tensorflow/tools/api/golden/v1/tensorflow.layers.pbtxt index 5d9ea2e5a3..0c24e9c7dd 100644 --- a/tensorflow/tools/api/golden/v1/tensorflow.layers.pbtxt +++ b/tensorflow/tools/api/golden/v1/tensorflow.layers.pbtxt @@ -122,7 +122,7 @@ tf_module { } member_method { name: "flatten" - argspec: "args=[\'inputs\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'channels_last\', \'None\'], " + argspec: "args=[\'inputs\', \'name\', \'data_format\'], varargs=None, keywords=None, defaults=[\'None\', \'channels_last\'], " } member_method { name: "max_pooling1d" diff --git a/tensorflow/tools/api/golden/v2/tensorflow.layers.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.layers.pbtxt index 5d9ea2e5a3..0c24e9c7dd 100644 --- a/tensorflow/tools/api/golden/v2/tensorflow.layers.pbtxt +++ b/tensorflow/tools/api/golden/v2/tensorflow.layers.pbtxt @@ -122,7 +122,7 @@ tf_module { } member_method { name: "flatten" - argspec: "args=[\'inputs\', \'data_format\', \'name\'], varargs=None, keywords=None, defaults=[\'channels_last\', \'None\'], " + argspec: "args=[\'inputs\', \'name\', \'data_format\'], varargs=None, keywords=None, defaults=[\'None\', \'channels_last\'], " } member_method { name: "max_pooling1d" -- cgit v1.2.3