diff options
| author |  Michael Case <mikecase@google.com> | 2018-02-07 14:36:00 -0800 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2018-02-07 14:39:49 -0800 |
| commit | d90054e7c0f41f4bab81df0548577a73b939a87a (patch) | |
| tree | a15aea686a9d3f305e316d2a6ada0859ad8170d1 /tensorflow/core/kernels/mkl_tfconv_op.h | |
| parent | 8461760f9f6cde8ed97507484d2a879140141032 (diff) | |
Merge changes from github.
PiperOrigin-RevId: 184897758
Diffstat (limited to 'tensorflow/core/kernels/mkl_tfconv_op.h')
| -rw-r--r-- | tensorflow/core/kernels/mkl_tfconv_op.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tensorflow/core/kernels/mkl_tfconv_op.h b/tensorflow/core/kernels/mkl_tfconv_op.h index c4d5a45d3c..5fafa14b5d 100644 --- a/tensorflow/core/kernels/mkl_tfconv_op.h +++ b/tensorflow/core/kernels/mkl_tfconv_op.h @@ -35,7 +35,7 @@ limitations under the License. #include "mkl_dnn_types.h" #include "tensorflow/core/util/mkl_util.h" -#ifdef INTEL_MKL_DNN +#ifndef INTEL_MKL_ML using mkldnn::stream; #endif @@ -61,7 +61,7 @@ class MklToTfOp : public OpKernel { VLOG(1) << "MKLToTFConversion complete successfully."; } -#ifdef INTEL_MKL_DNN +#ifndef INTEL_MKL_ML static void ConvertMklToTf(OpKernel* op_kernel, OpKernelContext* context, string data_format_str, DataType op_data_type, bool has_avx512f, uint input_number) { |