aboutsummaryrefslogtreecommitdiffhomepage
path: root/tensorflow/core/kernels/mkl_conv_ops.cc
diff options
context:
space:
mode:
Diffstat (limited to 'tensorflow/core/kernels/mkl_conv_ops.cc')
-rw-r--r--tensorflow/core/kernels/mkl_conv_ops.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/tensorflow/core/kernels/mkl_conv_ops.cc b/tensorflow/core/kernels/mkl_conv_ops.cc
index 135dd254a4..45d22556aa 100644
--- a/tensorflow/core/kernels/mkl_conv_ops.cc
+++ b/tensorflow/core/kernels/mkl_conv_ops.cc
@@ -165,8 +165,11 @@ class MklConv2DOp : public OpKernel {
// If there is nothing to compute, return.
if (out_shape.num_elements() == 0) {
- // TODO(jbobba): Verify correctness here
- // Need semantics for Null MKL tensor
+ // Nothing to do, allocate output tensor and return
+ MklShape mkl_output_mkl_shape;
+ mkl_output_mkl_shape.SetMklTensor(false);
+ AllocateOutputSetMklShape(context, 0, &output, input.shape(),
+ mkl_output_mkl_shape);
return;
}