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

Remove all references of windows_msvc config_setting

Browse Source
This commit is contained in:
Loo Rong Jie 2018-07-11 20:24:10 +08:00
parent 36032a2dfd
commit bdd8bf316e
19 changed files with 4 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tensorflow/BUILD
View File

@ -115,12 +115,6 @@ config_setting(
visibility = ["//visibility:public"],
)
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"},
@ -484,7 +478,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)",
@ -526,7 +519,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
@ -551,7 +543,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

1
tensorflow/cc/BUILD
View File

@ -595,7 +595,6 @@ tf_cc_binary(
copts = tf_copts(),
linkopts = select({
"//tensorflow:windows": [],
"//tensorflow:windows_msvc": [],
"//tensorflow:darwin": [
"-lm",
"-lpthread",

6
tensorflow/core/BUILD
View File

@ -861,7 +861,6 @@ tf_cuda_library(
"util/work_sharder.h",
] + select({
"//tensorflow:windows": [],
"//tensorflow:windows_msvc": [],
"//conditions:default": [
"util/memmapped_file_system.h",
"util/memmapped_file_system_writer.h",
@ -2025,7 +2024,6 @@ cc_library(
linkopts = select({
"//tensorflow:freebsd": [],
"//tensorflow:windows": [],
"//tensorflow:windows_msvc": [],
"//conditions:default": [
"-ldl",
"-lpthread",
@ -2114,7 +2112,6 @@ cc_library(
linkopts = select({
"//tensorflow:freebsd": [],
"//tensorflow:windows": [],
"//tensorflow:windows_msvc": [],
"//conditions:default": ["-ldl"],
}),
deps = [
@ -2139,7 +2136,6 @@ cc_library(
linkopts = select({
"//tensorflow:freebsd": [],
"//tensorflow:windows": [],
"//tensorflow:windows_msvc": [],
"//conditions:default": ["-ldl"],
}),
deps = [
@ -2471,7 +2467,6 @@ tf_cuda_library(
],
) + select({
"//tensorflow:windows": [],
"//tensorflow:windows_msvc": [],
"//conditions:default": [
"util/memmapped_file_system.cc",
"util/memmapped_file_system_writer.cc",
@ -2482,7 +2477,6 @@ tf_cuda_library(
linkopts = select({
"//tensorflow:freebsd": ["-lm"],
"//tensorflow:windows": [],
"//tensorflow:windows_msvc": [],
"//conditions:default": ["-ldl", "-lm"],
}),
deps = [

3
tensorflow/core/platform/default/build_config.bzl
View File

@ -467,7 +467,6 @@ def tf_platform_srcs(files):
return select({
"//tensorflow:windows" : native.glob(windows_set),
"//tensorflow:windows_msvc" : native.glob(windows_set),
"//conditions:default" : native.glob(posix_set),
})
@ -479,7 +478,6 @@ def tf_additional_lib_hdrs(exclude = []):
], exclude = exclude)
return select({
"//tensorflow:windows" : windows_hdrs,
"//tensorflow:windows_msvc" : windows_hdrs,
"//conditions:default" : native.glob([
"platform/default/*.h",
"platform/posix/*.h",
@ -494,7 +492,6 @@ def tf_additional_lib_srcs(exclude = []):
], exclude = exclude)
return select({
"//tensorflow:windows" : windows_srcs,
"//tensorflow:windows_msvc" : windows_srcs,
"//conditions:default" : native.glob([
"platform/default/*.cc",
"platform/posix/*.cc",

1
tensorflow/java/BUILD
View File

@ -345,7 +345,6 @@ tf_cc_binary(
"$(location {})".format(LINKER_EXPORTED_SYMBOLS),
],
"//tensorflow:windows": [],
"//tensorflow:windows_msvc": [],
"//conditions:default": [
"-z defs",
"-s",

9
tensorflow/tensorflow.bzl
View File

@ -137,14 +137,12 @@ def if_not_mobile(a):
def if_not_windows(a):
return select({
clean_dep("//tensorflow:windows"): [],
clean_dep("//tensorflow:windows_msvc"): [],
"//conditions:default": a,
})
def if_windows(a):
return select({
clean_dep("//tensorflow:windows"): a,
clean_dep("//tensorflow:windows_msvc"): a,
"//conditions:default": [],
})
@ -226,7 +224,6 @@ def tf_copts(android_optimization_level_override="-O2", is_external=False):
clean_dep("//tensorflow:android"): android_copts,
clean_dep("//tensorflow:darwin"): [],
clean_dep("//tensorflow:windows"): get_win_copts(is_external),
clean_dep("//tensorflow:windows_msvc"): get_win_copts(is_external),
clean_dep("//tensorflow:ios"): ["-std=c++11"],
"//conditions:default": ["-pthread"]
}))
@ -286,7 +283,6 @@ def _rpath_linkopts(name):
"-Wl,%s" % (_make_search_paths("@loader_path", levels_to_root),),
],
clean_dep("//tensorflow:windows"): [],
clean_dep("//tensorflow:windows_msvc"): [],
"//conditions:default": [
"-Wl,%s" % (_make_search_paths("$$ORIGIN", levels_to_root),),
],
@ -656,7 +652,6 @@ def tf_cc_test(name,
"-pie",
],
clean_dep("//tensorflow:windows"): [],
clean_dep("//tensorflow:windows_msvc"): [],
clean_dep("//tensorflow:darwin"): [
"-lm",
],
@ -838,7 +833,6 @@ def tf_cc_test_mkl(srcs,
"-pie",
],
clean_dep("//tensorflow:windows"): [],
clean_dep("//tensorflow:windows_msvc"): [],
"//conditions:default": [
"-lpthread",
"-lm"
@ -1351,7 +1345,6 @@ def tf_custom_op_library(name, srcs=[], gpu_srcs=[], deps=[], linkopts=[]):
"-lm",
],
clean_dep("//tensorflow:windows"): [],
clean_dep("//tensorflow:windows_msvc"): [],
clean_dep("//tensorflow:darwin"): [],
}),)
@ -1461,7 +1454,6 @@ def tf_py_wrap_cc(name,
"$(location %s.lds)"%vscriptname,
],
clean_dep("//tensorflow:windows"): [],
clean_dep("//tensorflow:windows_msvc"): [],
"//conditions:default": [
"-Wl,--version-script",
"$(location %s.lds)"%vscriptname,
@ -1472,7 +1464,6 @@ def tf_py_wrap_cc(name,
"%s.lds"%vscriptname,
],
clean_dep("//tensorflow:windows"): [],
clean_dep("//tensorflow:windows_msvc"): [],
"//conditions:default": [
"%s.lds"%vscriptname,
]

1
tensorflow/tools/pip_package/BUILD
View File

@ -176,7 +176,6 @@ sh_binary(
srcs = ["build_pip_package.sh"],
data = select({
"//tensorflow:windows": [":simple_console_for_windows"],
"//tensorflow:windows_msvc": [":simple_console_for_windows"],
"//conditions:default": COMMON_PIP_DEPS + [
":simple_console",
"//tensorflow/contrib/lite/python:interpreter_test_data",

1
tensorflow/tools/proto_text/BUILD
View File

@ -49,7 +49,6 @@ cc_library(
copts = if_ios(["-DGOOGLE_LOGGING"]),
linkopts = select({
"//tensorflow:windows": [],
"//tensorflow:windows_msvc": [],
"//tensorflow:darwin": [
"-lm",
"-lpthread",

14
third_party/curl.BUILD vendored
View File

@ -243,7 +243,6 @@ cc_library(
"lib/vtls/darwinssl.c",
],
"@org_tensorflow//tensorflow:windows": CURL_WIN_SRCS,
"@org_tensorflow//tensorflow:windows_msvc": CURL_WIN_SRCS,
"//conditions:default": [
"lib/vtls/openssl.c",
],
@ -260,7 +259,6 @@ cc_library(
],
copts = select({
"@org_tensorflow//tensorflow:windows": CURL_WIN_COPTS,
"@org_tensorflow//tensorflow:windows_msvc": CURL_WIN_COPTS,
"//conditions:default": [
"-Iexternal/curl/lib",
"-D_GNU_SOURCE",
@ -280,10 +278,6 @@ cc_library(
# See curl.h for discussion of write size and Windows
"/DCURL_MAX_WRITE_SIZE=16384",
],
"@org_tensorflow//tensorflow:windows_msvc": [
# See curl.h for discussion of write size and Windows
"/DCURL_MAX_WRITE_SIZE=16384",
],
"//conditions:default": [
"-DCURL_MAX_WRITE_SIZE=65536",
],
@ -307,12 +301,6 @@ cc_library(
"-DEFAULTLIB:crypt32.lib",
"-DEFAULTLIB:Normaliz.lib",
],
"@org_tensorflow//tensorflow:windows_msvc": [
"-DEFAULTLIB:ws2_32.lib",
"-DEFAULTLIB:advapi32.lib",
"-DEFAULTLIB:crypt32.lib",
"-DEFAULTLIB:Normaliz.lib",
],
"//conditions:default": [
"-lrt",
],
@ -323,7 +311,6 @@ cc_library(
] + select({
"@org_tensorflow//tensorflow:ios": [],
"@org_tensorflow//tensorflow:windows": [],
"@org_tensorflow//tensorflow:windows_msvc": [],
"//conditions:default": [
"@boringssl//:ssl",
],
@ -426,7 +413,6 @@ cc_binary(
],
copts = select({
"@org_tensorflow//tensorflow:windows": CURL_BIN_WIN_COPTS,
"@org_tensorflow//tensorflow:windows_msvc": CURL_BIN_WIN_COPTS,
"//conditions:default": [
"-Iexternal/curl/lib",
"-D_GNU_SOURCE",

8
third_party/farmhash.BUILD vendored
View File

@ -2,13 +2,6 @@ licenses(["notice"]) # MIT
exports_files(["COPYING"])
config_setting(
name = "windows_msvc",
values = {
"cpu": "x64_windows_msvc",
},
)
config_setting(
name = "windows",
values = {
@ -23,7 +16,6 @@ cc_library(
# Disable __builtin_expect support on Windows
copts = select({
":windows": ["/DFARMHASH_OPTIONAL_BUILTIN_EXPECT"],
":windows_msvc": ["/DFARMHASH_OPTIONAL_BUILTIN_EXPECT"],
"//conditions:default": [],
}),
includes = ["src/."],

3
third_party/flatbuffers/flatbuffers.BUILD vendored
View File

@ -18,8 +18,7 @@ config_setting(
)
FLATBUFFERS_COPTS = select({
"@bazel_tools//src:windows": [],
"@bazel_tools//src:windows_msvc": [],
":windows": [],
"//conditions:default": ["-Wno-implicit-fallthrough", "-fexceptions"],
})

9
third_party/gif.BUILD vendored
View File

@ -21,7 +21,6 @@ cc_library(
],
hdrs = ["lib/gif_lib.h"],
defines = select({
#"@org_tensorflow//tensorflow:android": [
":android": [
"S_IREAD=S_IRUSR",
"S_IWRITE=S_IWUSR",
@ -33,7 +32,6 @@ cc_library(
visibility = ["//visibility:public"],
deps = select({
":windows": [":windows_polyfill"],
":windows_msvc": [":windows_polyfill"],
"//conditions:default": [],
}),
)
@ -50,13 +48,6 @@ genrule(
cmd = "touch $@",
)
config_setting(
name = "windows_msvc",
values = {
"cpu": "x64_windows_msvc",
},
)
config_setting(
name = "windows",
values = {

8
third_party/jpeg/jpeg.BUILD vendored
View File

@ -22,7 +22,6 @@ libjpegturbo_copts = select({
"-w",
],
":windows": WIN_COPTS,
":windows_msvc": WIN_COPTS,
"//conditions:default": [
"-O3",
"-w",
@ -423,7 +422,6 @@ genrule(
outs = ["jconfig.h"],
cmd = select({
":windows": "cp $(location jconfig_win.h) $@",
":windows_msvc": "cp $(location jconfig_win.h) $@",
":k8": "cp $(location jconfig_nowin_simd.h) $@",
":armeabi-v7a": "cp $(location jconfig_nowin_simd.h) $@",
":arm64-v8a": "cp $(location jconfig_nowin_simd.h) $@",
@ -441,7 +439,6 @@ genrule(
outs = ["jconfigint.h"],
cmd = select({
":windows": "cp $(location jconfigint_win.h) $@",
":windows_msvc": "cp $(location jconfigint_win.h) $@",
"//conditions:default": "cp $(location jconfigint_nowin.h) $@",
}),
)
@ -541,11 +538,6 @@ config_setting(
values = {"cpu": "x64_windows"},
)
config_setting(
name = "windows_msvc",
values = {"cpu": "x64_windows_msvc"},
)
config_setting(
name = "linux_ppc64le",
values = {"cpu": "ppc"},

6
third_party/lmdb.BUILD vendored
View File

@ -20,7 +20,6 @@ cc_library(
],
linkopts = select({
":windows": ["-DEFAULTLIB:advapi32.lib"], # InitializeSecurityDescriptor, SetSecurityDescriptorDacl
":windows_msvc": ["-DEFAULTLIB:advapi32.lib"],
"//conditions:default": ["-lpthread"],
}),
visibility = ["//visibility:public"],
@ -30,8 +29,3 @@ config_setting(
name = "windows",
values = {"cpu": "x64_windows"},
)
config_setting(
name = "windows_msvc",
values = {"cpu": "x64_windows_msvc"},
)

9
third_party/nasm.BUILD vendored
View File

@ -142,7 +142,6 @@ cc_binary(
],
copts = select({
":windows": [],
":windows_msvc": [],
"//conditions:default": [
"-w",
"-std=c99",
@ -150,7 +149,6 @@ cc_binary(
}),
defines = select({
":windows": [],
":windows_msvc": [],
"//conditions:default": [
"HAVE_SNPRINTF",
"HAVE_SYS_TYPES_H",
@ -159,13 +157,6 @@ cc_binary(
visibility = ["@jpeg//:__pkg__"],
)
config_setting(
name = "windows_msvc",
values = {
"cpu": "x64_windows_msvc",
},
)
config_setting(
name = "windows",
values = {

1
third_party/snappy.BUILD vendored
View File

@ -20,7 +20,6 @@ cc_library(
hdrs = ["snappy.h"],
copts = ["-DHAVE_CONFIG_H"] + select({
"@org_tensorflow//tensorflow:windows": [],
"@org_tensorflow//tensorflow:windows_msvc": [],
"//conditions:default": [
"-fno-exceptions",
"-Wno-sign-compare",

8
third_party/sqlite.BUILD vendored
View File

@ -4,7 +4,6 @@
licenses(["unencumbered"]) # Public Domain
SQLITE_COPTS = [
"-Os",
"-DSQLITE_ENABLE_JSON1",
"-DHAVE_DECL_STRERROR_R=1",
"-DHAVE_STDINT_H=1",
@ -15,15 +14,14 @@ SQLITE_COPTS = [
"@org_tensorflow//tensorflow:windows": [
"-DSQLITE_MAX_TRIGGER_DEPTH=100",
],
"@org_tensorflow//tensorflow:windows_msvc": [
"-DSQLITE_MAX_TRIGGER_DEPTH=100",
],
"@org_tensorflow//tensorflow:darwin": [
"-Os",
"-DHAVE_GMTIME_R=1",
"-DHAVE_LOCALTIME_R=1",
"-DHAVE_USLEEP=1",
],
"//conditions:default": [
"-Os",
"-DHAVE_FDATASYNC=1",
"-DHAVE_GMTIME_R=1",
"-DHAVE_LOCALTIME_R=1",
@ -48,7 +46,7 @@ cc_library(
"SQLITE_OMIT_DEPRECATED",
],
linkopts = select({
"@org_tensorflow//tensorflow:windows_msvc": [],
"@org_tensorflow//tensorflow:windows": [],
"//conditions:default": [
"-ldl",
"-lpthread",

6
third_party/swig.BUILD vendored
View File

@ -71,7 +71,6 @@ cc_binary(
],
copts = ["$(STACK_FRAME_UNLIMITED)"] + select({
":windows": [],
":windows_msvc": [],
"//conditions:default": [
"-Wno-parentheses",
"-Wno-unused-variable",
@ -331,11 +330,6 @@ genrule(
" $< >$@",
)
config_setting(
name = "windows_msvc",
values = {"cpu": "x64_windows_msvc"},
)
config_setting(
name = "windows",
values = {"cpu": "x64_windows"},

1
third_party/zlib.BUILD vendored
View File

@ -34,7 +34,6 @@ cc_library(
hdrs = ["zlib.h"],
copts = select({
"@org_tensorflow//tensorflow:windows": [],
"@org_tensorflow//tensorflow:windows_msvc": [],
"//conditions:default": [
"-Wno-shift-negative-value",
"-DZ_HAVE_UNISTD_H",