aboutsummaryrefslogtreecommitdiffhomepage
path: root/tensorflow/core/kernels/transpose_op.cc
diff options
context:
space:
mode:
authorGravatar David G. Andersen <dga@google.com>2015-12-21 13:30:41 -0800
committerGravatar Vijay Vasudevan <vrv@google.com>2015-12-21 13:30:41 -0800
commit2a0cf58431cf1de6372bb7747a7e42467d7f99e9 (patch)
treede98e01adcf3a05984534634f434065cd359f5bb /tensorflow/core/kernels/transpose_op.cc
parent69b38d3672e7c3dac7173ad8e74ffd195263914c (diff)
Allow transposing of empty tensors. (Before this change, the empty
tensors would be passed to eigen, and could result in a SIGFPE.) Change: 110580652
Diffstat (limited to 'tensorflow/core/kernels/transpose_op.cc')
-rw-r--r--tensorflow/core/kernels/transpose_op.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/tensorflow/core/kernels/transpose_op.cc b/tensorflow/core/kernels/transpose_op.cc
index 98665abb31..ad312b8e7b 100644
--- a/tensorflow/core/kernels/transpose_op.cc
+++ b/tensorflow/core/kernels/transpose_op.cc
@@ -127,6 +127,9 @@ void TransposeOp<Device, T>::Compute(OpKernelContext* context) {
Tensor* output = nullptr;
OP_REQUIRES_OK(context, context->allocate_output(0, shape, &output));
+ if (input.NumElements() == 0) {
+ return;
+ }
switch (dims) {
#define EXPAND_DIM(N) \
case N: { \