aboutsummaryrefslogtreecommitdiffhomepage
path: root/tensorflow/python/kernel_tests/control_flow_ops_py_test.py
diff options
context:
space:
mode:
authorGravatar Saurabh Saxena <srbs@google.com>2018-10-05 13:24:34 -0700
committerGravatar TensorFlower Gardener <gardener@tensorflow.org>2018-10-05 13:28:41 -0700
commitf14287eabf69c57a2d2e044c311f2db1413cb6a5 (patch)
tree124c7ebf03dd0057ded4a54700c25a21d069d1dd /tensorflow/python/kernel_tests/control_flow_ops_py_test.py
parentec451f5ab43467d7cb4ae7736f2de16331441e0b (diff)
Copy device from If op to the lowered ops.
Enable GPU tests for cond_v2. PiperOrigin-RevId: 215956220
Diffstat (limited to 'tensorflow/python/kernel_tests/control_flow_ops_py_test.py')
-rw-r--r--tensorflow/python/kernel_tests/control_flow_ops_py_test.py5
1 files changed, 0 insertions, 5 deletions
diff --git a/tensorflow/python/kernel_tests/control_flow_ops_py_test.py b/tensorflow/python/kernel_tests/control_flow_ops_py_test.py
index c7e89dd5f9..7fae5249aa 100644
--- a/tensorflow/python/kernel_tests/control_flow_ops_py_test.py
+++ b/tensorflow/python/kernel_tests/control_flow_ops_py_test.py
@@ -23,7 +23,6 @@ from __future__ import print_function
import collections
import math
import time
-import unittest
import numpy as np
from six.moves import xrange # pylint: disable=redefined-builtin
@@ -661,7 +660,6 @@ class ControlFlowTest(test.TestCase):
r = control_flow_ops.cond(pred, fn1, fn2)
sess.run(r)
- @test_util.disable_control_flow_v2("b/113346829 (gpu failure)")
def testCondGrad_1(self):
graph = ops.Graph()
with graph.as_default():
@@ -3424,9 +3422,6 @@ class EagerTest(test.TestCase):
# TODO(b/117279927): Re-enable once msan failure is fixed.
def DISABLED_testCondInDefun(self):
- if "GPU" in [d.device_type for d in device_lib.list_local_devices()]:
- return unittest.skip("b/113346829 (gpu failure)")
-
with context.eager_mode():
@eager_function.defun