diff options
| author |  A. Unique TensorFlower <gardener@tensorflow.org> | 2018-09-06 14:10:09 -0700 |
|---|---|---|
| committer | TensorFlower Gardener <gardener@tensorflow.org> | 2018-09-06 14:18:52 -0700 |
| commit | 64fd29ca227707a4c6212638346a6b92885bf18a (patch) | |
| tree | 0f10f8cd8e15376e421aa66e498e7cb79f101370 | |
| parent | 44e25d98a5e947aca07f107be1c546129268732d (diff) | |
Internal change.
PiperOrigin-RevId: 211866647
| -rw-r--r-- | tensorflow/core/kernels/mkl_conv_ops.cc | 8 | ||||
| -rw-r--r-- | tensorflow/core/kernels/mkl_relu_op.cc | 1 | ||||
| -rw-r--r-- | tensorflow/core/kernels/mkl_softmax_op.cc | 1 |
3 files changed, 5 insertions, 5 deletions
diff --git a/tensorflow/core/kernels/mkl_conv_ops.cc b/tensorflow/core/kernels/mkl_conv_ops.cc index 9b10c3f3d6..184e0cb003 100644 --- a/tensorflow/core/kernels/mkl_conv_ops.cc +++ b/tensorflow/core/kernels/mkl_conv_ops.cc @@ -1083,7 +1083,7 @@ class MklConvOp : public OpKernel { #endif // Register 2D operations -#define REGISTER_MKL_CPU(T) \ +#define REGISTER_MKL_CPU_2D(T) \ REGISTER_KERNEL_BUILDER(Name("_MklConv2D") \ .Device(DEVICE_CPU) \ .TypeConstraint<T>("T") \ @@ -1100,16 +1100,16 @@ class MklConvOp : public OpKernel { .Label(mkl_op_registry::kMklOpLabel), \ MklDummyOp<CPUDevice, T>); -TF_CALL_float(REGISTER_MKL_CPU); +TF_CALL_float(REGISTER_MKL_CPU_2D); // Register 3D operations -#define REGISTER_MKL_CPU(T) \ +#define REGISTER_MKL_CPU_3D(T) \ REGISTER_KERNEL_BUILDER(Name("_MklConv3D") \ .Device(DEVICE_CPU) \ .TypeConstraint<T>("T") \ .Label(mkl_op_registry::kMklOpLabel), \ MklConvOp<CPUDevice, T, false>); -TF_CALL_float(REGISTER_MKL_CPU); +TF_CALL_float(REGISTER_MKL_CPU_3D); } // namespace tensorflow #endif // INTEL_MKL diff --git a/tensorflow/core/kernels/mkl_relu_op.cc b/tensorflow/core/kernels/mkl_relu_op.cc index f4cfc48af5..84385356e1 100644 --- a/tensorflow/core/kernels/mkl_relu_op.cc +++ b/tensorflow/core/kernels/mkl_relu_op.cc @@ -40,7 +40,6 @@ using mkldnn::memory; #include "mkl_dnn.h" #include "mkl_dnn_types.h" #endif -#include "tensorflow/core/platform/default/logging.h" #include "tensorflow/core/util/mkl_util.h" namespace tensorflow { diff --git a/tensorflow/core/kernels/mkl_softmax_op.cc b/tensorflow/core/kernels/mkl_softmax_op.cc index 04d8a1bdeb..cfab529662 100644 --- a/tensorflow/core/kernels/mkl_softmax_op.cc +++ b/tensorflow/core/kernels/mkl_softmax_op.cc @@ -88,6 +88,7 @@ class MklSoftmaxOp : public OpKernel { break; default: OP_REQUIRES_OK(context, errors::Aborted("Input dims must be <= 5 and >=1")); + return; } // Create softmax memory for src, dst: both are defined in mkl_util.h, // they are wrapper |