Merge pull request #57141 from penpornk/cherrypicks_GOG6L

r2.10 cherry-pick: Skip appending kernel registration to log message for oneDNN ops.
tensorflow · Aug 15, 2022 · 2590187 · 2590187
2 parents e1593b8 + a6d477a
commit 2590187
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/tensorflow/core/framework/op_kernel.cc b/tensorflow/core/framework/op_kernel.cc
@@ -1444,10 +1444,13 @@ Status FindKernelDef(
     }
 
     // Do not print kernel registrations for other devices when using _JIT
-    // devices for compilation.
-    if (!absl::StrContains(device_str, "JIT")) {
-      errors::AppendToMessage(
-          &s, ".  Registered:", KernelsRegisteredForOp(node_op));
+    // devices for compilation or for MKL ops.
+    // TODO (intel-tf) : Remove the check for MKL ops when support for
+    // block format is removed.
+    if (!absl::StrContains(device_str, "JIT") &&
+        !absl::StartsWith(node_name, "_Mkl")) {
+      errors::AppendToMessage(&s, ".  Registered:",
+                              KernelsRegisteredForOp(node_op));
     }
 
     return s;