aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--tensorflow/python/layers/core.py6
-rw-r--r--tensorflow/tools/api/golden/v1/tensorflow.layers.pbtxt2
-rw-r--r--tensorflow/tools/api/golden/v2/tensorflow.layers.pbtxt2
3 files changed, 5 insertions, 5 deletions
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"