1f:{"diffs":[{"old_path":"src/framework/next/coll_comms/api_c_adpt/coll_comm_res_c_adpt.cc","new_path":"src/framework/next/coll_comms/api_c_adpt/coll_comm_res_c_adpt.cc","old_blob_id":"1a70f96ed347ff6fc3c82f18eaba48854cb6fb09","new_blob_id":"b3c0d9a55bbb864b71fcbc800fbc5ed93696ec18","file_path":"src/framework/next/coll_comms/api_c_adpt/coll_comm_res_c_adpt.cc","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"$2d","binary":false,"too_large":false,"collapsed":false,"line_count":[99999,99999],"added_lines":1,"removed_lines":1,"show_type":null,"audit_show_type":{"name":null,"desc":null,"title":null},"amode":null,"bmode":null},{"old_path":"src/framework/next/comms/endpoint_pairs/channels/aicpu/aicpu_ts_urma_channel.cc","new_path":"src/framework/next/comms/endpoint_pairs/channels/aicpu/aicpu_ts_urma_channel.cc","old_blob_id":"bf56f14019b87503ea3638a3276b7fac45f8862a","new_blob_id":"1e0db93ee857ac3d8d38bc661bf1cbc2f6792448","file_path":"src/framework/next/comms/endpoint_pairs/channels/aicpu/aicpu_ts_urma_channel.cc","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"@@ -176,7 +176,7 @@ HcclResult AicpuTsUrmaChannel::GetNotifyNum(uint32_t *notifyNum) const\n return HCCL_SUCCESS;\n }\n \n-HcclResult AicpuTsUrmaChannel::GetRemoteMem(HcclMem **remoteMem, uint32_t *memNum, char **memTags) const\n+HcclResult AicpuTsUrmaChannel::GetRemoteMem(HcclMem **remoteMem, uint32_t *memNum, char **memTags)\n {\n return memTransport_->GetRemoteMem(remoteMem, memNum, memTags);\n }\n","binary":false,"too_large":false,"collapsed":false,"line_count":[99999,99999],"added_lines":1,"removed_lines":1,"show_type":null,"audit_show_type":{"name":null,"desc":null,"title":null},"amode":null,"bmode":null},{"old_path":"src/framework/next/comms/endpoint_pairs/channels/aicpu/aicpu_ts_urma_channel.h","new_path":"src/framework/next/comms/endpoint_pairs/channels/aicpu/aicpu_ts_urma_channel.h","old_blob_id":"3f55976509143d2fa9b01c2185551f00a891b5eb","new_blob_id":"332a61b0f91ad381b6789b77ea7aa60fff3d15f7","file_path":"src/framework/next/comms/endpoint_pairs/channels/aicpu/aicpu_ts_urma_channel.h","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"@@ -28,7 +28,7 @@ public:\n \n HcclResult Init() override;\n HcclResult GetNotifyNum(uint32_t *notifyNum) const override;\n- HcclResult GetRemoteMem(HcclMem **remoteMem, uint32_t *memNum, char **memTags) const override;\n+ HcclResult GetRemoteMem(HcclMem **remoteMem, uint32_t *memNum, char **memTags) override;\n ChannelStatus GetStatus() override;\n \n HcclResult H2DResPack(std::vector& buffer);\n","binary":false,"too_large":false,"collapsed":false,"line_count":[99999,99999],"added_lines":1,"removed_lines":1,"show_type":null,"audit_show_type":{"name":null,"desc":null,"title":null},"amode":null,"bmode":null},{"old_path":"src/framework/next/comms/endpoint_pairs/channels/channel.cc","new_path":"src/framework/next/comms/endpoint_pairs/channels/channel.cc","old_blob_id":"af8c59b5d9cdda1a6d625f1d5c5aa9e23247ba76","new_blob_id":"5d399714f6ed897f9be5f725094514f74a49a2cb","file_path":"src/framework/next/comms/endpoint_pairs/channels/channel.cc","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"@@ -28,9 +28,8 @@ HcclResult Channel::CreateChannel(\n case COMM_ENGINE_CPU:\n // TODO: if 判断 EndpointDesc 里面的协议\n if (channelDesc.remoteEndpoint.protocol == COMM_PROTOCOL_ROCE) {\n- channelPtr.reset(new (std::nothrow) HostCpuRoceChannel(\n- endpointHandle, channelDesc\n- ));\n+ EXECEPTION_CATCH(channelPtr = std::make_unique(endpointHandle, channelDesc),\n+ return HCCL_E_PARA);\n break;\n }\n HCCL_ERROR(\"[Channel][%s] CommEngine[COMM_ENGINE_CPU] not support\", __func__);\n","binary":false,"too_large":false,"collapsed":false,"line_count":[99999,99999],"added_lines":2,"removed_lines":3,"show_type":null,"audit_show_type":{"name":null,"desc":null,"title":null},"amode":null,"bmode":null},{"old_path":"src/framework/next/comms/endpoint_pairs/channels/channel.h","new_path":"src/framework/next/comms/endpoint_pairs/channels/channel.h","old_blob_id":"a688882d68e2c83c07c69ffb8640a609d9f522a2","new_blob_id":"bc45fe2a798e6eda029f50c0133ea83e15f29099","file_path":"src/framework/next/comms/endpoint_pairs/channels/channel.h","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"@@ -50,7 +50,7 @@ public:\n // ------------------ 控制面接口 ------------------\n virtual HcclResult Init() = 0;\n virtual HcclResult GetNotifyNum(uint32_t *notifyNum) const = 0;\n- virtual HcclResult GetRemoteMem(HcclMem **remoteMem, uint32_t *memNum, char **memTags) const = 0;\n+ virtual HcclResult GetRemoteMem(HcclMem **remoteMem, uint32_t *memNum, char **memTags) = 0;\n virtual ChannelStatus GetStatus() = 0;\n \n // ------------------ 数据面接口 ------------------\n","binary":false,"too_large":false,"collapsed":false,"line_count":[99999,99999],"added_lines":1,"removed_lines":1,"show_type":null,"audit_show_type":{"name":null,"desc":null,"title":null},"amode":null,"bmode":null},{"old_path":"src/framework/next/comms/endpoint_pairs/channels/host/host_cpu_roce_channel.cc","new_path":"src/framework/next/comms/endpoint_pairs/channels/host/host_cpu_roce_channel.cc","old_blob_id":"ea8f50defdfee3a673632256a8da2742ded3a473","new_blob_id":"39f9c60907d4d6254f327b72c46e90529a2e14e8","file_path":"src/framework/next/comms/endpoint_pairs/channels/host/host_cpu_roce_channel.cc","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"The difference content has been collapsed","binary":false,"too_large":false,"collapsed":true,"line_count":[99999,99999],"added_lines":87,"removed_lines":162,"show_type":null,"audit_show_type":{"name":null,"desc":null,"title":null},"amode":null,"bmode":null},{"old_path":"src/framework/next/comms/endpoint_pairs/channels/host/host_cpu_roce_channel.h","new_path":"src/framework/next/comms/endpoint_pairs/channels/host/host_cpu_roce_channel.h","old_blob_id":"281a4a6e6370fd156c0b41e6a5e1fc2cca99b4f0","new_blob_id":"ac4786cf6144bcca8d8674d84ebd9c8fb6c38cc7","file_path":"src/framework/next/comms/endpoint_pairs/channels/host/host_cpu_roce_channel.h","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"$2e","binary":false,"too_large":false,"collapsed":false,"line_count":[99999,99999],"added_lines":26,"removed_lines":29,"show_type":null,"audit_show_type":{"name":null,"desc":null,"title":null},"amode":null,"bmode":null},{"old_path":"src/framework/next/comms/endpoint_pairs/channels/host/host_rdma_connection.cc","new_path":"src/framework/next/comms/endpoint_pairs/channels/host/host_rdma_connection.cc","old_blob_id":"4534224cbbfc438d8215e8ce39384e005ee5b4f2","new_blob_id":"772f6713f06b8e99833a2c00ae0f6d48f9f75a67","file_path":"src/framework/next/comms/endpoint_pairs/channels/host/host_rdma_connection.cc","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"$2f","binary":false,"too_large":false,"collapsed":false,"line_count":[99999,99999],"added_lines":6,"removed_lines":7,"show_type":null,"audit_show_type":{"name":null,"desc":null,"title":null},"amode":null,"bmode":null},{"old_path":"src/framework/next/comms/endpoints/reged_mems/roce_mem.cc","new_path":"src/framework/next/comms/endpoints/reged_mems/roce_mem.cc","old_blob_id":"0a56e17defaa14677375979e203ecccf43f7d787","new_blob_id":"9f45046a86ff7b4219f674df7b39371f0a052b88","file_path":"src/framework/next/comms/endpoints/reged_mems/roce_mem.cc","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"@@ -28,6 +28,8 @@ HcclResult RoceRegedMemMgr::RegisterMemory(HcommMem mem, const char *memTag, voi\n {\n HCCL_INFO(\"[%s] Begin\", __FUNCTION__);\n CHK_PTR_NULL(this->localRdmaRmaBufferMgr_);\n+ CHK_PTR_NULL(memHandle);\n+ CHK_PTR_NULL(memTag);\n \n // 构造LocalRdmaRmaBuffer\n std::shared_ptr localBufferPtr = nullptr;\n@@ -79,6 +81,7 @@ HcclResult RoceRegedMemMgr::UnregisterMemory(void* memHandle)\n \n Hccl::LocalRdmaRmaBuffer* buffer = static_cast(memHandle);\n auto bufferInfo = buffer->GetBufferInfo();\n+ CHK_PTR_NULL(memHandle);\n \n // 从LocalRamBuffer计数器删除HcclBuf\n hccl::BufferKey tempKey(bufferInfo.first, bufferInfo.second);\n","binary":false,"too_large":false,"collapsed":false,"line_count":[99999,99999],"added_lines":3,"removed_lines":0,"show_type":null,"audit_show_type":{"name":null,"desc":null,"title":null},"amode":null,"bmode":null},{"old_path":"src/framework/op_base/src/op_base.cc","new_path":"src/framework/op_base/src/op_base.cc","old_blob_id":"82630f7556e171dd1062cf12cda4d0d68903b8f8","new_blob_id":"a5483d2bdb8c1c688440831e25516df9c20e6720","file_path":"src/framework/op_base/src/op_base.cc","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"@@ -2979,7 +2979,7 @@ HcclResult HcclCommDestroy(HcclComm comm)\n return HCCL_SUCCESS;\n }\n hccl::hcclComm* hcclComm = static_cast(comm);\n- CHK_RET(HcclCommDestroyV2(hcclComm->GetCommunicatorV2()));\n+ void* commV2 = hcclComm->GetCommunicatorV2();\n string group;\n group = hcclComm->GetIdentifier();\n HcclOpInfoCtx& opBaseHcom = GetHcclOpInfoCtx();\n@@ -2991,6 +2991,7 @@ HcclResult HcclCommDestroy(HcclComm comm)\n HCCL_ERROR(\"[HcclCommDestroy] comm is not exist, comm=%p, group=%s, deviceLogicId=%d\", comm, group.c_str(), deviceLogicId);\n return HCCL_E_PARA;\n }\n+ CHK_RET(HcclCommDestroyV2(commV2));\n return HCCL_SUCCESS;\n }());\n #endif\n","binary":false,"too_large":false,"collapsed":false,"line_count":[99999,99999],"added_lines":2,"removed_lines":1,"show_type":null,"audit_show_type":{"name":null,"desc":null,"title":null},"amode":null,"bmode":null},{"old_path":"src/framework/op_base/src/op_base_mc2.cc","new_path":"src/framework/op_base/src/op_base_mc2.cc","old_blob_id":"76d670a2f31148d2fb509db4bbfc2667f3c48e90","new_blob_id":"1fcff087804aaeb9cf642adb88b32dbfa9382117","file_path":"src/framework/op_base/src/op_base_mc2.cc","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"@@ -234,7 +234,12 @@ HcclResult HcclDevMemAcquire(HcclComm comm, const char *memTag, uint64_t *size,\n CHK_PTR_NULL(comm);\n CHK_PTR_NULL(size);\n CHK_PTR_NULL(addr);\n- HCCLV2_FUNC_RUN(HcclDevMemAcquireV2(comm, memTag, size, addr, newCreated));\n+ const char *indOp = getenv(\"HCCL_INDEPENDENT_OP\");\n+ if (indOp == nullptr || strcmp(indOp, \"\") == 0) {\n+ HCCLV2_FUNC_RUN(HcclDevMemAcquireV2(comm, memTag, size, addr, newCreated));\n+ }\n+ hccl::hcclComm* hcclComm = static_cast(comm);\n+ HCCLV2_FUNC_RUN(HcclDevMemAcquireV2(hcclComm->GetCommunicatorV2(), memTag, size, addr, newCreated));\n return HCCL_SUCCESS;\n }\n \n","binary":false,"too_large":false,"collapsed":false,"line_count":[99999,99999],"added_lines":6,"removed_lines":1,"show_type":null,"audit_show_type":{"name":null,"desc":null,"title":null},"amode":null,"bmode":null},{"old_path":"src/legacy/framework/communicator/communicator_impl.cc","new_path":"src/legacy/framework/communicator/communicator_impl.cc","old_blob_id":"22ee95d49107168c9930e6202c33b1dec1d2e72c","new_blob_id":"adea86626fbed0e4d6109947516f936cfd97ab31","file_path":"src/legacy/framework/communicator/communicator_impl.cc","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"$30","binary":false,"too_large":false,"collapsed":false,"line_count":[99999,99999],"added_lines":3,"removed_lines":5,"show_type":null,"audit_show_type":{"name":null,"desc":null,"title":null},"amode":null,"bmode":null},{"old_path":"src/legacy/framework/communicator/communicator_impl.h","new_path":"src/legacy/framework/communicator/communicator_impl.h","old_blob_id":"25a391d37d61079f7c089efa1d606caf550e2792","new_blob_id":"c16215436488a7115cf50d5408ceda6974c042eb","file_path":"src/legacy/framework/communicator/communicator_impl.h","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"$31","binary":false,"too_large":false,"collapsed":false,"line_count":[99999,99999],"added_lines":2,"removed_lines":2,"show_type":null,"audit_show_type":{"name":null,"desc":null,"title":null},"amode":null,"bmode":null},{"old_path":"src/legacy/framework/communicator/hccl_communicator.cc","new_path":"src/legacy/framework/communicator/hccl_communicator.cc","old_blob_id":"32c1ff48900b5123fd9bf7c8be296d7bfd77dc0c","new_blob_id":"8996c422f9b617d53203be9a781121c439f127af","file_path":"src/legacy/framework/communicator/hccl_communicator.cc","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"@@ -435,11 +435,6 @@ HcclResult HcclCommunicator::GetKFCWorkSpace(const char *memTag, uint64_t *size,\n }\n return HcclResult::HCCL_SUCCESS;\n }\n-// Dpu Kernel Launch\n-HcclResult HcclCommunicator::LaunchDpuKernel()\n-{\n- return pimpl->InitAndLaunchDpuKernel();\n-}\n \n HcclResult HcclCommunicator::GetInstRanksByNetLayer(uint32_t netLayer, uint32_t **ranks, uint32_t *rankNum)\n {\n","binary":false,"too_large":false,"collapsed":false,"line_count":[99999,99999],"added_lines":0,"removed_lines":5,"show_type":null,"audit_show_type":{"name":null,"desc":null,"title":null},"amode":null,"bmode":null},{"old_path":"src/legacy/framework/entrance/op_base/op_base_v2.cc","new_path":"src/legacy/framework/entrance/op_base/op_base_v2.cc","old_blob_id":"9872f3363df4ec16c04ff43e05d394247d023f4d","new_blob_id":"2342c9bafbae67341089f1848016390d0185bf8d","file_path":"src/legacy/framework/entrance/op_base/op_base_v2.cc","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"@@ -389,19 +389,9 @@ HcclResult HcclCommInitClusterInfoConfigV2(\n HCCL_RUN_INFO(\"[HCCL_TRACE]%s success, take time [%lld]us, clusterInfo[%s], rank[%u], deviceLogicId[%d], commId[%s].\",\n __func__, DURATION_US(TIME_NOW() - startut), clusterInfo, rank, deviceLogicId, config->hcclCommName);\n \n- // 拉起KFC kernel\n- CHK_RET(HostKFCServerInit(*comm));\n-\n return HCCL_SUCCESS;\n }\n \n-HcclResult HostKFCServerInit(HcclComm comm)\n-{\n- CHK_PTR_NULL(comm);\n- Hccl::HcclCommunicator *communicator = static_cast(comm);\n- return communicator->LaunchDpuKernel();\n-}\n-\n HcclResult HcclTaskRegisterV2(HcclComm comm, const char *msgTag, Callback cb)\n {\n HCCL_RUN_INFO(\"[HcclTaskRegisterV2] start to register task\");\n","binary":false,"too_large":false,"collapsed":false,"line_count":[99999,99999],"added_lines":0,"removed_lines":10,"show_type":null,"audit_show_type":{"name":null,"desc":null,"title":null},"amode":null,"bmode":null},{"old_path":"src/legacy/framework/entrance/op_base/op_base_v2.h","new_path":"src/legacy/framework/entrance/op_base/op_base_v2.h","old_blob_id":"2c31b5a8c018df4018110a6eb8187c929c7a5e2f","new_blob_id":"836be92e96bf6cff59754b955accbaade405defb","file_path":"src/legacy/framework/entrance/op_base/op_base_v2.h","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"@@ -168,7 +168,6 @@ HcclResult HcclGetRanksByTopoInstV2(HcclComm comm, uint32_t netLayer, uint32_t t\n uint32_t *rankNum);\n HcclResult HcommFlushV2();\n HcclResult HcclGetCclBuffer(HcclComm comm, uintptr_t &cclBufferAddr, size_t &cclBufferSize, HcclMemType &cclBufferMemType);\n-HcclResult HostKFCServerInit(HcclComm comm);\n \n HcclResult HcclRankGraphGetEndpointNumV2(HcclComm comm, uint32_t layer, uint32_t topoInstId, uint32_t *num);\n \n","binary":false,"too_large":false,"collapsed":false,"line_count":[99999,99999],"added_lines":0,"removed_lines":1,"show_type":null,"audit_show_type":{"name":null,"desc":null,"title":null},"amode":null,"bmode":null},{"old_path":"src/legacy/include/hccl_communicator.h","new_path":"src/legacy/include/hccl_communicator.h","old_blob_id":"35cc4a8ef0aafcdd91c259f414785adf58ed9505","new_blob_id":"32c2b7ae5d3485584024194f400b9f2845ddab6b","file_path":"src/legacy/include/hccl_communicator.h","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"@@ -109,8 +109,6 @@ public:\n \n HcclResult GetRankGraphV2(void *&rankGraph);\n HcclResult HcclGetCclBuffer(uintptr_t &cclBufferAddr, size_t &cclBufferSize, HcclMemType &cclBufferMemType);\n- // Dpu Kernel Launch\n- HcclResult LaunchDpuKernel();\n HcclResult GetConfigInCCLbufferSize(uint64_t *cclBufSize);\n HcclResult GetNetLayers(uint32_t **netLayers, uint32_t *netLayerNum);\n HcclResult GetInstSizeByNetLayer(uint32_t netLayer, uint32_t *rankNum);\n","binary":false,"too_large":false,"collapsed":false,"line_count":[99999,99999],"added_lines":0,"removed_lines":2,"show_type":null,"audit_show_type":{"name":null,"desc":null,"title":null},"amode":null,"bmode":null},{"old_path":"src/legacy/unified_platform/resource/buffer/exchange_rdma_buffer_dto.h","new_path":"src/legacy/unified_platform/resource/buffer/exchange_rdma_buffer_dto.h","old_blob_id":"c080d0c62cabb122dd8b69283d0ed0f71e4b298a","new_blob_id":"e380c4f1883d5ec276d98ae113e5580fdb33a4b2","file_path":"src/legacy/unified_platform/resource/buffer/exchange_rdma_buffer_dto.h","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"$32","binary":false,"too_large":false,"collapsed":false,"line_count":[99999,99999],"added_lines":7,"removed_lines":5,"show_type":null,"audit_show_type":{"name":null,"desc":null,"title":null},"amode":null,"bmode":null},{"old_path":"src/legacy/unified_platform/resource/buffer/local_rdma_rma_buffer.cc","new_path":"src/legacy/unified_platform/resource/buffer/local_rdma_rma_buffer.cc","old_blob_id":"e6730da7db5a074d0bc9cd79080e76795ea5adb6","new_blob_id":"ddbee256b15a0be24262705db6c9b68f93691a4e","file_path":"src/legacy/unified_platform/resource/buffer/local_rdma_rma_buffer.cc","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"@@ -68,7 +68,7 @@ string LocalRdmaRmaBuffer::Describe() const\n std::unique_ptr LocalRdmaRmaBuffer::GetExchangeDto()\n {\n std::unique_ptr dto\n- = make_unique(buf->GetAddr(), buf->GetSize(), this->rkey);\n+ = make_unique(buf->GetAddr(), buf->GetSize(), this->rkey, buf->GetMemTag());\n return std::unique_ptr(dto.release());\n }\n \n","binary":false,"too_large":false,"collapsed":false,"line_count":[99999,99999],"added_lines":1,"removed_lines":1,"show_type":null,"audit_show_type":{"name":null,"desc":null,"title":null},"amode":null,"bmode":null},{"old_path":"src/legacy/unified_platform/resource/buffer/remote_rma_buffer.cc","new_path":"src/legacy/unified_platform/resource/buffer/remote_rma_buffer.cc","old_blob_id":"a125104c6d34860d6c597c9de8d52ace4a608c50","new_blob_id":"db6b983a18b7c6696d86e00a4c64b5d7f9183ea1","file_path":"src/legacy/unified_platform/resource/buffer/remote_rma_buffer.cc","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"@@ -93,8 +93,8 @@ RemoteRdmaRmaBuffer::RemoteRdmaRmaBuffer(RdmaHandle rdmaHandle, const Serializab\n addr = dto.addr;\n size = dto.size;\n rkey = dto.rkey;\n- memTag = \"HcclBuffer\"; // TODO：临时处理\n- HCCL_INFO(\"[RemoteRdmaRmaBuffer]addr = %llu; size = %u; rkey = %u\", addr, size, rkey);\n+ memTag = dto.memTag;\n+ HCCL_INFO(\"[RemoteRdmaRmaBuffer]addr = %llu; size = %u; rkey = %u, memTag = %s\", addr, size, rkey, memTag.c_str());\n }\n \n RemoteRdmaRmaBuffer::~RemoteRdmaRmaBuffer()\n","binary":false,"too_large":false,"collapsed":false,"line_count":[99999,99999],"added_lines":2,"removed_lines":2,"show_type":null,"audit_show_type":{"name":null,"desc":null,"title":null},"amode":null,"bmode":null}],"diff_refs":{"base_sha":"347c81efd0abaed15a2d2f2979d4e984a573cc18","head_sha":"3cc571a1b62e48820d6959290b4fc6f861fcf05d","start_sha":"347c81efd0abaed15a2d2f2979d4e984a573cc18"},"added_lines":152,"removed_lines":241,"change_file_count":21,"change_line_count":393,"too_large":false,"total":21}

hcomm

hcomm