Pull Request已成功合入, 合并人@CANN-robot
(感谢 zhangzhuopan 的贡献)变更摘要
此 PR 对 UB(统一总线)协议枚举进行了重命名,将 COMM_PROTOCOL_UBC_CTP 改为 COMM_PROTOCOL_UB_CTP,将 COMM_PROTOCOL_UBG 改为 COMM_PROTOCOL_UB_RTP,同时在 include/hcomm_res_defs.h 中将旧枚举名作为新枚举值的别名保留(COMM_PROTOCOL_UBC_CTP = COMM_PROTOCOL_UB_CTP、COMM_PROTOCOL_UBG = COMM_PROTOCOL_UB_RTP),确保向后兼容。此次重命名去掉了协议名中的 "C" 前缀并将 "G" 统一为 "RTP",使命名风格更一致。全仓 20+ 个源文件中的条件判断、switch-case、查表逻辑和日志字符串均已同步更新,并补充了验证别名等价的 UT 用例。
主要改动
-
枚举定义重命名并保留别名:在
include/hcomm_res_defs.h中将枚举值COMM_PROTOCOL_UBC_CTP的定义改为新名COMM_PROTOCOL_UB_CTP,新增COMM_PROTOCOL_UB_RTP = 9,并将旧的COMM_PROTOCOL_UBC_CTP和COMM_PROTOCOL_UBG定义为对应新值的别名,实现源码层面无缝兼容。 -
全局引用点统一迁移:
src/base_comm/、src/coll_communicator_mgr/、src/legacy/等目录下共 18 个源文件中,所有对COMM_PROTOCOL_UBC_CTP和COMM_PROTOCOL_UBG的直接引用(包括 switch-case、if 条件、查表项、映射表)均更新为新枚举名,COMM_PROTOCOL_UBC_TP保持不变。 -
协议字符串与错误信息同步更新:
protocol_utils.h、my_rank.cc、coll_comm_res_c_adpt.cc中的协议名字符串映射从"UBC_CTP"/"UBG"改为"UB_CTP"/"UB_RTP";channel.cc、ubg_endpoint.cc等文件中的错误日志文本也同步更新为新的协议名称。 -
测试用例更新与新增兼容性验证:
test/ut/目录下 4 个测试文件中的枚举引用同步更新;ut_orion_adpt_utils.cc新增CommProtocolLegacyNamesKeepCompatibleValues用例,显式断言COMM_PROTOCOL_UBC_CTP == COMM_PROTOCOL_UB_CTP和COMM_PROTOCOL_UBG == COMM_PROTOCOL_UB_RTP,验证别名等价性。


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.
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 |
|---|---|---|
| docs | ✅ 颜业峰, flyswa, ouyangxizi (3/2) | ✅ 颜业峰, flyswa (2/1) |
| experimental | ✅ 颜业峰, ouyangxizi (2/2) | ✅ 颜业峰 (1/1) |
| include | ✅ 颜业峰, yanzhenghang, ouyangxizi (3/2) | ✅ 颜业峰, yanzhenghang (2/1) |
| repo-cann/hcomm | ✅ yanzhenghang, dingweiqin_57, temper7620, 颜业峰, ouyangxizi (5/2) | ✅ 颜业峰, yanzhenghang, dingweiqin_57, temper7620 (4/1) |
| src/base_comm | ✅ temper7620, 颜业峰, ouyangxizi (3/2) | ✅ temper7620, 颜业峰 (2/1) |
| src/coll_communicator_mgr | ✅ dingweiqin_57, ouyangxizi, 颜业峰 (3/2) | ✅ 颜业峰, dingweiqin_57 (2/1) |
| src/legacy/ascend910/pub_inc | ✅ 颜业峰, yanzhenghang, ouyangxizi (3/2) | ✅ yanzhenghang, 颜业峰 (2/1) |
| src/legacy/ascend950/framework | ✅ 颜业峰, dingweiqin_57, ouyangxizi (3/2) | ✅ 颜业峰, dingweiqin_57 (2/1) |
| src/legacy/ascend950/unified_platform | ✅ 颜业峰, temper7620, ouyangxizi (3/2) | ✅ 颜业峰, temper7620 (2/1) |
| test | ✅ 颜业峰, dingweiqin_57, temper7620, ouyangxizi (4/2) | ✅ temper7620, 颜业峰, dingweiqin_57 (3/1) |
| test/hccl_vm | ✅ whk19940509, ouyangxizi (2/2) | ✅ whk19940509 (1/1) |
💡 Tip:
- Committer can comment
/approveor/lgtm- Commenting
/approveimplies both code review (lgtm) and intent to merge (approve)
CLA Signature Pass
zhangzhuopan, thanks for your pull request. All authors of the commits have signed the CLA. 👍


/approve


/approve


/approve


描述
本次修改统一 UB 协议枚举命名,使协议名称与当前架构定义保持一致:
COMM_PROTOCOL_UB_CTP = 4,替代原有命名COMM_PROTOCOL_UBC_CTP。COMM_PROTOCOL_UB_RTP = 9,替代原有命名COMM_PROTOCOL_UBG。COMM_PROTOCOL_UBC_CTP = COMM_PROTOCOL_UB_CTPCOMM_PROTOCOL_UBG = COMM_PROTOCOL_UB_RTPUB_RTP处理:UB_RTP使用AivUrmaChannel。UB_RTP使用AicpuTsUbgChannel。UB_RTP的 Device ChannelEntity 创建、预分配及 Device Handle 转换。变更类型
请选择本次引入的变更类型:
关联的Issue
NA
测试
已完成的测试用例和场景:
COMM_PROTOCOL_UB_CTP和COMM_PROTOCOL_UB_RTP在 Endpoint、Channel 创建、资源转换及拓扑映射等路径中的处理逻辑。UB_RTPChannel 创建及 Device ChannelEntity 转换流程,确认主线已有的 AIV 直驱 URMA 适配未在冲突解决过程中丢失。git diff --check检查通过。补充的UT用例:
COMM_PROTOCOL_UBC_CTP == COMM_PROTOCOL_UB_CTPCOMM_PROTOCOL_UBG == COMM_PROTOCOL_UB_RTPUB_CTP、UB_RTP协议名称。已通过 A3、A5 RDV用例
文档更新
更新了以下文档中的协议名称及说明:
CommProtocol数据类型定义文档。HcommChannelCreate、HcommEndpointCreate和HcclChannelAcquire接口文档。文档中将
UBC_CTP、UBG分别更新为UB_CTP、UB_RTP,同时保留旧枚举名称的兼容性说明。合入检查