diff options
| author |  TensorFlower Gardener <gardener@tensorflow.org> | 2018-10-04 16:31:03 -0700 |
|---|---|---|
| committer | TensorFlower Gardener <gardener@tensorflow.org> | 2018-10-04 16:31:03 -0700 |
| commit | 863f61412fcc654840c6b67473b742ea4e5e964e (patch) | |
| tree | 4d763feafd72a13b1f4b05db0e05351f4aa87938 /tensorflow/python/ops | |
| parent | cf8e7cf89abb4a7783b9a99f17574ea128fa767a (diff) | |
| parent | 864e290d1776895d7877777b8368ca8bc6fc22a3 (diff) | |
Merge pull request #21945 from efagerho:master
PiperOrigin-RevId: 215824410
Diffstat (limited to 'tensorflow/python/ops')
| -rw-r--r-- | tensorflow/python/ops/array_ops.py | 9 |
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. |