From 33fa2684f3ece07e40a39fade2121145c03b39da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E6=B0=B8=E4=B9=85?=
 <34344716+yjjiang11@users.noreply.github.com>
Date: Wed, 7 Dec 2022 23:54:16 -0800
Subject: [PATCH] rm dygraph_to_static eager guard tests part2 minst2ptb_lm
 (#48793)

* rm dygraph_to_static eager guard tests part2 minst2ptb_lm
---
 .../tests/unittests/dygraph_to_static/test_mnist.py  | 12 ------------
 .../unittests/dygraph_to_static/test_mnist_amp.py    |  3 +--
 .../dygraph_to_static/test_mnist_pure_fp16.py        |  3 +--
 .../unittests/dygraph_to_static/test_mobile_net.py   |  3 +--
 .../dygraph_to_static/test_multi_forward.py          |  4 +---
 .../dygraph_to_static/test_program_translator.py     |  3 +--
 .../tests/unittests/dygraph_to_static/test_ptb_lm.py |  4 +---
 7 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/python/paddle/fluid/tests/unittests/dygraph_to_static/test_mnist.py b/python/paddle/fluid/tests/unittests/dygraph_to_static/test_mnist.py
index d178370f546..fb51474af55 100644
--- a/python/paddle/fluid/tests/unittests/dygraph_to_static/test_mnist.py
+++ b/python/paddle/fluid/tests/unittests/dygraph_to_static/test_mnist.py
@@ -25,7 +25,6 @@ import paddle.fluid as fluid
 from paddle.fluid.dygraph import to_variable
 from paddle.fluid.dygraph.base import switch_to_static_graph
 from paddle.fluid.dygraph.io import INFER_MODEL_SUFFIX, INFER_PARAMS_SUFFIX
-from paddle.fluid.framework import _test_eager_guard
 from paddle.fluid.optimizer import AdamOptimizer
 from paddle.nn import Linear
 
@@ -168,17 +167,6 @@ class TestMNISTWithToStatic(TestMNIST):
                 dygraph_loss, static_loss
             ),
         )
-        with _test_eager_guard():
-            dygraph_loss = self.train_dygraph()
-            static_loss = self.train_static()
-            np.testing.assert_allclose(
-                dygraph_loss,
-                static_loss,
-                rtol=1e-05,
-                err_msg='dygraph is {}\n static_res is \n{}'.format(
-                    dygraph_loss, static_loss
-                ),
-            )
 
     def test_mnist_declarative_cpu_vs_mkldnn(self):
         dygraph_loss_cpu = self.train_dygraph()
diff --git a/python/paddle/fluid/tests/unittests/dygraph_to_static/test_mnist_amp.py b/python/paddle/fluid/tests/unittests/dygraph_to_static/test_mnist_amp.py
index 01406215290..8dc16c0f458 100644
--- a/python/paddle/fluid/tests/unittests/dygraph_to_static/test_mnist_amp.py
+++ b/python/paddle/fluid/tests/unittests/dygraph_to_static/test_mnist_amp.py
@@ -106,5 +106,4 @@ class TestAMP(TestMNIST):
 
 
 if __name__ == '__main__':
-    with paddle.fluid.framework._test_eager_guard():
-        unittest.main()
+    unittest.main()
diff --git a/python/paddle/fluid/tests/unittests/dygraph_to_static/test_mnist_pure_fp16.py b/python/paddle/fluid/tests/unittests/dygraph_to_static/test_mnist_pure_fp16.py
index 683d097cc9e..39cdf40b035 100644
--- a/python/paddle/fluid/tests/unittests/dygraph_to_static/test_mnist_pure_fp16.py
+++ b/python/paddle/fluid/tests/unittests/dygraph_to_static/test_mnist_pure_fp16.py
@@ -120,5 +120,4 @@ class TestPureFP16(TestMNIST):
 
 
 if __name__ == '__main__':
-    with paddle.fluid.framework._test_eager_guard():
-        unittest.main()
+    unittest.main()
diff --git a/python/paddle/fluid/tests/unittests/dygraph_to_static/test_mobile_net.py b/python/paddle/fluid/tests/unittests/dygraph_to_static/test_mobile_net.py
index 06def97195e..d464c4b1d13 100644
--- a/python/paddle/fluid/tests/unittests/dygraph_to_static/test_mobile_net.py
+++ b/python/paddle/fluid/tests/unittests/dygraph_to_static/test_mobile_net.py
@@ -726,5 +726,4 @@ class TestMobileNet(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_multi_forward.py b/python/paddle/fluid/tests/unittests/dygraph_to_static/test_multi_forward.py
index 17a9a661dd4..10039c4882a 100644
--- a/python/paddle/fluid/tests/unittests/dygraph_to_static/test_multi_forward.py
+++ b/python/paddle/fluid/tests/unittests/dygraph_to_static/test_multi_forward.py
@@ -15,7 +15,6 @@
 import unittest
 
 import paddle
-import paddle.fluid as fluid
 
 
 class MyLayer(paddle.nn.Layer):
@@ -63,5 +62,4 @@ class TestBackward(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_program_translator.py b/python/paddle/fluid/tests/unittests/dygraph_to_static/test_program_translator.py
index dd581526f4e..65d7d301cd5 100644
--- a/python/paddle/fluid/tests/unittests/dygraph_to_static/test_program_translator.py
+++ b/python/paddle/fluid/tests/unittests/dygraph_to_static/test_program_translator.py
@@ -439,5 +439,4 @@ class TestRemoveCommentInDy2St(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_ptb_lm.py b/python/paddle/fluid/tests/unittests/dygraph_to_static/test_ptb_lm.py
index 6f821265ca7..46970eaa27b 100644
--- a/python/paddle/fluid/tests/unittests/dygraph_to_static/test_ptb_lm.py
+++ b/python/paddle/fluid/tests/unittests/dygraph_to_static/test_ptb_lm.py
@@ -347,6 +347,4 @@ class TestPtb(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    # switch into new eager mode
-    with fluid.framework._test_eager_guard():
-        unittest.main()
+    unittest.main()
-- 
GitLab