diff --git a/python/paddle/fluid/executor.py b/python/paddle/fluid/executor.py index 2232c34e63bd003115f8d48b6840ff49d0b10ace..86b0d6560c927251b49d807dd1880867fd4c4bd0 100644 --- a/python/paddle/fluid/executor.py +++ b/python/paddle/fluid/executor.py @@ -395,7 +395,13 @@ def _is_enable_standalone_executor(): """ flag = False - env_val = os.environ.get('FLAGS_USE_STANDALONE_EXECUTOR', '1') + from ..distributed.fleet import fleet + if fleet._role_maker is not None: + warnings.warn("do not use standalone executor in fleet by default") + env_val = os.environ.get('FLAGS_USE_STANDALONE_EXECUTOR', None) + else: + env_val = os.environ.get('FLAGS_USE_STANDALONE_EXECUTOR', '1') + if env_val in [1, '1', True, 'True', 'true']: flag = True