diff options
| -rw-r--r-- | tensorflow/tensorflow.bzl | 4 | ||||
| -rw-r--r-- | third_party/mkl/build_defs.bzl | 24 |
2 files changed, 12 insertions, 16 deletions
diff --git a/tensorflow/tensorflow.bzl b/tensorflow/tensorflow.bzl index 6d6e8941c5..3562a5192d 100644 --- a/tensorflow/tensorflow.bzl +++ b/tensorflow/tensorflow.bzl @@ -396,7 +396,7 @@ def tf_cc_binary( srcs = srcs + tf_binary_additional_srcs(), deps = deps + tf_binary_dynamic_kernel_deps(kernels) + if_mkl_ml( [ - "//third_party/mkl:intel_binary_blob", + clean_dep("//third_party/mkl:intel_binary_blob"), ], ), data = data + tf_binary_dynamic_kernel_dsos(kernels), @@ -734,7 +734,7 @@ def tf_cc_test( }) + linkopts + _rpath_linkopts(name), deps = deps + tf_binary_dynamic_kernel_deps(kernels) + if_mkl_ml( [ - "//third_party/mkl:intel_binary_blob", + clean_dep("//third_party/mkl:intel_binary_blob"), ], ), data = data + tf_binary_dynamic_kernel_dsos(kernels), diff --git a/third_party/mkl/build_defs.bzl b/third_party/mkl/build_defs.bzl index 06a8c3518c..9970a772fe 100644 --- a/third_party/mkl/build_defs.bzl +++ b/third_party/mkl/build_defs.bzl @@ -26,7 +26,7 @@ def if_mkl(if_true, if_false = []): a select evaluating to either if_true or if_false as appropriate. """ return select({ - "//third_party/mkl:using_mkl": if_true, + str(Label("//third_party/mkl:using_mkl")): if_true, "//conditions:default": if_false, }) @@ -42,9 +42,8 @@ def if_mkl_ml(if_true, if_false = []): a select evaluating to either if_true or if_false as appropriate. """ return select({ - "//third_party/mkl_dnn:using_mkl_dnn_only": - if_false, - "//third_party/mkl:using_mkl": if_true, + str(Label("//third_party/mkl_dnn:using_mkl_dnn_only")): if_false, + str(Label("//third_party/mkl:using_mkl")): if_true, "//conditions:default": if_false, }) @@ -59,7 +58,7 @@ def if_mkl_ml_only(if_true, if_false = []): a select evaluating to either if_true or if_false as appropriate. """ return select({ - "//third_party/mkl:using_mkl_ml_only": if_true, + str(Label("//third_party/mkl:using_mkl_ml_only")): if_true, "//conditions:default": if_false, }) @@ -76,7 +75,7 @@ def if_mkl_lnx_x64(if_true, if_false = []): a select evaluating to either if_true or if_false as appropriate. """ return select({ - "//third_party/mkl:using_mkl_lnx_x64": if_true, + str(Label("//third_party/mkl:using_mkl_lnx_x64")): if_true, "//conditions:default": if_false, }) @@ -90,16 +89,13 @@ def mkl_deps(): inclusion in the deps attribute of rules. """ return select({ - "//third_party/mkl_dnn:using_mkl_dnn_only": - ["@mkl_dnn"], - "//third_party/mkl:using_mkl_ml_only": - ["//third_party/mkl:intel_binary_blob"], - "//third_party/mkl:using_mkl": - [ + str(Label("//third_party/mkl_dnn:using_mkl_dnn_only")): ["@mkl_dnn"], + str(Label("//third_party/mkl:using_mkl_ml_only")): ["//third_party/mkl:intel_binary_blob"], + str(Label("//third_party/mkl:using_mkl")): [ "//third_party/mkl:intel_binary_blob", - "@mkl_dnn" + "@mkl_dnn", ], - "//conditions:default": [] + "//conditions:default": [], }) def _enable_local_mkl(repository_ctx): |