Browse Source

Pre Merge pull request !2110 from wangyu/master

pull/2110/MERGE
wangyu Gitee 3 years ago
parent
commit
d0484146ae
1 changed files with 13 additions and 1 deletions
  1. +13
    -1
      ge/graph/load/model_manager/task_info/hccl_task_info.cc

+ 13
- 1
ge/graph/load/model_manager/task_info/hccl_task_info.cc View File

@@ -22,7 +22,7 @@
#include "framework/common/debug/ge_log.h"
#include "graph/load/model_manager/davinci_model.h"
#include "graph/load/model_manager/model_utils.h"
#include <stdlib.h>
namespace ge {
std::mutex HcclTaskInfo::hccl_follow_stream_mutex_;

@@ -299,6 +299,14 @@ Status HcclTaskInfo::SetAddrs(const std::shared_ptr<OpDesc> &op_desc,
input_data_addr = input_data_addrs.empty() ? nullptr : input_data_addrs[i];
output_data_addr = output_data_addrs.empty() ? nullptr : output_data_addrs[i];
}
std::cout << "hccl task info" << std::endl;
if (input_data_addr != nullptr) {
std::cout << "input " << input_data_addr << std::endl;
}
if (output_data_addr != nullptr) {
std::cout << "output " << output_data_addr << std::endl;
}

kernel_hccl_infos[i].inputDataAddr = input_data_addr;
if (hccl_type == HCOMALLGATHER || hccl_type == HCOMRECEIVE || hccl_type == HVDCALLBACKALLGATHER) {
kernel_hccl_infos[i].outputDataAddr = output_data_addr;
@@ -309,6 +317,10 @@ Status HcclTaskInfo::SetAddrs(const std::shared_ptr<OpDesc> &op_desc,
kernel_hccl_infos[i].outputDataAddr = output_data_addr;
kernel_hccl_infos[i].opType = op_type;
}
auto env = std::getenv("SKIP_OUTPUT");
if (env != nullptr) {
davinci_model_->DisableZeroCopy(output_data_addr);
}
davinci_model_->DisableZeroCopy(input_data_addr);
}
return SUCCESS;


Loading…
Cancel
Save