diff --git a/python/paddle/fluid/tests/unittests/dygraph_to_static/test_reinforcement_learning.py b/python/paddle/fluid/tests/unittests/dygraph_to_static/test_reinforcement_learning.py index 13aace20031b3800f659fa3c093a8e237cda260d..c97d37d3523a8213225caf98faade249e256fa50 100644 --- a/python/paddle/fluid/tests/unittests/dygraph_to_static/test_reinforcement_learning.py +++ b/python/paddle/fluid/tests/unittests/dygraph_to_static/test_reinforcement_learning.py @@ -217,5 +217,4 @@ class TestDeclarative(unittest.TestCase): if __name__ == '__main__': - with fluid.framework._test_eager_guard(): - unittest.main() + unittest.main() diff --git a/python/paddle/fluid/tests/unittests/dygraph_to_static/test_resnet.py b/python/paddle/fluid/tests/unittests/dygraph_to_static/test_resnet.py index 821195c2cb0edc43f268e44bb56dc0e427cf0591..f59dee857a8234bebd390855b2aa7e4f28196b81 100644 --- a/python/paddle/fluid/tests/unittests/dygraph_to_static/test_resnet.py +++ b/python/paddle/fluid/tests/unittests/dygraph_to_static/test_resnet.py @@ -434,6 +434,4 @@ class TestResnet(unittest.TestCase): if __name__ == '__main__': - # switch into new eager mode - with fluid.framework._test_eager_guard(): - unittest.main() + unittest.main() diff --git a/python/paddle/fluid/tests/unittests/dygraph_to_static/test_resnet_amp.py b/python/paddle/fluid/tests/unittests/dygraph_to_static/test_resnet_amp.py index 4ce379a7043c2a4ad8dc8502ca774c858fe48bc2..db52ef9b915cd0f6ff0c8f4ae59c9732fd8d9cbb 100644 --- a/python/paddle/fluid/tests/unittests/dygraph_to_static/test_resnet_amp.py +++ b/python/paddle/fluid/tests/unittests/dygraph_to_static/test_resnet_amp.py @@ -127,5 +127,4 @@ class TestResnet(unittest.TestCase): if __name__ == '__main__': - with fluid.framework._test_eager_guard(): - unittest.main() + unittest.main() diff --git a/python/paddle/fluid/tests/unittests/dygraph_to_static/test_resnet_pure_fp16.py b/python/paddle/fluid/tests/unittests/dygraph_to_static/test_resnet_pure_fp16.py index 21d081b00978e4b62ec8bd69cf6217ecd3d6b55a..54687044026a2965027d6d7a5c15cad51750cb94 100644 --- a/python/paddle/fluid/tests/unittests/dygraph_to_static/test_resnet_pure_fp16.py +++ b/python/paddle/fluid/tests/unittests/dygraph_to_static/test_resnet_pure_fp16.py @@ -136,5 +136,4 @@ class TestResnet(unittest.TestCase): if __name__ == '__main__': - with fluid.framework._test_eager_guard(): - unittest.main() + unittest.main() diff --git a/python/paddle/fluid/tests/unittests/dygraph_to_static/test_se_resnet.py b/python/paddle/fluid/tests/unittests/dygraph_to_static/test_se_resnet.py index bce8c3a742d4a5b0f27b805462c75f48d9d46750..34ae0cd19a7eebf6594ba0d652ae604b197a993d 100644 --- a/python/paddle/fluid/tests/unittests/dygraph_to_static/test_se_resnet.py +++ b/python/paddle/fluid/tests/unittests/dygraph_to_static/test_se_resnet.py @@ -600,6 +600,4 @@ class TestSeResnet(unittest.TestCase): if __name__ == '__main__': - # switch into new eager mode - with fluid.framework._test_eager_guard(): - unittest.main() + unittest.main() diff --git a/python/paddle/fluid/tests/unittests/dygraph_to_static/test_sentiment.py b/python/paddle/fluid/tests/unittests/dygraph_to_static/test_sentiment.py index e259ce5cf2e47973fa4bafd6c1693fe63f4534fb..12e5099f257fe7e3b031efe1ecd66b0e2483d68c 100644 --- a/python/paddle/fluid/tests/unittests/dygraph_to_static/test_sentiment.py +++ b/python/paddle/fluid/tests/unittests/dygraph_to_static/test_sentiment.py @@ -388,5 +388,4 @@ class TestSentiment(unittest.TestCase): if __name__ == '__main__': - with fluid.framework._test_eager_guard(): - unittest.main() + unittest.main() diff --git a/python/paddle/fluid/tests/unittests/dygraph_to_static/test_seq2seq.py b/python/paddle/fluid/tests/unittests/dygraph_to_static/test_seq2seq.py index 4a83495987cac71a5369d4b1e7baea2d1dd76806..a0a45ddbde2bea07d67b7d40299e695b7ce11ff5 100644 --- a/python/paddle/fluid/tests/unittests/dygraph_to_static/test_seq2seq.py +++ b/python/paddle/fluid/tests/unittests/dygraph_to_static/test_seq2seq.py @@ -242,6 +242,4 @@ class TestSeq2seq(unittest.TestCase): if __name__ == '__main__': - # switch into new eager mode - with fluid.framework._test_eager_guard(): - unittest.main() + unittest.main() diff --git a/python/paddle/fluid/tests/unittests/dygraph_to_static/test_simnet.py b/python/paddle/fluid/tests/unittests/dygraph_to_static/test_simnet.py index 394783565309d0f02402d5f74709147d42aebf29..f5ce0774d292062df3fe11cfa297299a6ec57f72 100644 --- a/python/paddle/fluid/tests/unittests/dygraph_to_static/test_simnet.py +++ b/python/paddle/fluid/tests/unittests/dygraph_to_static/test_simnet.py @@ -176,6 +176,4 @@ class TestSimnet(unittest.TestCase): if __name__ == '__main__': - # switch into new eager mode - with fluid.framework._test_eager_guard(): - unittest.main() + unittest.main() diff --git a/python/paddle/fluid/tests/unittests/dygraph_to_static/test_transformer.py b/python/paddle/fluid/tests/unittests/dygraph_to_static/test_transformer.py index 8d62d17537dc22ff7fa557127c3b2e3f3a818c6f..e603bebd285d00de714a32c12752bde9fbd80762 100644 --- a/python/paddle/fluid/tests/unittests/dygraph_to_static/test_transformer.py +++ b/python/paddle/fluid/tests/unittests/dygraph_to_static/test_transformer.py @@ -556,6 +556,4 @@ class TestTransformer(unittest.TestCase): if __name__ == '__main__': - # switch into new eager mode - with fluid.framework._test_eager_guard(): - unittest.main() + unittest.main() diff --git a/python/paddle/fluid/tests/unittests/dygraph_to_static/test_tsm.py b/python/paddle/fluid/tests/unittests/dygraph_to_static/test_tsm.py index f1bd4fa4af998e09ea65bfd67d2eef58b318c949..b66a3ed21f47ae936b5a978683e93dcfde63e1be 100644 --- a/python/paddle/fluid/tests/unittests/dygraph_to_static/test_tsm.py +++ b/python/paddle/fluid/tests/unittests/dygraph_to_static/test_tsm.py @@ -390,6 +390,4 @@ class TestTsm(unittest.TestCase): if __name__ == '__main__': - # switch into new eager mode - with fluid.framework._test_eager_guard(): - unittest.main() + unittest.main() diff --git a/python/paddle/fluid/tests/unittests/dygraph_to_static/test_typehint.py b/python/paddle/fluid/tests/unittests/dygraph_to_static/test_typehint.py index fa141482b5413ffe4fe2a39e52f6a9a63dcab697..2283c77bfb8deb2ee37fd8fb8ed95064c88d422f 100644 --- a/python/paddle/fluid/tests/unittests/dygraph_to_static/test_typehint.py +++ b/python/paddle/fluid/tests/unittests/dygraph_to_static/test_typehint.py @@ -77,5 +77,4 @@ class TestTypeHint(TestTransformWhileLoop): if __name__ == '__main__': - with fluid.framework._test_eager_guard(): - unittest.main() + unittest.main() diff --git a/python/paddle/fluid/tests/unittests/dygraph_to_static/test_word2vec.py b/python/paddle/fluid/tests/unittests/dygraph_to_static/test_word2vec.py index 22a62d64cbbb5aa7155660dae2f50e69de5d2e1d..13f1a9b882fed3beb9860c1339dda363dc73fa7b 100644 --- a/python/paddle/fluid/tests/unittests/dygraph_to_static/test_word2vec.py +++ b/python/paddle/fluid/tests/unittests/dygraph_to_static/test_word2vec.py @@ -332,5 +332,4 @@ class TestWord2Vec(unittest.TestCase): if __name__ == '__main__': - with fluid.framework._test_eager_guard(): - unittest.main() + unittest.main() diff --git a/python/paddle/fluid/tests/unittests/dygraph_to_static/test_yolov3.py b/python/paddle/fluid/tests/unittests/dygraph_to_static/test_yolov3.py index 7168708f1c739a73dbcfa7fc471dacf24d32689c..0da45601ea4afc8114fee79c7608a9bb659eed01 100644 --- a/python/paddle/fluid/tests/unittests/dygraph_to_static/test_yolov3.py +++ b/python/paddle/fluid/tests/unittests/dygraph_to_static/test_yolov3.py @@ -177,5 +177,4 @@ class TestYolov3(unittest.TestCase): if __name__ == '__main__': - with fluid.framework._test_eager_guard(): - unittest.main() + unittest.main()