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

Make tensorflow:oss config_setting not configurable.

Browse Source 
With this change, downstream projects no longer need to `--define open_source_build=true` in their .bazelrc.

PiperOrigin-RevId: 347033993
Change-Id: I5612f82c689ea122ff8af4c7c3765ed057764417
This commit is contained in:
Christian Sigg 2020-12-11 11:03:15 -08:00 committed by TensorFlower Gardener
parent 37c9633c50
commit 4279f36afb
2 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.bazelrc
View File

@ -145,10 +145,6 @@ build:monolithic --define framework_shared_object=false
# opts in to modular op registration support by default.
build --define framework_shared_object=true
# Flags for open source build, always set to be true.
build --define open_source_build=true
test --define open_source_build=true
# For workaround https://github.com/bazelbuild/bazel/issues/8772 with Bazel >= 0.29.1
build --java_toolchain=//third_party/toolchains/java:tf_java_toolchain
build --host_java_toolchain=//third_party/toolchains/java:tf_java_toolchain

33
tensorflow/BUILD
View File

@ -3,7 +3,7 @@
# learning applications.
load("@bazel_skylib//lib:selects.bzl", "selects")
load("@bazel_skylib//rules:common_settings.bzl", "bool_flag")
load("@bazel_skylib//rules:common_settings.bzl", "bool_flag", "bool_setting")
load("//tensorflow:tensorflow.bzl", "VERSION", "tf_cc_shared_object", "tf_custom_op_library_additional_deps_impl", "tf_native_cc_binary")
load(
"//tensorflow/core/platform:build_config.bzl",
@ -401,13 +401,20 @@ config_setting(
define_values = {"using_cuda_clang": "true"},
)
# Flag to indicate open source build, .bazelrc always has it set to be true
# Config setting to use in select()s to distinguish open source build from
# google internal build on configurable attributes.
config_setting(
name = "oss",
define_values = {"open_source_build": "true"},
flag_values = {":oss_setting": "True"},
visibility = ["//visibility:public"],
)
# Fixed setting to indicate open source build.
bool_setting(
name = "oss_setting",
build_setting_default = True,
)
config_setting(
name = "using_cuda_clang_with_dynamic_build",
define_values = {
@ -416,12 +423,12 @@ config_setting(
},
)
config_setting(
selects.config_setting_group(
name = "build_oss_using_cuda_clang",
define_values = {
"using_cuda_clang": "true",
"open_source_build": "true",
},
match_all = [
":using_cuda_clang",
":oss",
],
)
# Setting to use when loading kernels dynamically
@ -447,12 +454,12 @@ config_setting(
},
)
config_setting(
selects.config_setting_group(
name = "build_oss_using_cuda_nvcc",
define_values = {
"using_cuda_nvcc": "true",
"open_source_build": "true",
},
match_all = [
":using_cuda_nvcc",
":oss",
],
)
config_setting(