delete FLAGS_enable_eager_mode (#49036)

* delete FLAGS_enable_eager_mode

python/paddle/autograd/py_layer.py

@@ -462,8 +462,6 @@ class EagerPyLayerContext:
         Examples:
             .. code-block:: python
 
-                import os
-                os.environ['FLAGS_enable_eager_mode'] = '1'
                 import paddle
                 from paddle.autograd import PyLayer
                 import numpy as np
@@ -503,8 +501,6 @@ class EagerPyLayerContext:
         Examples:
             .. code-block:: python
 
-                import os
-                os.environ['FLAGS_enable_eager_mode'] = '1'
                 import paddle
                 from paddle.autograd import PyLayer
                 import numpy as np

python/paddle/fluid/framework.py

@@ -71,7 +71,7 @@ ZERO_VAR_SUFFIX = core.kZeroVarSuffix()
 CONTROL_DEP_VAR_PREFIX = core.kControlDepVarName()
 
 _dygraph_tracer_ = None
-_in_eager_mode_ = os.environ.get('FLAGS_enable_eager_mode', '1') == '1'
+_in_eager_mode_ = True
 _global_expected_place_ = None
 _current_device = None
 global_prog_seed = 0

python/paddle/fluid/tests/custom_runtime/test_collective_process_group_xccl.py

@@ -57,9 +57,6 @@ def start_local_trainers(
             "PADDLE_DISTRI_CUSTOM_DEVICE_TYPE": "custom_cpu",
         }
 
-        if not eager_mode:
-            proc_env["FLAGS_enable_eager_mode"] = "%d" % 0
-
         current_env.update(proc_env)
 
         print("trainer proc env:{}".format(current_env))

python/paddle/fluid/tests/unittests/CMakeLists.txt

@@ -517,7 +517,7 @@ endforeach()
 set(TEST_EAGER_OPS test_jit_save_load test_translated_layer)
 foreach(TEST_OP ${TEST_EAGER_OPS})
   list(REMOVE_ITEM TEST_OPS ${TEST_OP})
-  py_test_modules(${TEST_OP} MODULES ${TEST_OP} ENVS FLAGS_enable_eager_mode=1)
+  py_test_modules(${TEST_OP} MODULES ${TEST_OP})
 endforeach()
 
 if((NOT WITH_GPU)
@@ -1256,10 +1256,6 @@ py_test_modules(
 set_tests_properties(test_add_reader_dependency_for_interpretercore
                      PROPERTIES TIMEOUT 120)
 
-py_test_modules(test_renorm_op_without_eager MODULES test_renorm_op ENVS
-                FLAGS_enable_eager_mode=0)
-
-set_tests_properties(test_renorm_op_without_eager PROPERTIES TIMEOUT 120)
 py_test_modules(
   test_eager_deletion_padding_rnn_for_interpretercore MODULES
   test_eager_deletion_padding_rnn ENVS FLAGS_CONVERT_GRAPH_TO_PROGRAM=true)

python/paddle/fluid/tests/unittests/collective/fleet/CMakeLists.txt

@@ -51,20 +51,6 @@ if(WITH_NCCL)
                                                                        "120")
   endif()
 endif()
-if(WITH_NCCL)
-  if((WITH_GPU) AND LOCAL_ALL_PLAT)
-    bash_test_modules(
-      test_dygraph_sharding_stage3
-      START_BASH
-      ../../dist_test.sh
-      LABELS
-      "RUN_TYPE=DIST"
-      ENVS
-      "PADDLE_DIST_UT_PORT=21202;http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python"
-    )
-    set_tests_properties(test_dygraph_sharding_stage3 PROPERTIES TIMEOUT "350")
-  endif()
-endif()
 if(WITH_NCCL)
   if(${NCCL_VERSION} VERSION_GREATER_EQUAL 2212)
     if((WITH_GPU) AND LOCAL_ALL_PLAT)
@@ -401,19 +387,6 @@ if(LOCAL_ALL_ARCH AND (LINUX OR WIN32))
     test_fleet_amp_init MODULES test_fleet_amp_init ENVS
     "http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python")
 endif()
-if(LOCAL_ALL_ARCH AND LOCAL_ALL_PLAT)
-  bash_test_modules(
-    test_dygraph_sharding_optimizer_stage2
-    START_BASH
-    ../../dist_test.sh
-    LABELS
-    "RUN_TYPE=DIST"
-    ENVS
-    "PADDLE_DIST_UT_PORT=21238;http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python"
-  )
-  set_tests_properties(test_dygraph_sharding_optimizer_stage2 PROPERTIES TIMEOUT
-                                                                         "120")
-endif()
 if(LOCAL_ALL_ARCH AND (LINUX OR WIN32))
   py_test_modules(
     test_fleet_meta_optimizer_base MODULES test_fleet_meta_optimizer_base ENVS
@@ -667,18 +640,6 @@ if((WITH_GPU
     test_fleet_recompute_meta_optimizer ENVS
     "http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python")
 endif()
-if(LOCAL_ALL_ARCH AND LOCAL_ALL_PLAT)
-  bash_test_modules(
-    test_dygraph_group_sharded_api
-    START_BASH
-    ../../dist_test.sh
-    LABELS
-    "RUN_TYPE=DIST"
-    ENVS
-    "PADDLE_DIST_UT_PORT=21266;http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python"
-  )
-  set_tests_properties(test_dygraph_group_sharded_api PROPERTIES TIMEOUT "120")
-endif()
 if(LOCAL_ALL_ARCH AND (LINUX OR WIN32))
   py_test_modules(
     test_fleet_private_function MODULES test_fleet_private_function ENVS
@@ -760,14 +721,6 @@ if((WITH_GPU OR WITH_ROCM) AND LOCAL_ALL_PLAT)
   set_tests_properties(test_parallel_dygraph_sync_batch_norm
                        PROPERTIES TIMEOUT "120" LABELS "RUN_TYPE=DIST")
 endif()
-if((WITH_GPU OR WITH_ROCM) AND LOCAL_ALL_PLAT)
-  py_test_modules(
-    test_imperative_auto_mixed_precision MODULES
-    test_imperative_auto_mixed_precision ENVS
-    "http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python")
-  set_tests_properties(test_imperative_auto_mixed_precision
-                       PROPERTIES TIMEOUT "300" LABELS "RUN_TYPE=DIST")
-endif()
 if((WITH_GPU OR WITH_ROCM) AND LOCAL_ALL_PLAT)
   py_test_modules(
     test_imperative_auto_mixed_precision_for_eager MODULES
@@ -781,11 +734,6 @@ if((WITH_GPU OR WITH_ROCM) AND LOCAL_ALL_PLAT)
     test_mixed_precision MODULES test_mixed_precision ENVS
     "http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python")
 endif()
-if((WITH_GPU OR WITH_ROCM) AND LOCAL_ALL_PLAT)
-  py_test_modules(
-    test_dygraph_recompute MODULES test_dygraph_recompute ENVS
-    "http_proxy=;https_proxy=;PYTHONPATH=../..:${PADDLE_BINARY_DIR}/python")
-endif()
 if((WITH_GPU OR WITH_ROCM) AND LOCAL_ALL_PLAT)
   py_test_modules(
     test_dygraph_recompute_for_eager MODULES test_dygraph_recompute_for_eager

python/paddle/fluid/tests/unittests/collective/fleet/test_dygraph_dist_save_load.py

@@ -33,6 +33,5 @@ class TestDistSaveLoad(unittest.TestCase):
 
 
 if __name__ == "__main__":
-    os.environ["FLAGS_enable_eager_mode"] = "1"
     os.environ["CUDA_VISIBLE_DEVICES"] = "0,1"
     unittest.main()

python/paddle/fluid/tests/unittests/collective/fleet/test_dygraph_group_sharded_api.py

-# Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import os
-
-os.environ['FLAGS_enable_eager_mode'] = '0'
-
-import unittest
-
-from test_parallel_dygraph_dataparallel import TestMultipleGpus
-
-
-class TestDygraphGroupSharded(TestMultipleGpus):
-
-    # check group sharded logic as well as the accuracy with single mode
-    def test_dygraph_group_sharded(self):
-        self.run_mnist_2gpu('dygraph_group_sharded_api.py', eager_mode=False)
-
-
-if __name__ == "__main__":
-    unittest.main()

python/paddle/fluid/tests/unittests/collective/fleet/test_dygraph_group_sharded_api_for_eager.py

@@ -12,10 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import os
-
-os.environ['FLAGS_enable_eager_mode'] = '1'
-
 import unittest
 
 from test_parallel_dygraph_dataparallel import TestMultipleGpus

python/paddle/fluid/tests/unittests/collective/fleet/test_dygraph_recompute_for_eager.py

@@ -12,10 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import os
-
-os.environ['FLAGS_enable_eager_mode'] = '1'
-
 import random
 import unittest
 

python/paddle/fluid/tests/unittests/collective/fleet/test_dygraph_save_for_auto_infer.py

@@ -44,6 +44,5 @@ class TestSingleCard(unittest.TestCase):
 
 
 if __name__ == "__main__":
-    os.environ["FLAGS_enable_eager_mode"] = "1"
     os.environ["CUDA_VISIBLE_DEVICES"] = "0,1"
     unittest.main()

python/paddle/fluid/tests/unittests/collective/fleet/test_dygraph_sharding_optimizer_stage2.py

-# Copyright (c) 2021 PaddlePaddle Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import unittest
-
-from test_parallel_dygraph_dataparallel import TestMultipleGpus
-
-
-class TestDygraphShardingOptimizerStage2(TestMultipleGpus):
-
-    # check sharding logic as well as the accuracy with single mode
-    def test_dygraph_sharding_optimizer_stage2(self):
-        self.run_mnist_2gpu(
-            'dygraph_sharding_optimizer_stage2.py', eager_mode=False
-        )
-
-
-if __name__ == "__main__":
-    unittest.main()

python/paddle/fluid/tests/unittests/collective/fleet/test_dygraph_sharding_stage2.py

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import os
 import unittest
 
 from test_parallel_dygraph_dataparallel import TestMultipleGpus
@@ -23,18 +22,13 @@ class TestDygraphShardingStage2(TestMultipleGpus):
     # check sharding logic as well as the accuracy with single mode
     def test_dygraph_sharding_stage2(self):
         self.run_mnist_2gpu('dygraph_group_sharded_stage2.py')
-        self.run_mnist_2gpu('dygraph_sharding_stage2.py', eager_mode=False)
 
     def test_dygraph_sharding_stage2_offload(self):
         self.run_mnist_2gpu('dygraph_group_sharded_stage2_offload.py')
-        self.run_mnist_2gpu(
-            'dygraph_sharding_stage2_offload.py', eager_mode=False
-        )
 
     def test_dygraph_sharding_stage2_with_comm_overlap(self):
         self.run_mnist_2gpu('dygraph_group_sharded_stage2_comm_overlap.py')
 
 
 if __name__ == "__main__":
-    os.environ["FLAGS_enable_eager_mode"] = "1"
     unittest.main()

python/paddle/fluid/tests/unittests/collective/fleet/test_dygraph_sharding_stage3.py

-# Copyright (c) 2021 PaddlePaddle Authors. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import os
-
-os.environ['FLAGS_enable_eager_mode'] = '0'
-
-import unittest
-
-from test_parallel_dygraph_dataparallel import TestMultipleGpus
-
-
-class TestDygraphShardingStage3(TestMultipleGpus):
-
-    # check sharding logic as well as the accuracy with single mode
-    def test_dygraph_sharding_stage3(self):
-        self.run_mnist_2gpu('dygraph_sharding_stage3.py', eager_mode=False)
-
-    def test_dygraph_sharding_stage3_offload(self):
-        self.run_mnist_2gpu(
-            'dygraph_sharding_stage3_offload.py', eager_mode=False
-        )
-
-
-if __name__ == "__main__":
-    unittest.main()

python/paddle/fluid/tests/unittests/collective/fleet/test_dygraph_sharding_stage3_for_eager.py

@@ -12,11 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import os
-
-os.environ['FLAGS_enable_eager_mode'] = '1'
-
-import os
 import unittest
 
 from test_parallel_dygraph_dataparallel import TestMultipleGpus
@@ -33,5 +28,4 @@ class TestDygraphShardingStage3(TestMultipleGpus):
 
 
 if __name__ == "__main__":
-    os.environ["FLAGS_enable_eager_mode"] = "1"
     unittest.main()

python/paddle/fluid/tests/unittests/collective/fleet/test_imperative_auto_mixed_precision_for_eager.py

@@ -13,9 +13,6 @@
 # limitations under the License.
 
 import os
-
-os.environ['FLAGS_enable_eager_mode'] = '1'
-
 import tempfile
 import unittest
 

python/paddle/fluid/tests/unittests/collective/fleet/test_parallel_class_center_sample.py

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import os
 import unittest
 
 from test_parallel_dygraph_dataparallel import TestMultipleGpus
@@ -25,5 +24,4 @@ class TestParallelClassCenterSample(TestMultipleGpus):
 
 
 if __name__ == "__main__":
-    os.environ["FLAGS_enable_eager_mode"] = "1"
     unittest.main()

python/paddle/fluid/tests/unittests/collective/fleet/test_parallel_dygraph_mp_layers.py

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import os
 import unittest
 
 from test_parallel_dygraph_dataparallel import TestMultipleGpus
@@ -25,5 +24,4 @@ class TestModelParallelLayer(TestMultipleGpus):
 
 
 if __name__ == "__main__":
-    os.environ["FLAGS_enable_eager_mode"] = "1"
     unittest.main()

python/paddle/fluid/tests/unittests/collective/fleet/test_parallel_dygraph_no_sync_gradient_check.py

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import os
 import unittest
 
 from test_parallel_dygraph_dataparallel import TestMultipleGpus
@@ -27,5 +26,4 @@ class TestDataParallelLayer(TestMultipleGpus):
 
 
 if __name__ == "__main__":
-    os.environ["FLAGS_enable_eager_mode"] = "1"
     unittest.main()

python/paddle/fluid/tests/unittests/collective/fleet/test_parallel_dygraph_pipeline_parallel.py

@@ -73,5 +73,4 @@ class TestHybridPipeParallel(TestMultipleGpus):
 
 
 if __name__ == "__main__":
-    os.environ["FLAGS_enable_eager_mode"] = "1"
     unittest.main()

python/paddle/fluid/tests/unittests/collective/fleet/test_parallel_dygraph_pipeline_parallel_with_virtual_stage.py

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import os
 import unittest
 
 from test_parallel_dygraph_dataparallel import TestMultipleGpus
@@ -34,5 +33,4 @@ class TestHybridPipeParallelWithVirtualStage(TestMultipleGpus):
 
 
 if __name__ == "__main__":
-    os.environ["FLAGS_enable_eager_mode"] = "1"
     unittest.main()

python/paddle/fluid/tests/unittests/collective/fleet/test_parallel_dygraph_qat.py

@@ -78,9 +78,6 @@ def start_local_trainers(
             "PADDLE_TRAINER_ENDPOINTS": ",".join(cluster.trainers_endpoints()),
         }
 
-        if not eager_mode:
-            proc_env["FLAGS_enable_eager_mode"] = "%d" % 0
-
         current_env.update(proc_env)
 
         print("trainer proc env:{}".format(current_env))

python/paddle/fluid/tests/unittests/collective/fleet/test_parallel_dygraph_sharding_parallel.py

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import os
 import unittest
 
 from test_parallel_dygraph_dataparallel import TestMultipleGpus
@@ -29,5 +28,4 @@ class TestHybridParallel(TestMultipleGpus):
 
 
 if __name__ == "__main__":
-    os.environ["FLAGS_enable_eager_mode"] = "1"
     unittest.main()

python/paddle/fluid/tests/unittests/collective/fleet/test_parallel_dygraph_tensor_parallel.py

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import os
 import unittest
 
 from test_parallel_dygraph_dataparallel import TestMultipleGpus
@@ -41,5 +40,4 @@ class TestHybridParallel(TestMultipleGpus):
 
 
 if __name__ == "__main__":
-    os.environ["FLAGS_enable_eager_mode"] = "1"
     unittest.main()

python/paddle/fluid/tests/unittests/collective/fleet/test_parallel_margin_cross_entropy.py

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import os
 import unittest
 
 from test_parallel_dygraph_dataparallel import TestMultipleGpus
@@ -27,5 +26,4 @@ class TestParallelMarginSoftmaxWithCrossEntropy(TestMultipleGpus):
 
 
 if __name__ == "__main__":
-    os.environ["FLAGS_enable_eager_mode"] = "1"
     unittest.main()

python/paddle/fluid/tests/unittests/collective/fleet/testslist.csv

@@ -4,7 +4,6 @@ test_fleet_static_mp_layers,LINUX;WIN32,,,,test_runner.py,2,,http_proxy=;https_p
 test_dgc_op,,,,,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=../..,WITH_DGC
 test_dgc_optimizer,,,,,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=../..,WITH_DGC
 test_parallel_margin_cross_entropy,,GPU,120,DIST,../../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../..,WITH_NCCL
-test_dygraph_sharding_stage3,,GPU,350,DIST,../../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../..,WITH_NCCL
 test_parallel_dygraph_transformer,,GPU,,DIST,../../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../..,WITH_NCCL;${NCCL_VERSION} VERSION_GREATER_EQUAL 2212
 test_parallel_dygraph_transformer,,ROCM,,DIST,../../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../..,
 test_fleet_fp16_allreduce_meta_optimizer,LINUX;WIN32,,,,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=../..,
@@ -34,7 +33,6 @@ test_communicator_sync,,,,,test_runner.py,2,,FLAGS_communicator_send_queue_size=
 test_fleet_pipeline_meta_optimizer,,GPU;XPU;ASCEND;ASCEND_CL,,DIST,../../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../..,
 test_fleet_gradient_merge_meta_optimizer,,GPU;XPU;ASCEND;ASCEND_CL,,,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=../..,
 test_fleet_amp_init,LINUX;WIN32,,,,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=../..,
-test_dygraph_sharding_optimizer_stage2,,,120,DIST,../../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../..,
 test_fleet_meta_optimizer_base,LINUX;WIN32,,,,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=../..,
 test_fleet_raw_program_meta_optimizer,,GPU;XPU;ASCEND;ASCEND_CL,,DIST,../../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../..,
 test_parallel_dygraph_sharding_parallel,,,120,DIST,../../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../..,
@@ -57,7 +55,6 @@ test_parallel_dygraph_sparse_embedding_over_height,,ROCM,350,DIST,../../dist_tes
 test_distributed_strategy,LINUX;APPLE,,,,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=../..,
 test_auto_parallel_parallelizer,,,120,DIST,../../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../..,
 test_fleet_recompute_meta_optimizer,LINUX;WIN32,GPU;XPU;ASCEND;ASCEND_CL,,,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=../..,
-test_dygraph_group_sharded_api,,,120,DIST,../../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../..,
 test_fleet_private_function,LINUX;WIN32,,,,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=../..,
 test_new_group,,GPU;XPU;ASCEND;ASCEND_CL,,DIST,test_new_group.sh,2,,http_proxy=;https_proxy=,
 test_c_comm_init_op,LINUX,GPU;XPU;ASCEND;ASCEND_CL,120,DIST,test_c_comm_init_op.sh,2,,http_proxy=;https_proxy=,
@@ -65,10 +62,8 @@ test_ir_pass_pipeline,,,120,DIST,../../dist_test.sh,2,,http_proxy=;https_proxy=;
 test_parallel_dygraph_mnist,,GPU;ROCM,200,DIST,../../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../..,
 test_parallel_dygraph_se_resnext,,GPU;ROCM,200,DIST,../../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../..,
 test_parallel_dygraph_sync_batch_norm,,GPU;ROCM,120,DIST,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=../..,
-test_imperative_auto_mixed_precision,,GPU;ROCM,300,DIST,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=../..,
 test_imperative_auto_mixed_precision_for_eager,,GPU;ROCM,300,DIST,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=../..,
 test_mixed_precision,,GPU;ROCM,,,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=../..,
-test_dygraph_recompute,,GPU;ROCM,,,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=../..,
 test_dygraph_recompute_for_eager,,GPU;ROCM,,,test_runner.py,2,,http_proxy=;https_proxy=;PYTHONPATH=../..,
 test_dist_mnist_dgc_nccl,,,,DIST,../../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../..,WITH_NCCL OR WITH_RCCL;WITH_DGC
 test_dist_se_resnext_dgc,,,,DIST,../../dist_test.sh,2,,http_proxy=;https_proxy=;PYTHONPATH=../..,WITH_NCCL OR WITH_RCCL;WITH_DGC

python/paddle/fluid/tests/unittests/collective/multinode/test_collective_multi_nodes.py

@@ -77,10 +77,6 @@ class TestDistBase(unittest.TestCase):
             required_envs["GLOG_logtostderr"] = "1"
             required_envs["GLOO_LOG_LEVEL"] = "TRACE"
 
-        if eager_mode:
-            required_envs["FLAGS_enable_eager_mode"] = "%d" % 1
-        else:
-            required_envs["FLAGS_enable_eager_mode"] = "%d" % 0
         self._run_cluster(model_file, required_envs)
 
     def _run_cluster(self, model_file, envs):

python/paddle/fluid/tests/unittests/collective/test_collective_alltoall_single.py

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import os
 import unittest
 
 from test_parallel_dygraph_dataparallel import TestMultipleGpus
@@ -24,5 +23,4 @@ class TestCollectiveAllToAllSingle(TestMultipleGpus):
 
 
 if __name__ == "__main__":
-    os.environ["FLAGS_enable_eager_mode"] = "1"
     unittest.main()

python/paddle/fluid/tests/unittests/collective/test_collective_batch_isend_irecv.py

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import os
 import unittest
 
 from test_parallel_dygraph_dataparallel import TestMultipleGpus
@@ -24,5 +23,4 @@ class TestCollectiveBatchIsendIrecv(TestMultipleGpus):
 
 
 if __name__ == "__main__":
-    os.environ["FLAGS_enable_eager_mode"] = "1"
     unittest.main()

python/paddle/fluid/tests/unittests/collective/test_collective_reduce_scatter.py

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import os
 import unittest
 
 from test_parallel_dygraph_dataparallel import TestMultipleGpus
@@ -24,5 +23,4 @@ class TestCollectiveReduceScatter(TestMultipleGpus):
 
 
 if __name__ == "__main__":
-    os.environ["FLAGS_enable_eager_mode"] = "1"
     unittest.main()

python/paddle/fluid/tests/unittests/dygraph_to_static/CMakeLists.txt

@@ -4,7 +4,7 @@ file(
   "test_*.py")
 string(REPLACE ".py" "" TEST_OPS "${TEST_OPS}")
 set(GC_ENVS FLAGS_eager_delete_tensor_gb=0.0)
-set(DY2ST_EAGER_TEST_ENVS ${GC_ENVS} FLAGS_enable_eager_mode=1)
+set(DY2ST_EAGER_TEST_ENVS ${GC_ENVS})
 
 set(TEST_EAGER_OPS
     test_bmn
@@ -35,7 +35,7 @@ list(REMOVE_ITEM TEST_OPS test_lac)
 # NOTE(Aurelius84): In case of Windows CI, if open ON_INFER, RWLOCK of Scope
 # will be removed and will cause some random failed in multi-thread.
 if(WITH_PYTHON)
-  py_test_modules(test_lac MODULES test_lac ENVS FLAGS_enable_eager_mode=1)
+  py_test_modules(test_lac MODULES test_lac)
   set_tests_properties(test_lac PROPERTIES TIMEOUT 120)
 endif()
 

python/paddle/fluid/tests/unittests/dygraph_to_static/test_resnet_v2.py

@@ -12,10 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import os
-
-os.environ["FLAGS_enable_eager_mode"] = "0"
 import math
+import os
 import tempfile
 import time
 import unittest

python/paddle/fluid/tests/unittests/test_collective_api_base.py

@@ -327,11 +327,6 @@ class TestDistBase(unittest.TestCase):
                 'NVIDIA_TF32_OVERRIDE', ''
             )
 
-        if eager_mode:
-            required_envs["FLAGS_enable_eager_mode"] = "%d" % 1
-        else:
-            required_envs["FLAGS_enable_eager_mode"] = "%d" % 0
-
         tr0_out, tr1_out, pid0, pid1 = self._run_cluster(
             model_file, required_envs
         )

python/paddle/fluid/tests/unittests/test_parallel_dygraph_dataparallel.py

@@ -124,9 +124,6 @@ def start_local_trainers(
             "PADDLE_TRAINER_ENDPOINTS": ",".join(cluster.trainers_endpoints()),
         }
 
-        if not eager_mode:
-            proc_env["FLAGS_enable_eager_mode"] = "%d" % 0
-
         proc_env["FLAGS_allocator_strategy"] = allocator_strategy
         if allocator_strategy == "auto_growth":
             proc_env["FLAGS_fraction_of_gpu_memory_to_use"] = "0.1"
@@ -241,5 +238,4 @@ class TestGradientCheckInEagerMode(TestMultipleGpus):
 
 
 if __name__ == "__main__":
-    os.environ["FLAGS_enable_eager_mode"] = "1"
     unittest.main()

python/paddle/fluid/tests/unittests/xpu/test_parallel_dygraph_dataparallel.py

@@ -80,9 +80,6 @@ def start_local_trainers(
             "PADDLE_TRAINER_ENDPOINTS": ",".join(cluster.trainers_endpoints()),
         }
 
-        if not eager_mode:
-            proc_env["FLAGS_enable_eager_mode"] = "%d" % 0
-
         current_env.update(proc_env)
 
         print("trainer proc env:{}".format(current_env))
@@ -152,7 +149,6 @@ class TestGradientCheckInEagerMode(TestMultipleXpus):
 
 
 if __name__ == "__main__":
-    os.environ["FLAGS_enable_eager_mode"] = "1"
     os.environ["BKCL_PCIE_RING"] = "1"
     os.environ["BKCL_CCIX_RING"] = "0"
     unittest.main()

python/paddle/jit/api.py

@@ -1558,8 +1558,6 @@ class TracedLayer:
         Examples:
             .. code-block:: python:
 
-                import os
-                os.environ['FLAGS_enable_eager_mode'] = '0'
                 import paddle
 
                 class ExampleLayer(paddle.nn.Layer):
@@ -1610,8 +1608,6 @@ class TracedLayer:
         Examples:
             .. code-block:: python:
 
-                import os
-                os.environ['FLAGS_enable_eager_mode'] = '0'
                 import paddle
 
                 class ExampleLayer(paddle.nn.Layer):
@@ -1716,8 +1712,6 @@ class TracedLayer:
         Examples:
             .. code-block:: python:
 
-                import os
-                os.environ['FLAGS_enable_eager_mode'] = '0'
                 import numpy as np
                 import paddle
 

python/paddle/tests/test_dist_hapi_model.py

@@ -78,9 +78,6 @@ def start_local_trainers(
             "PADDLE_TRAINER_ENDPOINTS": ",".join(cluster.trainers_endpoints()),
         }
 
-        if not eager_mode:
-            proc_env["FLAGS_enable_eager_mode"] = "%d" % 0
-
         current_env.update(proc_env)
 
         print("trainer proc env:{}".format(current_env))
@@ -148,5 +145,4 @@ class TestMultipleGpus(unittest.TestCase):
 
 
 if __name__ == "__main__":
-    os.environ["FLAGS_enable_eager_mode"] = "1"
     unittest.main()

tools/final_ut_parallel_rule.py

@@ -47,7 +47,6 @@ def classify_cases_by_mem(rootPath):
 
     case_exec_200 = [
         'test_post_training_quantization_mnist',
-        'test_imperative_auto_mixed_precision',
         'test_trt_dynamic_shape_ernie_fp16_ser_deser',
         'test_trt_dynamic_shape_ernie',
         'test_layer_norm_op',

tools/parallel_UT_rule.py

@@ -1033,7 +1033,6 @@ FOURTH_HIGH_PARALLEL_JOB_NEW = [
     'test_elementwise_div_grad_grad',
     'test_minus_op',
     'test_shard_index_op',
-    'test_dygraph_recompute',
     'test_momentum_op',
     'test_modelaverage',
     'test_compare_reduce_op',
@@ -2406,7 +2405,6 @@ TETRAD_PARALLEL_JOB = [
     'test_matrix_rank_op',
     'test_margin_cross_entropy_op',
     'test_elementwise_pow_op',
-    'test_dygraph_recompute',
     'test_qr_op',
     'test_dygraph_spectral_norm',
     'test_cumsum_op',

tools/windows/run_unittests.sh

@@ -239,7 +239,6 @@ long_time_test="^test_gru_op$|\
 ^test_sequence_conv$|\
 ^test_sgd_op$|\
 ^test_transformer$|\
-^test_imperative_auto_mixed_precision$|\
 ^test_trt_matmul_quant_dequant$|\
 ^test_strided_slice_op$"