|
@@ -22,7 +22,7 @@ |
|
|
#include "framework/common/debug/ge_log.h" |
|
|
#include "framework/common/debug/ge_log.h" |
|
|
#include "graph/load/model_manager/davinci_model.h" |
|
|
#include "graph/load/model_manager/davinci_model.h" |
|
|
#include "graph/load/model_manager/model_utils.h" |
|
|
#include "graph/load/model_manager/model_utils.h" |
|
|
|
|
|
|
|
|
|
|
|
#include <stdlib.h> |
|
|
namespace ge { |
|
|
namespace ge { |
|
|
std::mutex HcclTaskInfo::hccl_follow_stream_mutex_; |
|
|
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]; |
|
|
input_data_addr = input_data_addrs.empty() ? nullptr : input_data_addrs[i]; |
|
|
output_data_addr = output_data_addrs.empty() ? nullptr : output_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; |
|
|
kernel_hccl_infos[i].inputDataAddr = input_data_addr; |
|
|
if (hccl_type == HCOMALLGATHER || hccl_type == HCOMRECEIVE || hccl_type == HVDCALLBACKALLGATHER) { |
|
|
if (hccl_type == HCOMALLGATHER || hccl_type == HCOMRECEIVE || hccl_type == HVDCALLBACKALLGATHER) { |
|
|
kernel_hccl_infos[i].outputDataAddr = output_data_addr; |
|
|
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].outputDataAddr = output_data_addr; |
|
|
kernel_hccl_infos[i].opType = op_type; |
|
|
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); |
|
|
davinci_model_->DisableZeroCopy(input_data_addr); |
|
|
} |
|
|
} |
|
|
return SUCCESS; |
|
|
return SUCCESS; |
|
|