[fix] 补齐experimental重名头文件整改-hcomm-AtomGit

已合并

[fix] 补齐experimental重名头文件整改 #4839

YantingLiu创建于 1 天前从YantingLiu/hcomm： fix/experimental-duplicate-header 合入到 cann/hcomm： master

[fix] 补齐experimental重名头文件整改 #4839

已合并

YantingLiu创建于 1 天前

从YantingLiu/hcomm fix/experimental-duplicate-header合入到cann/hcomm master

YantingLiu

1 天前

Pull Request已成功合入, 合并人@CANN-robot

（感谢 YantingLiu 的贡献）

Y YantingLiu

1 天前创建了 pull request，commit b18bb46f

atomgit-bot

1 天前评论：

变更摘要

本 PR 旨在补齐 experimental 模块中重名头文件的整改（标题中的"补齐"表明这是对既有整改的延续收尾）。核心改动是将 experimental 目录下对旧头文件 local_rdma_rma_buffer.h 的引用统一更新为整改后的新头文件 local_rdma_rma_buffer_v2.h，同时清理重复 include 并修正类型别名中 RmaBufferMgr 的命名空间引用，属于编译层面的头文件与命名空间修正，不涉及业务逻辑变更。

主要改动

头文件引用更新：在 experimental/base_comm/channel/host_cpu_roce_channel.h、experimental/base_comm/comm_mem/roce_mem.cc 和 experimental/base_comm/comm_mem/roce_mem.h 中将 #include "local_rdma_rma_buffer.h" 改为 #include "local_rdma_rma_buffer_v2.h"，使包含路径与重命名后的头文件保持一致
去除重复 include：在 experimental/base_comm/comm_mem/roce_mem.h 中删除了一处重复的 #include "local_rdma_rma_buffer.h"，避免头文件重复包含
命名空间修正：在 experimental/base_comm/comm_mem/roce_mem.h 和 experimental/base_comm/comm_mem/urma_mem.h 中，将 LocalRdmaRmaBufferMgr、RemoteRdmaRmaBufferMgr、LocalUbRmaBufferMgr、RemoteUbRmaBufferMgr 等类型别名所使用的 Hccl::RmaBufferMgr 更正为 hcomm::RmaBufferMgr，确保别名指向正确的命名空间定义

atomgit-bot

1 天前评论：

代码审查

✅ 未发现问题

CANN-robot成员

1 天前添加了label：cann-cla/yes

CANN-robot成员

1 天前评论：

Thanks for your pull-request.
The full list of commands accepted by me can be found at here.
You can get sig-info at here.
You can self-configure the PR merge rules for this repository. For more details, please refer to Here.
For more, you also can visit HICANN.

PR Approval Progress

✅ Congratulations! All modules have met the lgtm and approve requirements.

Module Approval Details

module	lgtm status	approve status
experimental	✅ 颜业峰, 劳大钊 (2/2)	✅ 颜业峰 (1/1)

💡 Tip:

Committer can comment /approve or /lgtm

Commenting /approve implies both code review (lgtm) and intent to merge (approve)

CLA Signature Pass

YantingLiu, thanks for your pull request. All authors of the commits have signed the CLA. 👍

CANN-robot成员

1 天前将leabclove,yanglianxiang2,linyf950,yanzhenghang,chenliang267,yanyefeng,chenhao_,dingweiqin_57,songmingyang,wenxuemin,yangxiaoyuan,laodazhao1,yangshaohua,chenke2026,zhongqin2020,bz_lee,Innoecho,chenyia,temper7620,zhangxp1030,lilin_137,hulk1997,ouyangxizi,one_random设为评审人

CANN-robot成员

1 天前将leabclove,yanyefeng,wenxuemin设为审查人

YantingLiu

1 天前评论：

compile

Y YantingLiu

1 天前 update merge request[project id: 7874083, iid: 4839, commit_id: b240783d35702ec6742a47773ac6835adfd5b1fe] virtual merging success

CANN-robot成员

1 天前添加了label：ci-pipeline-running

CANN-robot成员

1 天前评论：

流水线任务触发成功
任务链接 [4a69534fbb7541d6a49fe188867bca42][流水线指导]

任务名称	状态	日志	下载链接
SCA	✅ SUCCESS	>>>>>
antipoison	✅ SUCCESS	>>>>>
Check_Pr	✅ SUCCESS	>>>>>
Compile_Ascend_X86	✅ SUCCESS	>>>>>	>>>>>
Compile_Ascend_ARM	✅ SUCCESS	>>>>>	>>>>>
pre_comment	✅ SUCCESS	>>>>>
Compile_Ascend_X86_ubuntu24	✅ SUCCESS	>>>>>	>>>>>
Compile_Ascend_ARM_ubuntu24	✅ SUCCESS	>>>>>	>>>>>
StaticCheck_codespell	✅ SUCCESS
StaticCheck_link_validity	✅ SUCCESS
StaticCheck_resource_existence	✅ SUCCESS
StaticCheck_tag_closed	✅ SUCCESS
StaticCheck_markdownlint	✅ SUCCESS
ST_Test	✅ SUCCESS
API_Check	✅ SUCCESS	>>>>>
codecheck	✅ SUCCESS	>>>>>
codecheck_style	✅ SUCCESS	>>>>>
UT_Test	✅ SUCCESS		>>>>>
precommit	✅ SUCCESS	>>>>>
PreSmoke_A900_npupool	✅ SUCCESS		>>>>>
PreSmoke_A3_npupool	✅ SUCCESS		>>>>>