diff options
| author |  A. Unique TensorFlower <gardener@tensorflow.org> | 2018-10-04 03:12:04 -0700 |
|---|---|---|
| committer | TensorFlower Gardener <gardener@tensorflow.org> | 2018-10-04 03:16:21 -0700 |
| commit | 6b538d9ce54e878576131cde0c76e43a893180c2 (patch) | |
| tree | 4d8ce9e3ef749dc13aae26abfef94f6dc20d719b /tensorflow | |
| parent | 98ea840dabc0c4e9417ebe9a0fd10c9d471cda51 (diff) | |
Automated rollback of commit 70a395f9795a48c21bc35cdf1dc44778f73a7bba
PiperOrigin-RevId: 215710849
Diffstat (limited to 'tensorflow')
| -rw-r--r-- | tensorflow/python/data/kernel_tests/BUILD | 1 | ||||
| -rw-r--r-- | tensorflow/tensorflow.bzl | 39 | ||||
| -rw-r--r-- | tensorflow/tools/pip_package/pip_smoke_test.py | 2 |
3 files changed, 25 insertions, 17 deletions
diff --git a/tensorflow/python/data/kernel_tests/BUILD b/tensorflow/python/data/kernel_tests/BUILD index c7295d6e69..10ec0dbe1c 100644 --- a/tensorflow/python/data/kernel_tests/BUILD +++ b/tensorflow/python/data/kernel_tests/BUILD @@ -306,6 +306,7 @@ cuda_py_test( "//tensorflow/python:framework_test_lib", ], tags = [ + "no_oss", # TODO(b/116813115): Investigate timeout and re-enable. "no_windows_gpu", ], ) diff --git a/tensorflow/tensorflow.bzl b/tensorflow/tensorflow.bzl index cad5de1b0c..dead44c57e 100644 --- a/tensorflow/tensorflow.bzl +++ b/tensorflow/tensorflow.bzl @@ -1798,22 +1798,29 @@ def cuda_py_test( flaky = 0, xla_enabled = False, grpc_enabled = False): - test_tags = tags + tf_cuda_tests_tags() - tf_py_test( - name = name, - size = size, - srcs = srcs, - data = data, - main = main, - args = args, - tags = test_tags, - shard_count = shard_count, - additional_deps = additional_deps, - kernels = kernels, - flaky = flaky, - xla_enabled = xla_enabled, - grpc_enabled = grpc_enabled, - ) + if main == None: + main = name + ".py" + for config in ["cpu", "gpu"]: + test_name = name + test_tags = tags + if config == "gpu": + test_name += "_gpu" + test_tags = test_tags + tf_cuda_tests_tags() + tf_py_test( + name = test_name, + size = size, + srcs = srcs, + data = data, + main = main, + args = args, + tags = test_tags, + shard_count = shard_count, + additional_deps = additional_deps, + kernels = kernels, + flaky = flaky, + xla_enabled = xla_enabled, + grpc_enabled = grpc_enabled, + ) register_extension_info( extension_name = "cuda_py_test", diff --git a/tensorflow/tools/pip_package/pip_smoke_test.py b/tensorflow/tools/pip_package/pip_smoke_test.py index c6ef82ccdc..e7f9628fa6 100644 --- a/tensorflow/tools/pip_package/pip_smoke_test.py +++ b/tensorflow/tools/pip_package/pip_smoke_test.py @@ -142,7 +142,7 @@ def main(): missing_dependencies = [] # File extensions and endings to ignore - ignore_extensions = ["_test", "_test.py"] + ignore_extensions = ["_test", "_test.py", "_test_gpu", "_test_gpu.py"] ignored_files = 0 blacklisted_files = len(BLACKLIST) |