Nigel
/
mindspore
forked from mindspore-Ecosystem/mindspore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!7691 fix dynamic shape hccl context 

Merge pull request !7691 from yanghaoran/master
This commit is contained in:
mindspore-ci-bot 2020-10-25 12:33:22 +08:00 committed by Gitee
parent 9f3078bba8 cd7371831c
commit a418280659
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mindspore/ccsrc/runtime/device/ascend/ascend_kernel_runtime.cc
View File

@ -316,7 +316,17 @@ bool AscendKernelRuntime::Load(session::KernelGraph *graph, bool is_task_sink) {
if (!is_task_sink) {
return true;
}
rtCtxSetCurrent(rt_context_hccl_);
// Bind hccl context to current thread
if (graph->is_dynamic_shape()) {
if (rt_context_hccl_ != nullptr) {
auto ret = rtCtxSetCurrent(rt_context_hccl_);
if (ret != RT_ERROR_NONE) {
MS_LOG(EXCEPTION) << "Call rtCtxSetCurrent failed, ret[" << ret << "]";
}
}
}
// Do HcomExecutorInitialize
if (graph->is_dynamic_shape() && !HcclExecutorManager::GetInstance().Initialize()) {
MS_LOG(ERROR) << "Init Hccl Executor Failed";
@ -655,6 +665,7 @@ bool AscendKernelRuntime::InitDevice() {
ret = rtCtxGetCurrent(&rt_context_hccl_);
if (ret != RT_ERROR_NONE || rt_context_hccl_ == nullptr) {
MS_LOG(ERROR) << "Call rtCtxGetCurrent failed, ret[" << ret << "]";
return false;
}
ret = rtCtxCreate(&rt_context_, 0, device_id_);
@ -687,6 +698,10 @@ bool AscendKernelRuntime::ResetDevice() {
}
rt_context_ = nullptr;
}
// set to nullptr as its not created, only bounded to existing context
rt_context_hccl_ = nullptr;
return true;
}