From a0bfca48f56fb83d082d5e42be9faa90e6e3e04e Mon Sep 17 00:00:00 2001 From: yjjiang11 Date: Tue, 6 Dec 2022 09:16:39 +0000 Subject: [PATCH] rm dygraph_to_static eager guard tests part3 reinforce2yolo --- .../dygraph_to_static/test_reinforcement_learning.py | 3 +-- .../fluid/tests/unittests/dygraph_to_static/test_resnet.py | 4 +--- .../tests/unittests/dygraph_to_static/test_resnet_amp.py | 3 +-- .../unittests/dygraph_to_static/test_resnet_pure_fp16.py | 3 +-- .../fluid/tests/unittests/dygraph_to_static/test_se_resnet.py | 4 +--- .../fluid/tests/unittests/dygraph_to_static/test_sentiment.py | 3 +-- .../fluid/tests/unittests/dygraph_to_static/test_seq2seq.py | 4 +--- .../fluid/tests/unittests/dygraph_to_static/test_simnet.py | 4 +--- .../tests/unittests/dygraph_to_static/test_transformer.py | 4 +--- .../fluid/tests/unittests/dygraph_to_static/test_tsm.py | 4 +--- .../fluid/tests/unittests/dygraph_to_static/test_typehint.py | 3 +-- .../fluid/tests/unittests/dygraph_to_static/test_word2vec.py | 3 +-- .../fluid/tests/unittests/dygraph_to_static/test_yolov3.py | 3 +-- 13 files changed, 13 insertions(+), 32 deletions(-) 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 13aace20031b38..c97d37d3523a82 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 @@ def test_train(self): 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 821195c2cb0edc..f59dee857a8234 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 @@ def test_in_static_mode_mkldnn(self): 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 4ce379a7043c2a..db52ef9b915cd0 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 @@ def test_resnet(self): 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 21d081b00978e4..54687044026a29 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 @@ def test_resnet(self): 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 bce8c3a742d4a5..34ae0cd19a7eeb 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 @@ def test_check_result(self): 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 e259ce5cf2e479..12e5099f257fe7 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 @@ def test_train(self): 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 4a83495987cac7..a0a45ddbde2bea 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 @@ def test_attn_model(self): 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 394783565309d0..f5ce0774d29206 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 @@ def test_dygraph_static_same_loss(self): 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 8d62d17537dc22..e603bebd285d00 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 @@ def test_check_result(self): 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 f1bd4fa4af998e..b66a3ed21f47ae 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 @@ def test_dygraph_static_same_loss(self): 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 fa141482b5413f..2283c77bfb8deb 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 @@ def _init_dyfunc(self): 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 22a62d64cbbb5a..13f1a9b882fed3 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 @@ def test_dygraph_static_same_loss(self): 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 7168708f1c739a..0da45601ea4afc 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 @@ def test_dygraph_static_same_loss(self): if __name__ == '__main__': - with fluid.framework._test_eager_guard(): - unittest.main() + unittest.main()