message: MKL ML cleanup - softmax op
diff: @@ -15,19 +15,17 @@ limitations under the License.
  // See docs in ../ops/nn_ops.cc.
  #ifdef INTEL_MKL
  -#ifndef INTEL_MKL_ML_ONLY
  -#include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
  +#include "mkldnn.hpp"
  #include "tensorflow/core/framework/numeric_op.h"
  #include "tensorflow/core/framework/op_kernel.h"
  #include "tensorflow/core/framework/register_types.h"
  #include "tensorflow/core/framework/tensor.h"
  #include "tensorflow/core/lib/core/errors.h"
  -#include "tensorflow/core/util/tensor_format.h"
  -
  #include "tensorflow/core/util/mkl_util.h"
  +#include "tensorflow/core/util/tensor_format.h"
  +#include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
  -#include "mkldnn.hpp"
  using mkldnn::prop_kind;
  using mkldnn::softmax_forward;
  using mkldnn::stream;
  @@ -170,9 +168,9 @@ class MklSoftmaxOp : public OpKernel {
  net.push_back(softmax_fwd);
  stream(stream::kind::eager).submit(net).wait();
  } catch (mkldnn::error& e) {
  - string error_msg = "Status: " + std::to_string(e.status) +
  - ", message: " + string(e.message) + ", in file " +
  - string(__FILE__) + ":" + std::to_string(__LINE__);
  + string error_msg = "Status: " + std::to_string(e.status) + ", message: " +
  + string(e.message) + ", in file " + string(__FILE__) +
  + ":" + std::to_string(__LINE__);
  OP_REQUIRES_OK(
  context,
  errors::Aborted("Operation received an exception:", error_msg));
  @@ -192,5 +190,4 @@ TF_CALL_float(REGISTER_SOFTMAX_MKL_SUPPORTED_KERNELS_TYPES);
  } // namespace tensorflow
  -#endif // INTEL_MKL_ML_ONLY
  #endif // INTEL_MKL
  