diff options
| author |  Smit Hinsu <hinsu@google.com> | 2018-10-04 14:55:14 -0700 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2018-10-04 14:59:38 -0700 |
| commit | a742575879db1df48daf929b8d29e43a1d168dd7 (patch) | |
| tree | e1dba2128b80ff66f74f8f97e16a9123d8ddec29 | |
| parent | ac7b84de8803edbb2d4da573b3f8704e9fad8fa8 (diff) | |
Automated rollback of commit 6b538d9ce54e878576131cde0c76e43a893180c2
PiperOrigin-RevId: 215808649
| -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, 17 insertions, 25 deletions
diff --git a/tensorflow/python/data/kernel_tests/BUILD b/tensorflow/python/data/kernel_tests/BUILD index 10ec0dbe1c..c7295d6e69 100644 --- a/tensorflow/python/data/kernel_tests/BUILD +++ b/tensorflow/python/data/kernel_tests/BUILD @@ -306,7 +306,6 @@ 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 dead44c57e..cad5de1b0c 100644 --- a/tensorflow/tensorflow.bzl +++ b/tensorflow/tensorflow.bzl @@ -1798,29 +1798,22 @@ def cuda_py_test( flaky = 0, xla_enabled = False, grpc_enabled = False): - 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, - ) + 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, + ) 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 e7f9628fa6..c6ef82ccdc 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", "_test_gpu", "_test_gpu.py"] + ignore_extensions = ["_test", "_test.py"] ignored_files = 0 blacklisted_files = len(BLACKLIST) |