diff options
| author |  Avijit <Avijit.Chakraborty@intel.com> | 2018-08-15 17:00:22 -0700 |
|---|---|---|
| committer | Avijit <Avijit.Chakraborty@intel.com> | 2018-08-15 17:00:22 -0700 |
| commit | bc6be507c71046dfc889a90e3949a903d5d1e6eb (patch) | |
| tree | 84557e7bb7798e3d418a619c8452aa7baf78f255 /tensorflow/BUILD | |
| parent | 9523a98466d16cf01fc76a67b489f1124cf626ac (diff) | |
| parent | d2875ea71373d05c645587a83dd870fa8a0ec070 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'tensorflow/BUILD')
| -rw-r--r-- | tensorflow/BUILD | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/tensorflow/BUILD b/tensorflow/BUILD index f3d8d558ac..e5654a5141 100644 --- a/tensorflow/BUILD +++ b/tensorflow/BUILD @@ -125,12 +125,6 @@ config_setting( ) config_setting( - name = "windows_msvc", - values = {"cpu": "x64_windows_msvc"}, - visibility = ["//visibility:public"], -) - -config_setting( name = "no_tensorflow_py_deps", define_values = {"no_tensorflow_py_deps": "true"}, visibility = ["//visibility:public"], @@ -439,14 +433,14 @@ package_group( load( "//third_party/mkl:build_defs.bzl", - "if_mkl", + "if_mkl_ml", ) filegroup( name = "intel_binary_blob", - data = if_mkl( + data = if_mkl_ml( [ - "//third_party/mkl:intel_binary_blob", + "//third_party/intel_mkl_ml", ], ), ) @@ -497,7 +491,6 @@ tf_cc_shared_object( linkopts = select({ "//tensorflow:darwin": [], "//tensorflow:windows": [], - "//tensorflow:windows_msvc": [], "//conditions:default": [ "-Wl,--version-script", # This line must be directly followed by the version_script.lds file "$(location //tensorflow:tf_framework_version_script.lds)", @@ -539,7 +532,6 @@ tf_cc_shared_object( "-Wl,-install_name,@rpath/libtensorflow.so", ], "//tensorflow:windows": [], - "//tensorflow:windows_msvc": [], "//conditions:default": [ "-z defs", "-Wl,--version-script", # This line must be directly followed by the version_script.lds file @@ -564,7 +556,6 @@ tf_cc_shared_object( "$(location //tensorflow:tf_exported_symbols.lds)", ], "//tensorflow:windows": [], - "//tensorflow:windows_msvc": [], "//conditions:default": [ "-z defs", "-Wl,--version-script", # This line must be directly followed by the version_script.lds file |