diff options
| author |  Alexandre Passos <apassos@google.com> | 2018-03-29 15:36:14 -0700 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2018-03-29 15:40:11 -0700 |
| commit | af670bdc0e61802778f61778dd1623c87f30e874 (patch) | |
| tree | 3901a69d8376ac1b0c2b0871cdf9179c227a1d90 /tensorflow/core/kernels/list_kernels.h | |
| parent | 497dab37519a1856a52e6564d8eb1d03382911c3 (diff) | |
Undisables broken list_ops_test
PiperOrigin-RevId: 190997355
Diffstat (limited to 'tensorflow/core/kernels/list_kernels.h')
| -rw-r--r-- | tensorflow/core/kernels/list_kernels.h | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/tensorflow/core/kernels/list_kernels.h b/tensorflow/core/kernels/list_kernels.h index 8af48f0a67..f3bbf3b6e3 100644 --- a/tensorflow/core/kernels/list_kernels.h +++ b/tensorflow/core/kernels/list_kernels.h @@ -160,15 +160,13 @@ class TensorListFromTensor : public OpKernel { tmp_shape.RemoveDim(0); OP_REQUIRES(c, tmp.CopyFrom(tmp, tmp_shape), errors::Unknown("Unexpected shape error.")); - if (tmp.IsAligned() || !DataTypeCanUseMemcpy(DataTypeToEnum<T>::value)) { - output_list.tensors.push_back(tmp); - } else { - Tensor aligned; - OP_REQUIRES_OK(c, c->allocate_temp(tmp.dtype(), tmp.shape(), &aligned)); - aligned.flat<T>().device(c->eigen_device<Device>()) = - tmp.unaligned_flat<T>(); - output_list.tensors.push_back(aligned); - } + // TODO(apassos) maybe not always align; but weird compiler bugs seem to + // prevent this. + Tensor aligned; + OP_REQUIRES_OK(c, c->allocate_temp(tmp.dtype(), tmp.shape(), &aligned)); + aligned.flat<T>().device(c->eigen_device<Device>()) = + tmp.unaligned_flat<T>(); + output_list.tensors.push_back(aligned); } output_tensor->scalar<Variant>()() = std::move(output_list); } |