1f:{"diffs":[{"old_path":"include/hccl/hccl_res.h","new_path":"include/hccl/hccl_res.h","old_blob_id":"511fd4693a442c9db6662f7c122b5972d819bf59","new_blob_id":"6a8ec0244128b52d5ce50650a9f47ff79e656f3b","file_path":"include/hccl/hccl_res.h","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"$2d","binary":false,"too_large":false,"collapsed":false,"line_count":[99999,99999],"added_lines":15,"removed_lines":12,"show_type":null,"audit_show_type":{"name":null,"desc":null,"title":null},"amode":null,"bmode":null},{"old_path":"src/framework/CMakeLists.txt","new_path":"src/framework/CMakeLists.txt","old_blob_id":"a23c14f7bbeb8714e65a8fe075e1b046e2af41c9","new_blob_id":"226c28094fb7074cf2f2a2a3c8fb625bf40f4671","file_path":"src/framework/CMakeLists.txt","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"@@ -94,6 +94,7 @@ set(hccl_include_list\n ${HCCL_BASE_DIR}/framework/next/comms/comm_engine_res/threads\n ${HCCL_BASE_DIR}/framework/next/coll_comms/\n ${HCCL_BASE_DIR}/framework/next/coll_comms/rank\n+ ${HCCL_BASE_DIR}/framework/next/coll_comms/rank/comm_mems/\n ${HCCL_BASE_DIR}/framework/next/coll_comms/rank_pairs\n ${HCCL_BASE_DIR}/framework/next/comms/endpoint_pairs/channels\n ${HCCL_BASE_DIR}/framework/next/comms/endpoint_pairs/\n","binary":false,"too_large":false,"collapsed":false,"line_count":[99999,99999],"added_lines":1,"removed_lines":0,"show_type":null,"audit_show_type":{"name":null,"desc":null,"title":null},"amode":null,"bmode":null},{"old_path":"src/framework/communicator/impl/independent_op/comm_mem_manager.cc","new_path":"src/framework/communicator/impl/independent_op/comm_mem_manager.cc","old_blob_id":"339abfa1c7209bf595e072436414271e1b32fc80","new_blob_id":"9ea6463ceeb5c91e931bcfa9967bad0d68285414","file_path":"src/framework/communicator/impl/independent_op/comm_mem_manager.cc","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"@@ -39,7 +39,7 @@ HcclResult CommMemMgr::CommRegMem(const std::string& memTag, const HcclMem& mem,\n \n // 组装句柄（仅域内管理，无进程级注册）\n Handle h;\n- EXECEPTION_CATCH(h = std::make_shared(), return HCCL_E_PTR);\n+ EXECEPTION_CATCH(h = std::make_shared(), return HCCL_E_PTR);\n h->addr = mem.addr;\n h->size = static_cast(mem.size);\n h->memType = static_cast(mem.type);\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/communicator/impl/independent_op/comm_mem_manager.h","new_path":"src/framework/communicator/impl/independent_op/comm_mem_manager.h","old_blob_id":"a82fa6348f45f0afa91431984d8cc66d2e285464","new_blob_id":"fc1f608fa79e71f0626dac6a765fdd856609a5bb","file_path":"src/framework/communicator/impl/independent_op/comm_mem_manager.h","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"@@ -21,7 +21,7 @@\n \n namespace hccl {\n \n-struct HcclMemHandle {\n+struct HcclMemoryHandle {\n void* addr {nullptr};\n uint64_t size {0};\n HcclMemType memType {HCCL_MEM_TYPE_DEVICE};\n@@ -30,7 +30,7 @@ struct HcclMemHandle {\n \n class CommMemMgr {\n public:\n- using Handle = std::shared_ptr;\n+ using Handle = std::shared_ptr;\n using MemKey = hccl::BufferKey;\n using Table = hccl::RmaBufferMgr;\n CommMemMgr() = default;\n@@ -60,8 +60,8 @@ private:\n std::mutex memMutex_;\n // 每个 tag 一份 registry\n std::unordered_map tagRegs_;\n- // 每个tag n个 HcclMemHandle\n- std::unordered_map>> opBindings_;\n+ // 每个tag n个 HcclMemoryHandle\n+ std::unordered_map>> opBindings_;\n };\n }\n \n","binary":false,"too_large":false,"collapsed":false,"line_count":[99999,99999],"added_lines":4,"removed_lines":4,"show_type":null,"audit_show_type":{"name":null,"desc":null,"title":null},"amode":null,"bmode":null},{"old_path":"src/framework/communicator/impl/independent_op/hccl_independent_op_channel.cc","new_path":"src/framework/communicator/impl/independent_op/hccl_independent_op_channel.cc","old_blob_id":"796f5c8f714ce2156b1838eced440b22fdadd952","new_blob_id":"f34e26803dfc1fff7907a346e738e7ace1ecf5d3","file_path":"src/framework/communicator/impl/independent_op/hccl_independent_op_channel.cc","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"$2e","binary":false,"too_large":false,"collapsed":false,"line_count":[99999,99999],"added_lines":6,"removed_lines":5,"show_type":null,"audit_show_type":{"name":null,"desc":null,"title":null},"amode":null,"bmode":null},{"old_path":"src/framework/communicator/impl/independent_op/hccl_independent_op_mem.cc","new_path":"src/framework/communicator/impl/independent_op/hccl_independent_op_mem.cc","old_blob_id":"bce6921a7071c395197e045f629b645b037c16be","new_blob_id":"00dd8c139b431e56c04318c3e993091e285de401","file_path":"src/framework/communicator/impl/independent_op/hccl_independent_op_mem.cc","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"@@ -21,10 +21,11 @@\n #include \"hccl_comm_pub.h\"\n #include \"param_check_pub.h\"\n #include \"op_base_v2.h\"\n+#include \"hccl_res.h\"\n \n using namespace hccl;\n \n-HcclResult HcclCommMemReg(HcclComm comm, const char *memTag, const CommMem *mem, void **memHandle)\n+HcclResult HcclCommMemReg(HcclComm comm, const char *memTag, const CommMem *mem, HcclMemHandle *memHandle)\n \n {\n CHK_PRT_RET(comm == nullptr, HCCL_ERROR(\"[HcclCommMemReg]comm is null\"), HCCL_E_PARA);\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/next/coll_comms/rank/my_rank.cc","new_path":"src/framework/next/coll_comms/rank/my_rank.cc","old_blob_id":"aaa8d1f6b27e54987f40b625d7f9209b439f4c55","new_blob_id":"3058405415220c492ef5bbc0a8bf1094888c610d","file_path":"src/framework/next/coll_comms/rank/my_rank.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":3,"removed_lines":30,"show_type":null,"audit_show_type":{"name":null,"desc":null,"title":null},"amode":null,"bmode":null},{"old_path":"src/framework/next/coll_comms/rank/my_rank.h","new_path":"src/framework/next/coll_comms/rank/my_rank.h","old_blob_id":"5f3ca7577905937fb02f75a04000f8aa2f4d4d90","new_blob_id":"74fc79f5f22956bbe71f0c84494ed44b2f093081","file_path":"src/framework/next/coll_comms/rank/my_rank.h","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"@@ -44,7 +44,7 @@ public:\n const HcclChannelDesc* channelDescs, uint32_t channelNum, ChannelHandle *channels);\n \n HcclResult ChannelGetHcclBuffer(ChannelHandle channel, void **buffer, uint64_t *size);\n- HcclResult ChannelGetRemoteMem(ChannelHandle channel, CommMem **remoteMem, char **memTag, uint32_t *memNum);\n+ HcclResult ChannelGetRemoteMem(ChannelHandle channel, CommMem **remoteMem, char ***memTag, uint32_t *memNum);\n private:\n HcclResult BatchCreateSockets(const HcclChannelDesc* channelDescs, uint32_t channelNum,\n const std::string &commTag, std::vector &hcommDescs);\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/api_c_adpt/hcomm_c_adpt.cc","new_path":"src/framework/next/comms/api_c_adpt/hcomm_c_adpt.cc","old_blob_id":"f5fffefc7bf1c38a9460c82335b25ed27830ce94","new_blob_id":"4bc9fbb176b95f0e500f3b35b8239cdee15d91fc","file_path":"src/framework/next/comms/api_c_adpt/hcomm_c_adpt.cc","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"@@ -490,6 +490,15 @@ HcclResult HcommChannelGetRemoteMem(ChannelHandle channelHandle, HcommMem **remo\n });\n }\n \n+HcclResult HcommChannelGetUserRemoteMem(ChannelHandle channelHandle, CommMem **remoteMem, char ***memTag, uint32_t *memNum)\n+{\n+ return hcomm::WithChannelByHandleLocked(channelHandle, [&](Channel &channel) -> HcclResult {\n+ // 锁内调用，避免 destroy 并发释放\n+ channel.GetUserRemoteMem(remoteMem, memTag, memNum);\n+ return HcclResult::HCCL_SUCCESS;\n+ });\n+}\n+\n HcclResult HcommThreadAlloc(CommEngine engine, uint32_t threadNum, uint32_t notifyNumPerThread, ThreadHandle *threads)\n {\n CHK_PTR_NULL(threads);\n","binary":false,"too_large":false,"collapsed":false,"line_count":[99999,99999],"added_lines":9,"removed_lines":0,"show_type":null,"audit_show_type":{"name":null,"desc":null,"title":null},"amode":null,"bmode":null},{"old_path":"src/framework/next/comms/api_c_adpt/hcomm_c_adpt.h","new_path":"src/framework/next/comms/api_c_adpt/hcomm_c_adpt.h","old_blob_id":"3c2b49d2159564a52eb270bdfc158e0add37ecfc","new_blob_id":"b6bd8864855125c6375cb4d3b34b7536c0a3ba1a","file_path":"src/framework/next/comms/api_c_adpt/hcomm_c_adpt.h","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"@@ -43,7 +43,9 @@ HcclResult HcommChannelGet(const ChannelHandle channelHandle, void **channel);\n HcclResult HcommChannelGetStatus(const ChannelHandle *channelList, uint32_t listNum, int32_t* statusList);\n \n HcclResult HcommChannelGetNotifyNum(ChannelHandle channelHandle, uint32_t *notifyNum);\n- \t \n+\n+HcclResult HcommChannelGetUserRemoteMem(ChannelHandle channelHandle, CommMem **remoteMem, char ***memTag, uint32_t *memNum);\n+\n HcclResult HcommChannelDestroy(const ChannelHandle *channels, uint32_t channelNum);\n \n HcclResult HcommChannelKernelLaunch(ChannelHandle *channelHandles, ChannelHandle *hostChannelHandles, uint32_t listNum,\n","binary":false,"too_large":false,"collapsed":false,"line_count":[99999,99999],"added_lines":3,"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/aiv/aiv_ub_mem_channel.cc","new_path":"src/framework/next/comms/endpoint_pairs/channels/aiv/aiv_ub_mem_channel.cc","old_blob_id":"96b0f507243151f03f2ce4b5d61c4f21617b7850","new_blob_id":"4cd947af260f412b9d7790b0406818bdd0acbc67","file_path":"src/framework/next/comms/endpoint_pairs/channels/aiv/aiv_ub_mem_channel.cc","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"@@ -79,4 +79,8 @@ HcclResult AivUbMemChannel::GetRemoteMem(HcclMem **remoteMem, uint32_t *memNum,\n return transport_->GetRemoteMem(remoteMem, memNum, memTags);\n }\n \n+HcclResult AivUbMemChannel::GetUserRemoteMem(CommMem **remoteMem, char ***memTag, uint32_t *memNum)\n+{\n+ return transport_->GetUserRemoteMem(remoteMem, memTag, memNum);\n+}\n }\n","binary":false,"too_large":false,"collapsed":false,"line_count":[99999,99999],"added_lines":4,"removed_lines":0,"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/aiv/aiv_ub_mem_channel.h","new_path":"src/framework/next/comms/endpoint_pairs/channels/aiv/aiv_ub_mem_channel.h","old_blob_id":"b1697ee74569f974ddd76cecd38c450a2274e927","new_blob_id":"fd095208995391e6d33dc64877247c97af51d9e7","file_path":"src/framework/next/comms/endpoint_pairs/channels/aiv/aiv_ub_mem_channel.h","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"@@ -27,6 +27,7 @@ public:\n HcclResult GetNotifyNum(uint32_t *notifyNum) const override;\n HcclResult GetRemoteMem(HcclMem **remoteMem, uint32_t *memNum, char **memTags) override;\n ChannelStatus GetStatus() override;\n+ HcclResult GetUserRemoteMem(CommMem **remoteMem, char ***memTag, uint32_t *memNum) override;\n \n private:\n HcclResult ParseInputParam();\n","binary":false,"too_large":false,"collapsed":false,"line_count":[99999,99999],"added_lines":1,"removed_lines":0,"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/aiv/aiv_ub_mem_transport.cc","new_path":"src/framework/next/comms/endpoint_pairs/channels/aiv/aiv_ub_mem_transport.cc","old_blob_id":"f47af0f3685358b7ebf007867ed4182a2846557a","new_blob_id":"94d6a63a9aaadfdee6a00e655c23093a57337c1b","file_path":"src/framework/next/comms/endpoint_pairs/channels/aiv/aiv_ub_mem_transport.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":40,"removed_lines":0,"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/aiv/aiv_ub_mem_transport.h","new_path":"src/framework/next/comms/endpoint_pairs/channels/aiv/aiv_ub_mem_transport.h","old_blob_id":"04d1002dcca08ce4004bebd59fb9b0802156f1eb","new_blob_id":"cff0c33acfa534e533239f25b3786c36a600be2d","file_path":"src/framework/next/comms/endpoint_pairs/channels/aiv/aiv_ub_mem_transport.h","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"@@ -29,13 +29,18 @@ public:\n Hccl::TransportStatus GetStatus();\n HcclResult GetRemoteMem(HcclMem **remoteMem, uint32_t *memNum, char **memTags);\n HcclResult GetMemTag(char **memTag, uint32_t memNum);\n+ HcclResult GetUserRemoteMem(CommMem **remoteMem, char ***memTags, uint32_t *memNum);\n \n private:\n Hccl::Socket *socket_{}; // 交换所用的socket\n HcommChannelDesc channelDesc_;\n uint32_t exchangeDataSize_{0};\n std::vector remoteMems_;\n-\n+ std::vector remoteUserMems_;\n+ std::vector tagCopies_; //储存memTag字符串副本\n+ std::vector tagPointers_; // 储存指针\n+ bool cacheValid_ = false; // GetUserRemoteMem 的缓存标识\n+ \n std::vector localRmaBufferVec_{};\n std::vector> localUserMemTag_{}; \n std::vector> rmtBufferVec_{};\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/framework/next/comms/endpoint_pairs/channels/channel.cc","new_path":"src/framework/next/comms/endpoint_pairs/channels/channel.cc","old_blob_id":"46d6f75ad2288d1d307db52b56938de11e2e439e","new_blob_id":"3cda1556f9137552d2e39d3b15415e070f160180","file_path":"src/framework/next/comms/endpoint_pairs/channels/channel.cc","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"@@ -62,4 +62,8 @@ HcclResult Channel::CreateChannel(\n return HCCL_SUCCESS;\n }\n \n+HcclResult Channel::GetUserRemoteMem(CommMem **remoteMem, char ***memTag, uint32_t *memNum)\n+{\n+ return HCCL_SUCCESS;\n+}\n } // namespace hcomm\n\\ No newline at end of file\n","binary":false,"too_large":false,"collapsed":false,"line_count":[99999,99999],"added_lines":4,"removed_lines":0,"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":"bc45fe2a798e6eda029f50c0133ea83e15f29099","new_blob_id":"d764836996863f9faa080550f9474c8c077ec146","file_path":"src/framework/next/comms/endpoint_pairs/channels/channel.h","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"@@ -52,7 +52,7 @@ public:\n virtual HcclResult GetNotifyNum(uint32_t *notifyNum) const = 0;\n virtual HcclResult GetRemoteMem(HcclMem **remoteMem, uint32_t *memNum, char **memTags) = 0;\n virtual ChannelStatus GetStatus() = 0;\n-\n+ virtual HcclResult GetUserRemoteMem(CommMem **remoteMem, char ***memTag, uint32_t *memNum);\n // ------------------ 数据面接口 ------------------\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":"test/ut/stub/CMakeLists.txt","new_path":"test/ut/stub/CMakeLists.txt","old_blob_id":"9e3841886ce42335dbaa84a6a808187b088731fb","new_blob_id":"9fdfad27ac591d358456ba4a23b311c31e553ca1","file_path":"test/ut/stub/CMakeLists.txt","new_file":false,"renamed_file":false,"deleted_file":false,"diff":"@@ -338,6 +338,7 @@ target_include_directories(hccl_llt PRIVATE\n ${HCCL_CODE_ROOT}/src/framework/next/comms/comm_engine_res/threads\n ${HCCL_CODE_ROOT}/src/framework/next/coll_comms\n ${HCCL_CODE_ROOT}/src/framework/next/coll_comms/rank\n+ ${HCCL_CODE_ROOT}/src/framework/next/coll_comms/rank/comm_mems/\n ${HCCL_CODE_ROOT}/src/framework/next/coll_comms/rank_pairs\n ${HCCL_CODE_ROOT}/src/framework/next/comms/endpoint_pairs\n ${HCCL_CODE_ROOT}/src/framework/next/comms/endpoint_pairs/channels\n","binary":false,"too_large":false,"collapsed":false,"line_count":[99999,99999],"added_lines":1,"removed_lines":0,"show_type":null,"audit_show_type":{"name":null,"desc":null,"title":null},"amode":null,"bmode":null}],"diff_refs":{"base_sha":"426cc92914fa3c48d50a7f6cc6b5963820af5809","head_sha":"7c1cf5f939ab4046000be183318681deb4a4d630","start_sha":"426cc92914fa3c48d50a7f6cc6b5963820af5809"},"added_lines":102,"removed_lines":57,"change_file_count":17,"change_line_count":159,"too_large":false,"total":17}