Merge pull request from tensorflow/fix-cp-1.15

Fix bad cherrypick
This commit is contained in:
Mihai Maruseac 2020-12-17 14:30:07 -08:00 committed by GitHub
commit 89fe0ce9b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -185,7 +185,7 @@ class DataFormatVecPermuteOp : public OpKernel {
errors::InvalidArgument(
"Format specifier must contain H and W for 2D case"));
}
ComputeDstIndex(src_format_str, dst_format_str, input.dims(), &dst_idx);
ComputeDstIndex(input.dims(), &dst_idx);
functor::DataFormatVecPermute<Device, T>()(context->eigen_device<Device>(),
input.flat<T>(),