!17030 [MS][LITE][CPU]pr 合入冲突

From: @lzkcode
Reviewed-by: @zhanghaibo5,@zhang_xue_tong
Signed-off-by: @zhang_xue_tong
This commit is contained in:
mindspore-ci-bot 2021-05-26 19:25:12 +08:00 committed by Gitee
commit ca57b77c85
1 changed files with 2 additions and 2 deletions

View File

@ -166,8 +166,8 @@ int ConvolutionDepthwiseSWCPUKernelX86::Run() {
packed_output_ = output_ptr;
}
ret = ParallelLaunch(static_cast<const lite::InnerContext *>(this->context_)->thread_pool_, ConvDwSWAvxRun, this,
conv_param_->thread_num_);
ret = static_cast<const lite::InnerContext *>(this->context_)
->thread_pool_->ParallelLaunch(ConvDwSWAvxRun, this, conv_param_->thread_num_);
if (ret != RET_OK) {
MS_LOG(ERROR) << "ConvDwSWAvxRun error: error_code[" << ret << "]";
}