Automated rollback of commit d78595d333

PiperOrigin-RevId: 215073584

tensorflow/python/data/kernel_tests/BUILD

@@ -318,7 +318,6 @@ cuda_py_test(
         "//tensorflow/python:framework_test_lib",
     ],
     tags = [
-        "no_oss",  # TODO(b/116813115): Investigate timeout and re-enable.
         "no_windows_gpu",
     ],
 )

tensorflow/tensorflow.bzl

@@ -1798,16 +1798,9 @@ 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()
+    test_tags = tags + tf_cuda_tests_tags()
     tf_py_test(
-            name = test_name,
+        name = name,
         size = size,
         srcs = srcs,
         data = data,

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)