diff options
| author |  Jianwei Xie <xiejw@google.com> | 2018-01-24 10:02:35 -0800 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2018-01-24 10:06:06 -0800 |
| commit | d9f93c42a50b1f1401d9c186eac0ae8dc9093c3b (patch) | |
| tree | 178d1a692f56580c266139642b5a1d0d155c477e /tensorflow/core/kernels/mkl_conv_ops.cc | |
| parent | 7b62a71e2d46c148df7d5704972f4592bc5e0f1b (diff) | |
Merge changes from github.
PiperOrigin-RevId: 183100142
Diffstat (limited to 'tensorflow/core/kernels/mkl_conv_ops.cc')
| -rw-r--r-- | tensorflow/core/kernels/mkl_conv_ops.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tensorflow/core/kernels/mkl_conv_ops.cc b/tensorflow/core/kernels/mkl_conv_ops.cc index a4e139bb54..0e77b45993 100644 --- a/tensorflow/core/kernels/mkl_conv_ops.cc +++ b/tensorflow/core/kernels/mkl_conv_ops.cc @@ -551,6 +551,13 @@ class MklConv2DOp : public OpKernel { output_mkl_shape.SetMklTensor(false); AllocateOutputSetMklShape(context, kOutputIndex_Dst, &output_tensor, src_tf_shape, output_mkl_shape); + + // MklConv2D also outputs converted filter as 2nd output of Conv2D. + filter_mkl_shape.SetMklTensor(false); + Tensor* output_filter_tensor = nullptr; + AllocateOutputSetMklShape(context, kOutputIndex_Filter, + &output_filter_tensor, + filter_tf_shape, filter_mkl_shape); return; } |