From 4a05ea9a74ddbb2bc306926435c0ac57c3bdaa61 Mon Sep 17 00:00:00 2001
From: Chuanhao Zhuge <chuanhao@google.com>
Date: Thu, 15 Oct 2020 17:44:13 -0700
Subject: [PATCH] Enable passing TFRT python tests.
PiperOrigin-RevId: 337418589
Change-Id: I2267e24d39aa367df75176108df95ddd81d7b968
---
tensorflow/python/eager/benchmarks/resnet50/resnet50_test.py | 2 --
tensorflow/python/eager/benchmarks_test.py | 4 ----
tensorflow/python/eager/def_function_test.py | 2 --
tensorflow/python/eager/ops_test.py | 1 -
tensorflow/python/framework/ops_test.py | 4 ----
tensorflow/python/ops/init_ops_test.py | 2 --
6 files changed, 15 deletions(-)
diff --git a/tensorflow/python/eager/benchmarks/resnet50/resnet50_test.py b/tensorflow/python/eager/benchmarks/resnet50/resnet50_test.py
index 52803be7bf9..573c8bc2e10 100644
--- a/tensorflow/python/eager/benchmarks/resnet50/resnet50_test.py
+++ b/tensorflow/python/eager/benchmarks/resnet50/resnet50_test.py
@@ -336,7 +336,6 @@ class ResNet50Benchmarks(tf.test.Benchmark):
defun=False,
execution_mode=context.ASYNC)
- @test_util.disable_tfrt('Graph is not supported yet. b/156187905')
def benchmark_eager_apply_with_defun(self):
self._benchmark_eager_apply(
'eager_apply_with_defun',
@@ -416,7 +415,6 @@ class ResNet50Benchmarks(tf.test.Benchmark):
resnet50_test_util.device_and_data_format(),
defun=False)
- @test_util.disable_tfrt('Graph is not supported yet. b/156187905')
def benchmark_eager_train_datasets_with_defun(self):
def make_iterator(tensors):
diff --git a/tensorflow/python/eager/benchmarks_test.py b/tensorflow/python/eager/benchmarks_test.py
index bf6e43f5e65..37ab60918c2 100644
--- a/tensorflow/python/eager/benchmarks_test.py
+++ b/tensorflow/python/eager/benchmarks_test.py
@@ -923,19 +923,15 @@ class MicroBenchmarks(benchmarks_test_base.MicroBenchmarksBase):
func = lambda: math_ops.reduce_logsumexp(x)
self._run(func, 3000, execution_mode=execution_mode)
- @test_util.disable_tfrt("b/169371018: Support ScalarHost in RTFB.")
def benchmark_tf_reduce_logsumexp_CPU(self):
self._benchmark_tf_reduce_logsumexp()
- @test_util.disable_tfrt("b/169371018: Support ScalarHost in RTFB.")
def benchmark_tf_reduce_logsumexp_CPU_async(self):
self._benchmark_tf_reduce_logsumexp(execution_mode=context.ASYNC)
- @test_util.disable_tfrt("b/169371018: Support ScalarHost in RTFB.")
def benchmark_tf_reduce_logsumexp_GPU(self):
self._benchmark_tf_reduce_logsumexp(device=GPU)
- @test_util.disable_tfrt("b/169371018: Support ScalarHost in RTFB.")
def benchmark_tf_reduce_logsumexp_GPU_async(self):
self._benchmark_tf_reduce_logsumexp(device=GPU,
execution_mode=context.ASYNC)
diff --git a/tensorflow/python/eager/def_function_test.py b/tensorflow/python/eager/def_function_test.py
index 1e56b577d96..59bb0adc488 100644
--- a/tensorflow/python/eager/def_function_test.py
+++ b/tensorflow/python/eager/def_function_test.py
@@ -153,7 +153,6 @@ class DefFunctionTest(test.TestCase, parameterized.TestCase):
init_fn()
self.assertEqual(state[0].numpy(), 2.0)
- @test_util.disable_tfrt('Error in native condition op.')
def testVariableInitializerNotConstant(self):
state = []
@@ -385,7 +384,6 @@ class DefFunctionTest(test.TestCase, parameterized.TestCase):
'defined in another function or code block'):
f(array_ops.zeros(shape=(8, 42, 3)))
- @test_util.disable_tfrt('b/169375363: error code support')
def testRuntimeErrorNotSticky(self):
@def_function.function
diff --git a/tensorflow/python/eager/ops_test.py b/tensorflow/python/eager/ops_test.py
index 0c8bbe76c98..8906c390b6d 100644
--- a/tensorflow/python/eager/ops_test.py
+++ b/tensorflow/python/eager/ops_test.py
@@ -394,7 +394,6 @@ class OpsTest(test_util.TensorFlowTestCase, parameterized.TestCase):
@parameterized.named_parameters(
('Tensor', lambda: constant_op.constant(1.3+1j)),
('Variable', lambda: resource_variable_ops.ResourceVariable(1.3+1j)))
- @test_util.disable_tfrt('cannot create complex tensor in TFRT.')
def testCastToPrimitiveTypesFrom(self, value_fn):
x = value_fn()
self.assertIsInstance(int(x), int)
diff --git a/tensorflow/python/framework/ops_test.py b/tensorflow/python/framework/ops_test.py
index e3fe4c07a57..04b6d90a838 100644
--- a/tensorflow/python/framework/ops_test.py
+++ b/tensorflow/python/framework/ops_test.py
@@ -326,7 +326,6 @@ class TensorAndShapeTest(test_util.TensorFlowTestCase):
self.assertAllEqual(z, [False, False, False, True])
- @test_util.disable_tfrt("b/169375363: error code support")
@test_util.run_in_graph_and_eager_modes
def testBitwiseAndErrors(self):
x_int = constant_op.constant(0)
@@ -368,7 +367,6 @@ class TensorAndShapeTest(test_util.TensorFlowTestCase):
self.assertAllEqual(z, [False, True, True, True])
- @test_util.disable_tfrt("b/169375363: error code support")
@test_util.run_in_graph_and_eager_modes
def testBitwiseOrErrors(self):
x_int = constant_op.constant(0)
@@ -410,7 +408,6 @@ class TensorAndShapeTest(test_util.TensorFlowTestCase):
self.assertAllEqual(z, [False, True, True, False])
- @test_util.disable_tfrt("b/169375363: error code support")
@test_util.run_in_graph_and_eager_modes
def testBitwiseXorErrors(self):
x_int = constant_op.constant(0)
@@ -450,7 +447,6 @@ class TensorAndShapeTest(test_util.TensorFlowTestCase):
self.assertAllEqual(y, [True, False])
- @test_util.disable_tfrt("b/169375363: error code support")
@test_util.run_in_graph_and_eager_modes
def testBitwiseNotErrors(self):
if context.executing_eagerly(): # :(
diff --git a/tensorflow/python/ops/init_ops_test.py b/tensorflow/python/ops/init_ops_test.py
index 4ea7ef007d6..ae8bfbdbdd0 100644
--- a/tensorflow/python/ops/init_ops_test.py
+++ b/tensorflow/python/ops/init_ops_test.py
@@ -203,8 +203,6 @@ class InitializersTest(test.TestCase):
run_metadata=run_metadata)
@test_util.run_gpu_only
- @test_util.disable_tfrt('b/165614506: Incorrect device name set in '
- 'tfrt::TensorHandle.')
def test_eager_orthogonal_gpu(self):
with context.eager_mode():
v = variable_scope.get_variable(