Browse Source

Pre Merge pull request !2011 from wangjiming/r1.5.0

pull/2011/MERGE
wangjiming Gitee 3 years ago
parent
commit
8f7b65efe9
2 changed files with 8 additions and 0 deletions
  1. +7
    -0
      ge/common/helper/model_cache_helper.cc
  2. +1
    -0
      ge/hybrid/node_executor/hccl/hccl_node_executor.cc

+ 7
- 0
ge/common/helper/model_cache_helper.cc View File

@@ -1679,6 +1679,13 @@ Status ModelCacheHelper::LoadOmModelFromCache(GeModelPtr &ge_model) const {
GELOGW("LoadOmModelFromCache: Load model from file failed. ret = %u", ret);
return ret;
}
std::function<void()> callback = [&]() {
if (model_data.model_data != nullptr) {
delete[] reinterpret_cast<char *>(model_data.model_data);
model_data.model_data = nullptr;
}
};
GE_MAKE_GUARD(release, callback);

ModelHelper model_helper;
ret = model_helper.LoadModel(model_data);


+ 1
- 0
ge/hybrid/node_executor/hccl/hccl_node_executor.cc View File

@@ -445,6 +445,7 @@ Status AllToAllNodeTask::ExecuteAsync(TaskContext &context, std::function<void()
return FAILED;
}
HcomAllToAllVParams params;
params.group = nullptr;
GE_CHK_STATUS_RET(BuildAllToAllVparams(context, params));
HcclResult hccl_ret = HcomExecEnqueueAllToAllV(params, callback);
if (hccl_ret != HCCL_SUCCESS) {


Loading…
Cancel
Save