aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar A. Unique TensorFlower <gardener@tensorflow.org>2016-11-17 16:20:56 -0800
committerGravatar TensorFlower Gardener <gardener@tensorflow.org>2016-11-17 16:28:09 -0800
commitbcdb5d23ab0e30e57e8a1e4f7a74a3f69555df91 (patch)
treeb9902793e3178db994505931e8fd6636d1178530
parent928291bb860fc731692731bebc3dce832eed1531 (diff)
Automated rollback of change 139483354
Change: 139521945
-rw-r--r--tensorflow/contrib/layers/python/layers/layers.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/tensorflow/contrib/layers/python/layers/layers.py b/tensorflow/contrib/layers/python/layers/layers.py
index 6b2bdb9970..633d4f9c06 100644
--- a/tensorflow/contrib/layers/python/layers/layers.py
+++ b/tensorflow/contrib/layers/python/layers/layers.py
@@ -1296,6 +1296,9 @@ def fully_connected(inputs,
static_shape = inputs_shape.as_list()
static_shape[-1] = num_outputs
+ out_shape = array_ops.unpack(array_ops.shape(inputs))
+ out_shape[-1] = num_outputs
+
weights_shape = [num_input_units, num_outputs]
weights_collections = utils.get_variable_collections(
variables_collections, 'weights')
@@ -1307,8 +1310,6 @@ def fully_connected(inputs,
collections=weights_collections,
trainable=trainable)
if len(static_shape) > 2:
- out_shape = array_ops.unpack(array_ops.shape(inputs))
- out_shape[-1] = num_outputs
# Reshape inputs
inputs = array_ops.reshape(inputs, [-1, num_input_units])
outputs = standard_ops.matmul(inputs, weights)