diff options
| author |  Jianwei Xie <xiejw@google.com> | 2018-03-28 14:36:18 -0700 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2018-03-28 14:38:46 -0700 |
| commit | e97c9e91e016efd951dc52e82744f607d948bb2a (patch) | |
| tree | e98e3a2aaec29758533b3c331140b464ff6ce50e /tensorflow/python/layers | |
| parent | ef6552b544b3c3bf6808be807b30dd9bd4f19669 (diff) | |
Merge changes from github.
PiperOrigin-RevId: 190835392
Diffstat (limited to 'tensorflow/python/layers')
| -rw-r--r-- | tensorflow/python/layers/convolutional.py | 2 | ||||
| -rw-r--r-- | tensorflow/python/layers/convolutional_test.py | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/tensorflow/python/layers/convolutional.py b/tensorflow/python/layers/convolutional.py index 74e7c63fb3..2d99b1688f 100644 --- a/tensorflow/python/layers/convolutional.py +++ b/tensorflow/python/layers/convolutional.py @@ -180,6 +180,8 @@ class _Conv(base.Layer): # bias_add when computing gradients. To use bias_add, we collapse Z # and Y into a single dimension to obtain a 4D input tensor. outputs_shape = outputs.shape.as_list() + if outputs_shape[0] is None: + outputs_shape[0] = -1 outputs_4d = array_ops.reshape(outputs, [outputs_shape[0], outputs_shape[1], outputs_shape[2] * outputs_shape[3], diff --git a/tensorflow/python/layers/convolutional_test.py b/tensorflow/python/layers/convolutional_test.py index 160e732b67..cdb42f5bd1 100644 --- a/tensorflow/python/layers/convolutional_test.py +++ b/tensorflow/python/layers/convolutional_test.py @@ -325,6 +325,12 @@ class ConvTest(test.TestCase): self.assertEqual(conv3d.kernel_constraint, k_constraint) self.assertEqual(conv3d.bias_constraint, b_constraint) + def testConv3DChannelsFirst(self): + # Test case for GitHub issue 15655 + images = array_ops.placeholder( + dtype=dtypes.float32, shape=[None, 1, 32, 32, 32]) + conv_layers.conv3d(images, 32, 9, data_format='channels_first') + @test_util.with_c_api class SeparableConv1DTest(test.TestCase): |