experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix build error, where nccl requires -lrt link option (#7271)

Browse Source 
* Fix build error, where nccl requires -lrt link option

* Remove config_setting defines in nccl.BUILD and curl.BUILD

* Fix typo in curl.BUILD
This commit is contained in:
LI Yi 2017-02-18 01:39:43 +08:00 committed by Vijay Vasudevan
parent 807f449bf5
commit 4c2cfa7ebb
2 changed files with 31 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
third_party/curl.BUILD vendored
View File

@ -204,13 +204,13 @@ cc_library(
"lib/wildcard.h", "lib/wildcard.h",
"lib/x509asn1.h", "lib/x509asn1.h",
] + select({ ] + select({
":darwin": [ "@//tensorflow:darwin": [
"lib/vtls/darwinssl.c", "lib/vtls/darwinssl.c",
], ],
":ios": [ "@//tensorflow:ios": [
"lib/vtls/darwinssl.c", "lib/vtls/darwinssl.c",
], ],
":windows": [ "@//tensorflow:windows": [
"lib/asyn-thread.c", "lib/asyn-thread.c",
"lib/inet_ntop.c", "lib/inet_ntop.c",
"lib/system_win32.c", "lib/system_win32.c",
@ -231,7 +231,7 @@ cc_library(
"include/curl/typecheck-gcc.h", "include/curl/typecheck-gcc.h",
], ],
copts = select({ copts = select({
":windows": [ "@//tensorflow:windows": [
"/I%prefix%/curl/lib", "/I%prefix%/curl/lib",
"/DHAVE_CONFIG_H", "/DHAVE_CONFIG_H",
"/DCURL_DISABLE_FTP", "/DCURL_DISABLE_FTP",
@ -255,10 +255,10 @@ cc_library(
"-Wno-string-plus-int", "-Wno-string-plus-int",
], ],
}) + select({ }) + select({
":darwin": [ "@//tensorflow:darwin": [
"-fno-constant-cfstrings", "-fno-constant-cfstrings",
], ],
":windows": [ "@//tensorflow:windows": [
# See curl.h for discussion of write size and Windows # See curl.h for discussion of write size and Windows
"/DCURL_MAX_WRITE_SIZE=16384", "/DCURL_MAX_WRITE_SIZE=16384",
], ],
@ -268,17 +268,17 @@ cc_library(
}), }),
includes = ["include"], includes = ["include"],
linkopts = select({ linkopts = select({
":android": [ "@//tensorflow:android": [
"-pie", "-pie",
], ],
":darwin": [ "@//tensorflow:darwin": [
"-Wl,-framework", "-Wl,-framework",
"-Wl,CoreFoundation", "-Wl,CoreFoundation",
"-Wl,-framework", "-Wl,-framework",
"-Wl,Security", "-Wl,Security",
], ],
":ios": [], "@//tensorflow:ios": [],
":windows": [ "@//tensorflow:windows": [
"ws2_32.lib", "ws2_32.lib",
], ],
"//conditions:default": [ "//conditions:default": [
@ -289,8 +289,8 @@ cc_library(
deps = [ deps = [
"@zlib_archive//:zlib", "@zlib_archive//:zlib",
] + select({ ] + select({
":ios": [], "@//tensorflow:ios": [],
":windows": [], "@//tensorflow:windows": [],
"//conditions:default": [ "//conditions:default": [
"@boringssl//:ssl", "@boringssl//:ssl",
], ],
@ -386,7 +386,7 @@ cc_binary(
"src/tool_xattr.h", "src/tool_xattr.h",
], ],
copts = select({ copts = select({
":windows": [ "@//tensorflow:windows": [
"/I%prefix%/curl/lib", "/I%prefix%/curl/lib",
"/DHAVE_CONFIG_H", "/DHAVE_CONFIG_H",
"/DCURL_DISABLE_LIBCURL_OPTION", "/DCURL_DISABLE_LIBCURL_OPTION",
@ -657,23 +657,3 @@ genrule(
"EOF", "EOF",
]), ]),
) )
config_setting(
name = "ios",
values = {"crosstool_top": "//tools/osx/crosstool:crosstool"},
)
config_setting(
name = "darwin",
values = {"cpu": "darwin"},
)
config_setting(
name = "windows",
values = {"cpu": "x64_windows_msvc"},
)
config_setting(
name = "android",
values = {"crosstool_top": "//external:android/crosstool"},
)

18
third_party/nccl.BUILD vendored
View File

@ -43,6 +43,24 @@ cc_library(
"-Iexternal/nccl_archive/src", "-Iexternal/nccl_archive/src",
"-O3", "-O3",
] + cuda_default_copts(), ] + cuda_default_copts(),
linkopts = select({
"@//tensorflow:android": [
"-pie",
],
"@//tensorflow:darwin": [
"-Wl,-framework",
"-Wl,CoreFoundation",
"-Wl,-framework",
"-Wl,Security",
],
"@//tensorflow:ios": [],
"@//tensorflow:windows": [
"ws2_32.lib",
],
"//conditions:default": [
"-lrt",
],
}),
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
deps = ["@local_config_cuda//cuda:cuda_headers"], deps = ["@local_config_cuda//cuda:cuda_headers"],
) )