diff options
| author |  Jianwei Xie <xiejw0217@gmail.com> | 2018-03-29 11:12:41 -0700 |
|---|---|---|
| committer | Jianwei Xie <xiejw0217@gmail.com> | 2018-03-29 11:12:41 -0700 |
| commit | 4336e0c05b68c5e978a06cf4c4ae3459a64ba94d (patch) | |
| tree | 4fc3e23a853d80aeb22777165a9fc4b9c0b06a76 /third_party/mkl | |
| parent | 86868a156860877fc6e8c3393baf4942b6b7dbd4 (diff) | |
| parent | 63dffd5a3bc4e94e74cb140cbf7a68e0e5644ad6 (diff) | |
Resolve conflicts.
Diffstat (limited to 'third_party/mkl')
| -rw-r--r-- | third_party/mkl/BUILD | 11 | ||||
| -rw-r--r-- | third_party/mkl/mkl.BUILD | 6 |
2 files changed, 8 insertions, 9 deletions
diff --git a/third_party/mkl/BUILD b/third_party/mkl/BUILD index 3262562bcc..c2adf578c7 100644 --- a/third_party/mkl/BUILD +++ b/third_party/mkl/BUILD @@ -24,7 +24,6 @@ load( filegroup( name = "LICENSE", - visibility = ["//visibility:public"], srcs = ["MKL_LICENSE"] + select({ "@org_tensorflow//tensorflow:linux_x86_64": [ "@mkl_linux//:LICENSE", @@ -34,13 +33,13 @@ filegroup( ], "@org_tensorflow//tensorflow:windows": [ "@mkl_windows//:LICENSE", - ] - }) + ], + }), + visibility = ["//visibility:public"], ) cc_library( name = "intel_binary_blob", - visibility = ["//visibility:public"], deps = select({ "@org_tensorflow//tensorflow:linux_x86_64": [ @@ -54,6 +53,6 @@ cc_library( "@org_tensorflow//tensorflow:windows": [ "@mkl_windows//:mkl_headers", "@mkl_windows//:mkl_libs_windows", - ] - }) + ], + }), ) diff --git a/third_party/mkl/mkl.BUILD b/third_party/mkl/mkl.BUILD index 892221ec00..c3a71e4ff9 100644 --- a/third_party/mkl/mkl.BUILD +++ b/third_party/mkl/mkl.BUILD @@ -21,7 +21,7 @@ cc_library( name = "mkl_libs_linux", srcs = [ "lib/libiomp5.so", - "lib/libmklml_intel.so" + "lib/libmklml_intel.so", ], visibility = ["//visibility:public"], ) @@ -30,7 +30,7 @@ cc_library( name = "mkl_libs_darwin", srcs = [ "lib/libiomp5.dylib", - "lib/libmklml.dylib" + "lib/libmklml.dylib", ], visibility = ["//visibility:public"], ) @@ -39,7 +39,7 @@ cc_library( name = "mkl_libs_windows", srcs = [ "lib/libiomp5md.lib", - "lib/mklml.lib" + "lib/mklml.lib", ], visibility = ["//visibility:public"], ) |