@@ -301,7 +301,7 @@ namespace hccl HcclResult HcclCommunicator::Init(HcclCommParams ¶ms, const RankTable_t &rankTable) { CHK_RET(InitCommParams(params)); - CHK_RET(attrCollector_.Init(params, rankTable, commConfig_.GetConfigHcclAlgoMap())); + CHK_RET(attrCollector_.Init(params, rankTable, commConfig_.GetConfigHcclAlgoMap())); CHK_RET(InitRankInfo(rankTable)); CHK_RET(InitNetResource(rankTable)); CHK_RET(InitDebug()); @@ -350,7 +350,7 @@ namespace hccl WorldGroupInfo &groupCommonData) { CHK_RET(InitCommParams(params)); - CHK_RET(attrCollector_.Init(params, rankList, groupCommonData, commConfig_.GetConfigHcclAlgoMap())); + CHK_RET(attrCollector_.Init(params, rankList, groupCommonData, commConfig_.GetConfigHcclAlgoMap())); CHK_RET(InitRankInfoSubGroup(rankList, groupCommonData)); CHK_RET(InitDebugSubGroup()); CHK_RET(InitNotifyManager()); @@ -1421,7 +1421,7 @@ namespace hccl if (SatisfyIntraSuperPod(deviceType_, userRankSize_, useSuperPodMode_, superPodNum_)) { streamNum = std::max(static_cast(userRankSize_ - 1u), streamNum); } else if (FullmeshPairwiseSatisfyHighPerfAlltoallMeshCondition(deviceType_, - meshAggregationRankSize_, useSuperPodMode_, commConfig_.GetConfigHcclAlgo(HcclCMDType::HCCL_CMD_ALLTOALL))) { + meshAggregationRankSize_, useSuperPodMode_, commConfig_.GetConfigHcclAlgo(HcclCMDType::HCCL_CMD_ALLTOALL))) { streamNum = std::max(static_cast(meshAggregationRankSize_ - 1u), streamNum); } @@ -6624,14 +6624,18 @@ namespace hccl u8 HcclCommunicator::GetOrderLaunchMode (bool isCapture) { + bool isSupportHcomAttachedStream = !(attachedStreams_.empty() || attachedStreams_[0].ptr() == nullptr); // true 表示图模式下成功申请附属从流 + const u8 orderLaunchInvalidInHcom = 255; u8 orderLaunchMode = 0; HcclWorkflowMode mode = GetWorkflowMode(); if (isCapture) { orderLaunchMode = static_cast(AicpuNotifyMode::ACLGRAPH_MODE); } else if (mode == HcclWorkflowMode::HCCL_WORKFLOW_MODE_OP_BASE) { orderLaunchMode = static_cast(AicpuNotifyMode::OPBASE_MODE); - } else if (mode == HcclWorkflowMode::HCCL_WORKFLOW_MODE_OPS_KERNEL_INFO_LIB) { + } else if (mode == HcclWorkflowMode::HCCL_WORKFLOW_MODE_OPS_KERNEL_INFO_LIB && isSupportHcomAttachedStream) { orderLaunchMode = static_cast(AicpuNotifyMode::HCOM_MODE); + } else { + orderLaunchMode = orderLaunchInvalidInHcom; } return orderLaunchMode; @@ -6639,12 +6643,14 @@ namespace hccl HcclResult HcclCommunicator::InitAndCheckAicpuOrderNotify(u8 &orderLaunchMode) { + const u8 opbaseOrderLaunchMode = 0; + const u8 aclgraphOrderLaunchMode = 1; u32 idx0; u32 idx1; - if (orderLaunchMode == 0) { + if (orderLaunchMode == opbaseOrderLaunchMode) { idx0 = static_cast(AicpuLocalNotifyIdx::ORDER_INDEX_OPBASE_0); idx1 = static_cast(AicpuLocalNotifyIdx::ORDER_INDEX_OPBASE_1); - } else if (orderLaunchMode == 1) { + } else if (orderLaunchMode == aclgraphOrderLaunchMode) { idx0 = static_cast(AicpuLocalNotifyIdx::ORDER_INDEX_ACLGRAPH_0); idx1 = static_cast(AicpuLocalNotifyIdx::ORDER_INDEX_ACLGRAPH_1); } else { @@ -6691,15 +6697,18 @@ namespace hccl Stream kfcOpStream; HcclWorkflowMode mode = GetWorkflowMode(); + bool isSupportHcomAttachedStream = !(attachedStreams_.empty() || attachedStreams_[0].ptr() == nullptr); // true 表示图模式下成功申请附属从流 if (opParam.isCapture || mode == HcclWorkflowMode::HCCL_WORKFLOW_MODE_OP_BASE) { kfcOpStream = opStream_; } else { - // 如果是图模式，则尝试从附属从流中获取一下stream，如果能拿到则使用，否则报错 - if (attachedStreams_.empty() || attachedStreams_[0].ptr() == nullptr) { - HCCL_ERROR("[HcclCommunicator][AicpuKfcTilingDataLaunchIn] attachedStreams_ is invalid in graph mode"); - return HCCL_E_NOT_FOUND; + // 如果是图模式，则尝试从附属从流中获取一下stream，如果能拿到则使用，否则退化 + if (isSupportHcomAttachedStream) { + HCCL_INFO("[HcclCommunicator][AicpuKfcTilingDataLaunchIn] attachedStreams_ is valid in graph mode"); + kfcOpStream = attachedStreams_[0]; + } else { + HCCL_INFO("[HcclCommunicator][AicpuKfcTilingDataLaunchIn] attachedStreams_ is invalid in graph mode"); + kfcOpStream = opParam.stream; } - kfcOpStream = attachedStreams_[0]; } uint64_t beginTime = hrtMsprofSysCycleTime(); std::string profName = GetCMDTypeEnumStr(opParam.opType); @@ -6748,7 +6757,7 @@ namespace hccl notify0 = localAiCpuOpNotify_[static_cast(AicpuLocalNotifyIdx::ORDER_INDEX_OPBASE_0)]; notify1 = localAiCpuOpNotify_[static_cast(AicpuLocalNotifyIdx::ORDER_INDEX_OPBASE_1)]; CHK_RET(orderLaunch.OpbaseLaunchInOrder(identifier_, kfcOpStream, notify0, notify1, timeOut)); - } else if (mode == HcclWorkflowMode::HCCL_WORKFLOW_MODE_OPS_KERNEL_INFO_LIB) { + } else if (mode == HcclWorkflowMode::HCCL_WORKFLOW_MODE_OPS_KERNEL_INFO_LIB && isSupportHcomAttachedStream) { notify0 = localAiCpuOpNotify_[static_cast(AicpuLocalNotifyIdx::ORDER_INDEX_HCOM_0)]; notify1 = localAiCpuOpNotify_[static_cast(AicpuLocalNotifyIdx::ORDER_INDEX_HCOM_1)]; CHK_RET(orderLaunch.HcomLaunchInOrder(identifier_, kfcOpStream, graphId_, notify0, @@ -7542,13 +7551,13 @@ namespace hccl return HCCL_SUCCESS; } - HcclResult HcclCommunicator::SetAlgoConfig(const std::map>& algoMap) - { - CHK_SMART_PTR_NULL(implAlg_); - CHK_RET(implAlg_->SetAlgoConfig(algoMap)); - return HCCL_SUCCESS; - } - + HcclResult HcclCommunicator::SetAlgoConfig(const std::map>& algoMap) + { + CHK_SMART_PTR_NULL(implAlg_); + CHK_RET(implAlg_->SetAlgoConfig(algoMap)); + return HCCL_SUCCESS; + } + bool HcclCommunicator::GetAivModeConfig() { return commConfig_.GetConfigAivMode();

hcomm

hcomm