aboutsummaryrefslogtreecommitdiffhomepage
path: root/tensorflow/python
diff options
context:
space:
mode:
authorGravatar A. Unique TensorFlower <gardener@tensorflow.org>2018-10-05 16:59:39 -0700
committerGravatar TensorFlower Gardener <gardener@tensorflow.org>2018-10-05 17:03:45 -0700
commitab97f1323bd2a98d20ed82dc3ff8585481961f0d (patch)
treeb2d6dc88e109c8941fc57bc75c540a65b305b519 /tensorflow/python
parent55081a9d21ab42834ac4fb70351e3d2ee13ef78b (diff)
Automated rollback of commit d258207f1583df4faa452265b051879af6c15dac
PiperOrigin-RevId: 215989111
Diffstat (limited to 'tensorflow/python')
-rw-r--r--tensorflow/python/ops/array_ops.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/tensorflow/python/ops/array_ops.py b/tensorflow/python/ops/array_ops.py
index 4be9c532f4..e3e4d5f910 100644
--- a/tensorflow/python/ops/array_ops.py
+++ b/tensorflow/python/ops/array_ops.py
@@ -1407,8 +1407,13 @@ def transpose(a, perm=None, name="transpose", conjugate=False):
gen_array_ops.conjugate_transpose
if (conjugate and a.dtype.is_complex) else gen_array_ops.transpose)
if perm is None:
- rank = gen_array_ops.rank(a)
- perm = (rank - 1) - gen_math_ops._range(0, rank, 1)
+ a = ops.convert_to_tensor(a, name="a")
+ if not a.get_shape().ndims:
+ rank = gen_array_ops.rank(a)
+ perm = (rank - 1) - gen_math_ops._range(0, rank, 1)
+ else:
+ rank = a.get_shape().ndims
+ perm = (rank - 1) - np.arange(rank)
ret = transpose_fn(a, perm, name=name)
# NOTE(mrry): Setting the shape explicitly because
# reverse is not handled by the shape function.