From 3db62b79ead49c46c2d2427dea7a40098f45017c Mon Sep 17 00:00:00 2001 From: ZPaC Date: Fri, 28 Jan 2022 15:38:02 +0800 Subject: [PATCH] Unify server and scheduler exit funcition --- mindspore/ccsrc/ps/scheduler.cc | 1 - mindspore/python/mindspore/train/model.py | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/mindspore/ccsrc/ps/scheduler.cc b/mindspore/ccsrc/ps/scheduler.cc index aa066fb1698..0e03bbac3c2 100755 --- a/mindspore/ccsrc/ps/scheduler.cc +++ b/mindspore/ccsrc/ps/scheduler.cc @@ -35,7 +35,6 @@ void Scheduler::Run() { if (!scheduler_node_->Stop()) { MS_LOG(WARNING) << "Scheduler stop failed."; } - exit(1); } } // namespace ps } // namespace mindspore diff --git a/mindspore/python/mindspore/train/model.py b/mindspore/python/mindspore/train/model.py index 3f1e0c9a879..30e41f2daa3 100644 --- a/mindspore/python/mindspore/train/model.py +++ b/mindspore/python/mindspore/train/model.py @@ -616,7 +616,7 @@ class Model: outputs = train_network(*inputs) cb_params.net_outputs = outputs list_callback.step_end(run_context) - if _is_role_pserver(): + if _is_role_pserver() or _is_role_sched(): os._exit(0) dataset_helper.continue_send() @@ -680,7 +680,7 @@ class Model: self._loss_scale_manager.update_loss_scale(overflow) list_callback.step_end(run_context) - if _is_role_pserver(): + if _is_role_pserver() or _is_role_sched(): os._exit(0) should_stop = should_stop or run_context.get_stop_requested() if should_stop: