Remove nocopts attribute from cc_* rules from Tensorflow.

This attribute will be removed soon: https://github.com/bazelbuild/bazel/issues/8706
The only nocopts values passed are "-fno-exceptions" and "-[W]error". Bazel's crosstool doesn't provide either of them.

PiperOrigin-RevId: 263082078
This commit is contained in:
A. Unique TensorFlower 2019-08-13 00:16:00 -07:00 committed by TensorFlower Gardener
parent 1aaaef42cb
commit ddde447e79
3 changed files with 2 additions and 21 deletions
tensorflow
third_party

View File

@ -970,7 +970,6 @@ def tf_cc_test(
extra_copts = [],
suffix = "",
linkopts = [],
nocopts = None,
kernels = [],
**kwargs):
native.cc_test(
@ -1009,7 +1008,6 @@ def tf_cc_test(
clean_dep("//tensorflow:macos"): 1,
"//conditions:default": 0,
}),
nocopts = nocopts,
**kwargs
)
@ -1173,8 +1171,7 @@ def tf_cc_tests(
size = "medium",
args = None,
linkopts = [],
kernels = [],
nocopts = None):
kernels = []):
for src in srcs:
tf_cc_test(
name = src_to_test_name(src),
@ -1184,7 +1181,6 @@ def tf_cc_tests(
kernels = kernels,
linkopts = linkopts,
linkstatic = linkstatic,
nocopts = nocopts,
tags = tags,
deps = deps,
)
@ -1225,7 +1221,6 @@ def tf_cc_test_mkl(
size = size,
args = args,
features = disable_header_modules,
nocopts = "-fno-exceptions",
)
def tf_cc_tests_gpu(
@ -1513,8 +1508,7 @@ def tf_mkl_kernel_library(
hdrs = None,
deps = None,
alwayslink = 1,
copts = tf_copts(),
nocopts = "-fno-exceptions"):
copts = tf_copts()):
"""A rule to build MKL-based TensorFlow kernel libraries."""
if not bool(srcs):
@ -1542,7 +1536,6 @@ def tf_mkl_kernel_library(
deps = deps,
alwayslink = alwayslink,
copts = copts,
nocopts = nocopts,
features = disable_header_modules,
)
@ -2401,7 +2394,6 @@ def pybind_extension(
srcs_version = "PY2AND3",
data = [],
copts = None,
nocopts = None,
linkopts = [],
deps = [],
visibility = None,
@ -2448,7 +2440,6 @@ def pybind_extension(
srcs = srcs + hdrs,
data = data,
copts = copts,
nocopts = nocopts,
linkopts = linkopts + _rpath_linkopts(name) + select({
"@local_config_cuda//cuda:darwin": [
"-Wl,-exported_symbols_list,$(location %s)" % exported_symbols_file,

View File

@ -7,8 +7,6 @@ exports_files(["LICENSE.md"])
load("@org_tensorflow//third_party:common.bzl", "template_rule")
libjpegturbo_nocopts = "-[W]error"
WIN_COPTS = [
"/Ox",
"-DWITH_SIMD",
@ -120,7 +118,6 @@ cc_library(
"jstdhuff.c", # should have been named .inc
],
copts = libjpegturbo_copts,
nocopts = libjpegturbo_nocopts,
visibility = ["//visibility:public"],
deps = select({
":k8": [":simd_x86_64"],
@ -168,7 +165,6 @@ cc_library(
"simd/powerpc/jsimd_altivec.h",
],
copts = libjpegturbo_copts,
nocopts = libjpegturbo_nocopts,
)
cc_library(
@ -217,7 +213,6 @@ cc_library(
],
copts = libjpegturbo_copts,
linkstatic = 1,
nocopts = libjpegturbo_nocopts,
)
genrule(
@ -327,7 +322,6 @@ cc_library(
"simd/jsimd.h",
],
copts = libjpegturbo_copts,
nocopts = libjpegturbo_nocopts,
)
cc_library(
@ -348,7 +342,6 @@ cc_library(
"simd/jsimd.h",
],
copts = libjpegturbo_copts,
nocopts = libjpegturbo_nocopts,
)
cc_library(
@ -501,7 +494,6 @@ cc_library(
"jsimddct.h",
],
copts = libjpegturbo_copts,
nocopts = libjpegturbo_nocopts,
)
template_rule(

View File

@ -91,7 +91,6 @@ cc_library(
"src/cpu/gemm",
"src/cpu/xbyak",
],
nocopts = "-fno-exceptions",
visibility = ["//visibility:public"],
deps = select({
"@org_tensorflow//tensorflow:linux_x86_64": [
@ -134,6 +133,5 @@ cc_library(
"src/cpu/gemm",
"src/cpu/xbyak",
],
nocopts = "-fno-exceptions",
visibility = ["//visibility:public"],
)