Temporary change: always link to MKL binary blob

tensorflow/BUILD

@@ -401,11 +401,10 @@ load(
 
 filegroup(
     name = "intel_binary_blob",
-    data = if_mkl_ml(
-        [
-            "//third_party/mkl:intel_binary_blob",
-        ],
-    ),
+    # XXX: always link to MKL binary blob
+    data = [
+        "//third_party/mkl:intel_binary_blob",
+    ],
 )
 
 cc_library(

tensorflow/core/kernels/BUILD

@@ -3288,9 +3288,10 @@ tf_kernel_library(
     # <prefix>*impl.h are excluded by default from the CPU build, add explicitly.
     hdrs = ["batch_matmul_op_impl.h"],
     prefix = "batch_matmul_op",
-    deps = MATH_DEPS + [":eigen_contraction_kernel"] + if_mkl_ml([
+    deps = MATH_DEPS + [":eigen_contraction_kernel"] + [
+        # XXX: always link to MKL binary blob
         "//third_party/mkl:intel_binary_blob",
-    ]),
+    ]
 )
 
 tf_kernel_library(

tensorflow/core/platform/default/build_config.bzl

@@ -741,8 +741,7 @@ def tf_additional_binary_deps():
         # core).
         "//tensorflow/core/kernels:lookup_util",
         "//tensorflow/core/util/tensor_bundle",
-    ] + if_mkl_ml(
-        [
-            "//third_party/mkl:intel_binary_blob",
-        ],
-    )
+    ] + [
+        # XXX: always link to MKL binary blob
+        "//third_party/mkl:intel_binary_blob",
+    ]

tensorflow/tensorflow.bzl

@@ -434,11 +434,9 @@ def tf_cc_binary(
         name = name,
         copts = copts,
         srcs = srcs + tf_binary_additional_srcs(),
-        deps = deps + tf_binary_dynamic_kernel_deps(kernels) + if_mkl_ml(
-            [
-                clean_dep("//third_party/mkl:intel_binary_blob"),
-            ],
-        ),
+        deps = deps + tf_binary_dynamic_kernel_deps(kernels) +
+            # XXX: always link to MKL binary blob
+            [clean_dep("//third_party/mkl:intel_binary_blob")],
         data = data + tf_binary_dynamic_kernel_dsos(kernels),
         linkopts = linkopts + _rpath_linkopts(name),
         **kwargs
@@ -780,11 +778,9 @@ def tf_cc_test(
                 "-lm",
             ],
         }) + linkopts + _rpath_linkopts(name),
-        deps = deps + tf_binary_dynamic_kernel_deps(kernels) + if_mkl_ml(
-            [
-                clean_dep("//third_party/mkl:intel_binary_blob"),
-            ],
-        ),
+        deps = deps + tf_binary_dynamic_kernel_deps(kernels) +
+            # XXX: always link to MKL binary blob
+            [clean_dep("//third_party/mkl:intel_binary_blob")],
         data = data + tf_binary_dynamic_kernel_dsos(kernels),
         exec_compatible_with = tf_exec_compatible_with(kwargs),
         # Nested select() statements seem not to be supported when passed to

tensorflow/tools/pip_package/BUILD

@@ -253,7 +253,9 @@ sh_binary(
                "//conditions:default": [
                    ":simple_console",
                ],
-           }) + if_mkl_ml(["//third_party/mkl:intel_binary_blob"]),
+           }) +
+           # XXX: always link to MKL binary blob
+           [ "//third_party/mkl:intel_binary_blob"],
 )
 
 # A genrule for generating a marker file for the pip package on Windows

third_party/mkl/build_defs.bzl

@@ -106,7 +106,14 @@ def mkl_deps():
       inclusion in the deps attribute of rules.
     """
     return select({
-        str(Label("//third_party/mkl_dnn:build_with_mkl_dnn_only")): ["@mkl_dnn"],
+        # XXX: Temporary change: link to binary MKL unless TF threading is
+        # enabled. Rationale: the binary blob contains libiomp5 -- the Intel
+        # Compiler OpenMP runtime -- that can be used in place of libgomp
+        # which is slow.
+        str(Label("//third_party/mkl_dnn:build_with_mkl_dnn_only")): [
+            "//third_party/mkl:intel_binary_blob",
+            "@mkl_dnn",
+        ],
         str(Label("//third_party/mkl:build_with_mkl_ml_only")): ["//third_party/mkl:intel_binary_blob"],
         str(Label("//third_party/mkl:build_with_mkl")): [
             "//third_party/mkl:intel_binary_blob",