hyf152
/
mindspore2022
forked from huawei/mindspore2022
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!26735 fix the bug of single thread execution stack overflow 

Merge pull request !26735 from limingqi107/r1.5_lmq
This commit is contained in:
i-robot 2021-11-26 04:30:40 +00:00 committed by Gitee
parent a33ed34ea7 8bc5692749
commit bb715d9986
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mindspore/ccsrc/runtime/framework/graph_scheduler.cc
View File

@ -392,7 +392,8 @@ void GraphScheduler::SetActorExecutionStrategy(ActorSet *const actor_set, GraphE
}
if ((actor_set->copy_actors_.size() > 0) ||
(actor_set->kernel_actors_.size() > ActorDispatcher::kSingleThreadExecutionActorMaxNum)) {
(actor_set->kernel_actors_.size() > ActorDispatcher::kSingleThreadExecutionActorMaxNum) ||
(actor_set->loop_count_actor_->loop_count_ > 1)) {
return;
}
@ -403,7 +404,6 @@ void GraphScheduler::SetActorExecutionStrategy(ActorSet *const actor_set, GraphE
if (actor_set->execution_count_ == ActorDispatcher::kMultiThreadExecutionCountEnd) {
actor_set->multi_thread_execution_time_ /=
(ActorDispatcher::kMultiThreadExecutionCountEnd - ActorDispatcher::kMultiThreadExecutionCountBegin + 1);
actor_set->multi_thread_execution_time_ /= actor_set->loop_count_actor_->loop_count_;
actor_set->is_multi_thread_execution_ = false;
}
return;
@ -416,7 +416,6 @@ void GraphScheduler::SetActorExecutionStrategy(ActorSet *const actor_set, GraphE
if (actor_set->execution_count_ == ActorDispatcher::kSingleThreadExecutionCountEnd) {
actor_set->single_thread_execution_time_ /=
(ActorDispatcher::kSingleThreadExecutionCountEnd - ActorDispatcher::kSingleThreadExecutionCountBegin + 1);
actor_set->single_thread_execution_time_ /= actor_set->loop_count_actor_->loop_count_;
actor_set->is_multi_thread_execution_ =
(actor_set->multi_thread_execution_time_ <= actor_set->single_thread_execution_time_) ? true : false;
MS_LOG(INFO) << "Multi thread execution time cost: " << actor_set->multi_thread_execution_time_