@@ -883,14 +883,7 @@ HcclResult HcclCommGraphAllGather(const char *tag, void *inputPtr, void *outputP CHK_RET(PrintMemoryAttr(outputPtr)); // HcclCommGraphAllGatherV2 - HCCLV2_FUNC_RUN([&]() -> HcclResult { - hccl::hcclComm* hcclComm = reinterpret_cast(opBaseHcom); - HcclComm commV2 = hcclComm->GetCommunicatorV2(); - CHK_PTR_NULL(commV2); - opBaseHcom = reinterpret_cast(commV2); - CHK_RET(HcclCommGraphAllGatherV2(tag, inputPtr, outputPtr, inputCount, dataType, opBaseHcom, stream)); - return HCCL_SUCCESS; - }()); + HCCLV2_FUNC_RUN(HcclCommGraphAllGatherV2(tag, inputPtr, outputPtr, inputCount, dataType, opBaseHcom, stream)); CHK_RET(HcomCheckOpParam(tag, inputCount, dataType, stream)); hccl::hcclComm* hcclComm = reinterpret_cast(opBaseHcom); CHK_RET(SetWorkflowMode(HcclWorkflowMode::HCCL_WORKFLOW_MODE_OPS_KERNEL_INFO_LIB)); @@ -935,14 +928,7 @@ HcclResult HcclCommGraphAllReduce(const char *tag, void *inputPtr, void *outputP CHK_RET(PrintMemoryAttr(outputPtr)); // HcomGraphAllReduceV2 - HCCLV2_FUNC_RUN([&]() -> HcclResult { - hccl::hcclComm* hcclComm = reinterpret_cast(opBaseHcom); - HcclComm commV2 = hcclComm->GetCommunicatorV2(); - CHK_PTR_NULL(commV2); - opBaseHcom = reinterpret_cast(commV2); - CHK_RET(HcomGraphAllReduceV2(tag, inputPtr, outputPtr, count, dataType, op, opBaseHcom, stream)); - return HCCL_SUCCESS; - }()); + HCCLV2_FUNC_RUN(HcomGraphAllReduceV2(tag, inputPtr, outputPtr, count, dataType, op, opBaseHcom, stream)); CHK_RET(HcomCheckOpParam(tag, count, dataType, stream)); hccl::hcclComm* hcclComm = reinterpret_cast(opBaseHcom); CHK_RET(SetWorkflowMode(HcclWorkflowMode::HCCL_WORKFLOW_MODE_OPS_KERNEL_INFO_LIB)); @@ -995,14 +981,7 @@ HcclResult HcclCommGraphReduce(const char *tag, void *inputPtr, void *outputPtr, CHK_RET(PrintMemoryAttr(outputPtr)); // HcomGraphReduceV2 - HCCLV2_FUNC_RUN([&]() -> HcclResult { - hccl::hcclComm* hcclComm = reinterpret_cast(opBaseHcom); - HcclComm commV2 = hcclComm->GetCommunicatorV2(); - CHK_PTR_NULL(commV2); - opBaseHcom = reinterpret_cast(commV2); - CHK_RET(HcomGraphReduceV2(tag, inputPtr, outputPtr, count, dataType, op, root, opBaseHcom, stream)); - return HCCL_SUCCESS; - }()); + HCCLV2_FUNC_RUN(HcomGraphReduceV2(tag, inputPtr, outputPtr, count, dataType, op, root, opBaseHcom, stream)); CHK_RET(HcomCheckOpParam(tag, count, dataType)); hccl::hcclComm* hcclComm = reinterpret_cast(opBaseHcom); CHK_RET(SetWorkflowMode(HcclWorkflowMode::HCCL_WORKFLOW_MODE_OPS_KERNEL_INFO_LIB)); @@ -1021,7 +1000,6 @@ HcclResult HcclCommGraphReduce(const char *tag, void *inputPtr, void *outputPtr, return HCCL_SUCCESS; } - HcclResult HcclCommGraphBroadcast(const char *tag, void *ptr, u64 count, HcclDataType dataType, u32 root, s64 opBaseHcom, rtStream_t stream) { @@ -1048,14 +1026,8 @@ HcclResult HcclCommGraphBroadcast(const char *tag, void *ptr, u64 count, HcclDat streamId); CHK_RET(PrintMemoryAttr(ptr)); - HCCLV2_FUNC_RUN([&]() -> HcclResult { - hccl::hcclComm* hcclComm = reinterpret_cast(opBaseHcom); - HcclComm commV2 = hcclComm->GetCommunicatorV2(); - CHK_PTR_NULL(commV2); - opBaseHcom = reinterpret_cast(commV2); - CHK_RET(HcomGraphBroadcastV2(tag, ptr, count, dataType, root, opBaseHcom, stream)); - return HCCL_SUCCESS; - }()); + + HCCLV2_FUNC_RUN(HcomGraphBroadcastV2(tag, ptr, count, dataType, root, opBaseHcom, stream)); CHK_RET(HcomCheckOpParam(tag, count, dataType)); hccl::hcclComm* hcclComm = reinterpret_cast(opBaseHcom); CHK_RET(SetWorkflowMode(HcclWorkflowMode::HCCL_WORKFLOW_MODE_OPS_KERNEL_INFO_LIB)); @@ -1102,14 +1074,7 @@ HcclResult HcclCommGraphReduceScatter(const char *tag, void *inputPtr, void *out CHK_RET(PrintMemoryAttr(inputPtr)); CHK_RET(PrintMemoryAttr(outputPtr)); - HCCLV2_FUNC_RUN([&]() -> HcclResult { - hccl::hcclComm* hcclComm = reinterpret_cast(opBaseHcom); - HcclComm commV2 = hcclComm->GetCommunicatorV2(); - CHK_PTR_NULL(commV2); - opBaseHcom = reinterpret_cast(commV2); - CHK_RET(HcomGraphReduceScatterV2(tag, inputPtr, outputPtr, count, dataType, op, opBaseHcom, stream)); - return HCCL_SUCCESS; - }()); + HCCLV2_FUNC_RUN(HcomGraphReduceScatterV2(tag, inputPtr, outputPtr, count, dataType, op, opBaseHcom, stream)); CHK_RET(HcomCheckOpParam(tag, count, dataType)); hccl::hcclComm* hcclComm = reinterpret_cast(opBaseHcom); CHK_RET(SetWorkflowMode(HcclWorkflowMode::HCCL_WORKFLOW_MODE_OPS_KERNEL_INFO_LIB)); @@ -1154,14 +1119,8 @@ HcclResult HcclCommGraphSend(const char *tag, void *inputPtr, u64 count, HcclDat srTag, opBaseHcom, streamId); CHK_RET(PrintMemoryAttr(inputPtr)); - HCCLV2_FUNC_RUN([&]() -> HcclResult { - hccl::hcclComm* hcclComm = reinterpret_cast(opBaseHcom); - HcclComm commV2 = hcclComm->GetCommunicatorV2(); - CHK_PTR_NULL(commV2); - opBaseHcom = reinterpret_cast(commV2); - CHK_RET(HcomGraphSendV2(tag, inputPtr, count, dataType, destRank, srTag, opBaseHcom, stream)); - return HCCL_SUCCESS; - }()); + + HCCLV2_FUNC_RUN(HcomGraphSendV2(tag, inputPtr, count, dataType, destRank, srTag, opBaseHcom, stream)); CHK_RET(HcomCheckOpParam(tag, count, dataType)); hccl::hcclComm* hcclComm = reinterpret_cast(opBaseHcom); CHK_RET(SetWorkflowMode(HcclWorkflowMode::HCCL_WORKFLOW_MODE_OPS_KERNEL_INFO_LIB)); @@ -1205,14 +1164,8 @@ HcclResult HcclCommGraphReceive(const char *tag, void *outputPtr, u64 count, Hcc "srTag[%u], opBaseHcom[%lld], streamId[%d]", tag, outputPtr, count, GetDataTypeEnumStr(dataType).c_str(), srcRank, srTag, opBaseHcom, streamId); CHK_RET(PrintMemoryAttr(outputPtr)); - HCCLV2_FUNC_RUN([&]() -> HcclResult { - hccl::hcclComm* hcclComm = reinterpret_cast(opBaseHcom); - HcclComm commV2 = hcclComm->GetCommunicatorV2(); - CHK_PTR_NULL(commV2); - opBaseHcom = reinterpret_cast(commV2); - CHK_RET(HcomGraphReceiveV2(tag, outputPtr, count, dataType, srcRank, srTag, opBaseHcom, stream)); - return HCCL_SUCCESS; - }()); + + HCCLV2_FUNC_RUN(HcomGraphReceiveV2(tag, outputPtr, count, dataType, srcRank, srTag, opBaseHcom, stream)); CHK_RET(HcomCheckOpParam(tag, count, dataType)); hccl::hcclComm* hcclComm = reinterpret_cast(opBaseHcom); @@ -1270,14 +1223,8 @@ HcclResult HcclCommGraphGetRankSize(s64 opBaseHcom, u32 *rankSize) return HCCL_SUCCESS; } HCCL_INFO("HcclCommGraphGetRankSize:opBaseHcom[%lld]", opBaseHcom); - HCCLV2_FUNC_RUN([&]() -> HcclResult { - hccl::hcclComm* hcclComm = reinterpret_cast(opBaseHcom); - HcclComm commV2 = hcclComm->GetCommunicatorV2(); - CHK_PTR_NULL(commV2); - opBaseHcom = reinterpret_cast(commV2); - CHK_RET(HcclCommGraphGetRankSizeV2(opBaseHcom, rankSize)); - return HCCL_SUCCESS; - }()); + + HCCLV2_FUNC_RUN(HcclCommGraphGetRankSizeV2(opBaseHcom, rankSize)); hccl::hcclComm* hcclComm = reinterpret_cast(opBaseHcom); CHK_RET(SetWorkflowMode(HcclWorkflowMode::HCCL_WORKFLOW_MODE_OPS_KERNEL_INFO_LIB)); @@ -1297,14 +1244,8 @@ HcclResult HcclCommGraphGetRankId(s64 opBaseHcom, u32 *rankId) return HCCL_SUCCESS; } HCCL_INFO("HcclCommGraphGetRankId:opBaseHcom[%lld]", opBaseHcom); - HCCLV2_FUNC_RUN([&]() -> HcclResult { - hccl::hcclComm* hcclComm = reinterpret_cast(opBaseHcom); - HcclComm commV2 = hcclComm->GetCommunicatorV2(); - CHK_PTR_NULL(commV2); - opBaseHcom = reinterpret_cast(commV2); - CHK_RET(HcclCommGraphGetRankIdV2(opBaseHcom, rankId)); - return HCCL_SUCCESS; - }()); + + HCCLV2_FUNC_RUN(HcclCommGraphGetRankIdV2(opBaseHcom, rankId)); hccl::hcclComm* hcclComm = reinterpret_cast(opBaseHcom); CHK_RET(SetWorkflowMode(HcclWorkflowMode::HCCL_WORKFLOW_MODE_OPS_KERNEL_INFO_LIB)); @@ -1767,10 +1708,6 @@ HcclResult HcomExecSelectAlg(s64 comm, const char *group, HcclCMDType opType, u6 { std::string tempAlgName; if (comm != static_cast(CommNumHcom::COMM_VALUE_DEFAULT)) { - hccl::hcclComm* hcclComm = reinterpret_cast(comm); - HcclComm commV2 = hcclComm->GetCommunicatorV2(); - CHK_PTR_NULL(commV2); - comm = reinterpret_cast(commV2); CHK_RET(HcomSelectAlgV2(comm, group, opType, count, dataType, op, aivCoreLimit, ifAiv, tempAlgName)); } else { std::string strGroup = (group == nullptr) ? HCCL_WORLD_GROUP : group; @@ -2499,14 +2436,7 @@ HcclResult HcclCommGraphUnloadTask(s64 opBaseHcom, const char *tag) { #if (!defined (HCCD)) && (!defined (CCL_KERNEL_AICPU)) CHK_RET(SetWorkflowMode(HcclWorkflowMode::HCCL_WORKFLOW_MODE_OPS_KERNEL_INFO_LIB)); - HCCLV2_FUNC_RUN([&]() -> HcclResult { - hccl::hcclComm* hcclComm = reinterpret_cast(opBaseHcom); - HcclComm commV2 = hcclComm->GetCommunicatorV2(); - CHK_PTR_NULL(commV2); - opBaseHcom = reinterpret_cast(commV2); - CHK_RET(HcclCommGraphUnloadTaskV2(opBaseHcom, tag)); - return HCCL_SUCCESS; - }()); + HCCLV2_FUNC_RUN(HcclCommGraphUnloadTaskV2(opBaseHcom, tag)); #endif hccl::hcclComm* hcclComm = reinterpret_cast(opBaseHcom); CHK_PRT_RET(hcclComm == nullptr, HCCL_WARNING("[HcclCommGraphUnloadTask]hcclComm is null, "\

hcomm

hcomm