diff options
| author |  Martin Wicke <wicke@google.com> | 2017-03-23 12:31:16 -0800 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2017-03-23 13:44:29 -0700 |
| commit | bc456e361d49d1d89a74b80060c70efb51fd7d87 (patch) | |
| tree | 825e04287f1e2d2ac098ca3f0fdd4e361aefd68c /tensorflow/python/layers/pooling.py | |
| parent | 8ca071456537e6c96ae8896c2a20b1f08b0e59d3 (diff) | |
Merge changes from github.
Change: 151046259
Diffstat (limited to 'tensorflow/python/layers/pooling.py')
| -rw-r--r-- | tensorflow/python/layers/pooling.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tensorflow/python/layers/pooling.py b/tensorflow/python/layers/pooling.py index 2601c61c47..3e40423ad6 100644 --- a/tensorflow/python/layers/pooling.py +++ b/tensorflow/python/layers/pooling.py @@ -294,7 +294,7 @@ class AveragePooling2D(_Pooling2D): data_format: A string. The ordering of the dimensions in the inputs. `channels_last` (default) and `channels_first` are supported. `channels_last` corresponds to inputs with shape - `(batch, height, channels, width)` while `channels_first` corresponds to + `(batch, height, width, channels)` while `channels_first` corresponds to inputs with shape `(batch, channels, height, width)`. name: A string, the name of the layer. """ @@ -329,7 +329,7 @@ def average_pooling2d(inputs, data_format: A string. The ordering of the dimensions in the inputs. `channels_last` (default) and `channels_first` are supported. `channels_last` corresponds to inputs with shape - `(batch, height, channels, width)` while `channels_first` corresponds to + `(batch, height, width, channels)` while `channels_first` corresponds to inputs with shape `(batch, channels, height, width)`. name: A string, the name of the layer. |