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

Accept both 'additional_deps' and 'deps' for tf_py_test, py_tests, and gpu_py_tests.

Browse Source 
The usage of `additional_deps` is a non-standard pattern and hinders the use of
tools for managing BUILD files. The ability to use additional_deps will be
removed in a later change.

To change usages the following can be run:

$ buildozer 'move additional_deps deps *' '//...:%tf_py_test' '//...:%py_tests' '//...:%gpu_py_tests'

The buildozer command can be found here:
  https://github.com/bazelbuild/buildtools/tree/master/buildozer

PiperOrigin-RevId: 285227892
Change-Id: I8d1188f461b9f605d073af66633bbef0915ea278
This commit is contained in:
Brian Atkinson 2019-12-12 11:05:53 -08:00 committed by TensorFlower Gardener
parent d45163cfe0
commit 2844809b9e
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tensorflow/tensorflow.bzl
View File

@ -2095,7 +2095,6 @@ def tf_py_test(
args = [],
tags = [],
shard_count = 1,
additional_deps = [],
additional_visibility = [],
kernels = [],
flaky = 0,
@ -2105,6 +2104,7 @@ def tf_py_test(
**kwargs):
"""Create one or more python tests with extra tensorflow dependencies."""
xla_test_true_list = []
additional_deps = kwargs.pop("additional_deps", []) + kwargs.pop("deps", [])
# xla_enable_strict_auto_jit is used to run Tensorflow unit tests with all XLA compilable
# kernels compiled with XLA.
@ -2140,7 +2140,7 @@ def tf_py_test(
register_extension_info(
extension_name = "tf_py_test",
label_regex_map = {"additional_deps": "deps:{extension_name}"},
label_regex_map = {"deps": "deps:{extension_name}"},
)
def gpu_py_test(
@ -2190,7 +2190,7 @@ def gpu_py_test(
register_extension_info(
extension_name = "gpu_py_test",
label_regex_map = {"deps": "additional_deps:{extension_name}"},
label_regex_map = {"deps": "deps:{extension_name}"},
)
# terminology changes: saving cuda_* definition for compatibility
@ -2199,7 +2199,7 @@ def cuda_py_test(*args, **kwargs):
register_extension_info(
extension_name = "cuda_py_test",
label_regex_map = {"deps": "additional_deps:{extension_name}"},
label_regex_map = {"deps": "deps:{extension_name}"},
)
def sycl_py_test(
@ -2237,14 +2237,13 @@ def sycl_py_test(
register_extension_info(
extension_name = "sycl_py_test",
label_regex_map = {"deps": "additional_deps:{extension_name}"},
label_regex_map = {"deps": "deps:{extension_name}"},
)
def py_tests(
name,
srcs,
size = "medium",
additional_deps = [],
kernels = [],
data = [],
tags = [],
@ -2254,6 +2253,7 @@ def py_tests(
xla_enabled = False,
grpc_enabled = False,
**kwargs):
additional_deps = kwargs.pop("additional_deps", []) + kwargs.pop("deps", [])
for src in srcs:
test_name = src.split("/")[-1].split(".")[0]
if prefix:
@ -2278,7 +2278,6 @@ def gpu_py_tests(
name,
srcs,
size = "medium",
additional_deps = [],
kernels = [],
data = [],
shard_count = 1,
@ -2292,6 +2291,7 @@ def gpu_py_tests(
# XLA tests once enough compute resources are available.
_ignored = [xla_enable_strict_auto_jit]
test_tags = tags + tf_gpu_tests_tags()
additional_deps = kwargs.pop("additional_deps", []) + kwargs.pop("deps", [])
py_tests(
name = name,
size = size,