From 7c41531635ac68461a3d663840a11480d7435dbc Mon Sep 17 00:00:00 2001
From: "ag.ramesh" <ag.ramesh@intel.com>
Date: Thu, 5 Nov 2020 07:24:15 -0800
Subject: [PATCH] Prevent unnecessary copies of oneDNN in .so files.
---
tensorflow/core/BUILD | 3 +--
tensorflow/core/grappler/optimizers/BUILD | 6 +-----
tensorflow/core/util/BUILD | 6 +-----
tensorflow/tensorflow.bzl | 5 ++---
4 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD
index 361c0010068..6b0c0b86b8c 100644
--- a/tensorflow/core/BUILD
+++ b/tensorflow/core/BUILD
@@ -127,7 +127,6 @@ load("@local_config_tensorrt//:build_defs.bzl", "if_tensorrt")
load(
"//third_party/mkl:build_defs.bzl",
"if_mkl",
- "mkl_deps",
)
package(
@@ -1679,7 +1678,7 @@ tf_cuda_library(
] + if_static(
extra_deps = ["@com_google_protobuf//:protobuf"],
otherwise = ["@com_google_protobuf//:protobuf_headers"],
- ) + mkl_deps(),
+ ),
alwayslink = 1,
)
diff --git a/tensorflow/core/grappler/optimizers/BUILD b/tensorflow/core/grappler/optimizers/BUILD
index a1af69354e4..03e49016d7c 100644
--- a/tensorflow/core/grappler/optimizers/BUILD
+++ b/tensorflow/core/grappler/optimizers/BUILD
@@ -12,10 +12,6 @@ load(
"//tensorflow/core/platform:build_config_root.bzl",
"if_static",
)
-load(
- "//third_party/mkl:build_defs.bzl",
- "mkl_deps",
-)
package(
licenses = ["notice"], # Apache 2.0
@@ -638,7 +634,7 @@ cc_library(
"//tensorflow/core/grappler/costs:virtual_placer",
"@com_google_absl//absl/container:flat_hash_map",
"@com_google_absl//absl/container:flat_hash_set",
- ] + mkl_deps(),
+ ],
)
tf_cuda_cc_test(
diff --git a/tensorflow/core/util/BUILD b/tensorflow/core/util/BUILD
index e8179d33d7e..807d24bbbb9 100644
--- a/tensorflow/core/util/BUILD
+++ b/tensorflow/core/util/BUILD
@@ -25,10 +25,6 @@ load("//tensorflow:tensorflow.bzl", "get_compatible_with_portable")
# buildifier: disable=same-origin-load
load("//tensorflow:tensorflow.bzl", "tf_version_info_genrule")
-load(
- "//third_party/mkl:build_defs.bzl",
- "mkl_deps",
-)
load(
"//tensorflow/core/platform:build_config_root.bzl",
"if_static",
@@ -710,7 +706,7 @@ tf_cuda_only_cc_test(
"//tensorflow/core:test",
"//tensorflow/core:test_main",
"//third_party/eigen3",
- ] + mkl_deps(),
+ ],
)
tf_cc_tests(
diff --git a/tensorflow/tensorflow.bzl b/tensorflow/tensorflow.bzl
index 972e6a41c05..5201c41f7c5 100644
--- a/tensorflow/tensorflow.bzl
+++ b/tensorflow/tensorflow.bzl
@@ -39,7 +39,6 @@ load(
"if_enable_mkl",
"if_mkl",
"if_mkl_ml",
- "mkl_deps",
)
load(
"//third_party/mkl_dnn:build_defs.bzl",
@@ -1241,7 +1240,7 @@ def tf_cc_test_mkl(
"-lm",
],
}) + _rpath_linkopts(src_to_test_name(src)),
- deps = deps + tf_binary_dynamic_kernel_deps(kernels) + mkl_deps(),
+ deps = deps + tf_binary_dynamic_kernel_deps(kernels) + if_mkl_ml(["//third_party/mkl:intel_binary_blob"]),
data = data + tf_binary_dynamic_kernel_dsos(),
exec_properties = tf_exec_properties({"tags": tags}),
linkstatic = linkstatic,
@@ -2638,7 +2637,7 @@ def tf_python_pybind_extension(
features = features,
copts = copts,
hdrs = hdrs,
- deps = deps + tf_binary_pybind_deps() + mkl_deps(),
+ deps = deps + tf_binary_pybind_deps() + if_mkl_ml(["//third_party/mkl:intel_binary_blob"]),
defines = defines,
visibility = visibility,
link_in_framework = True,