Merged
fix(ccu): align hcomm contract header include paths #265
DragonBornHD84Add on 26 days ago
fix(ccu): align hcomm contract header include paths #265
Merged
DragonBornHD84Add on 26 days ago
DragonBornHD84Collaborators
26 days ago

当前PR是否有AI参与:

[x] 否

[ ] 是
__1. AI Agent 平台:
__2. AI 模型:
__3. Prompt上下文 :

PR功能描述 / 为什么需要这个合入**:

该PR关联的issue

(格式为fixes #<issue号>, 或者resolves #<issue号>): fixes #

希望检视人员了解:

改动类型 / Change Type

测试信息 / Testing

检查清单 / Checklist

likedislike
Pull Request has been successfully merged by CANN-robot.
(Thank you for DragonBornHD84's contribution.)
DDragonBornHD84Collaborators
26 days ago Created pull request, commit 8ed04926
atomgit-bot
atomgit-bot
26 days ago Comments:

变更摘要

本 PR 主要围绕 CCU 相关的 hcomm 契约头文件路径进行对齐调整。核心操作是将 hcomm_res_ccu_entity_defs.h 归入 hcomm/ccu/ 子目录(pkg_inc/hcomm/ → pkg_inc/hcomm/ccu/),并同步更新 include、src、examples、tests 各处对该头文件的 include 路径为 hcomm/ccu/hcomm_res_ccu_entity_defs.h;同时修正了示例中一处相对路径的层级偏差,并删除了若干旧的 hcomm 头文件。

主要改动

  • CCU 契约头文件迁移: 将 hcomm_res_ccu_entity_defs.h 移动到 pkg_inc/hcomm/ccu/ 目录下(pkg_inc/hcomm/ccu/hcomm_res_ccu_entity_defs.h,renamed、内容不变)。
  • 统一 include 路径: 在 include/ccu/、src/ccu/hcomm/、tests/ut/ccu/、examples/common/ccu_instance.h 等多处文件中,把 hcomm/hcomm_res_ccu_entity_defs.h 改为 hcomm/ccu/hcomm_res_ccu_entity_defs.h,使引用与新的目录结构一致。
  • 修正示例相对路径层级: 在 examples/ccu/ccu_custom/10_ccu_transfer/op_host/alg_resource.cc 中,将 #include "../../../common/ccu_instance.h" 修正为 #include "../../../../common/ccu_instance.h",以匹配实际目录层级。
  • 删除旧的 hcomm 头文件: 移除了 pkg_inc/hcomm/hcomm_exception.h、pkg_inc/hcomm/hcomm_primitives_expt.h、pkg_inc/hcomm/hcomm_team_entity_defs.h 三个头文件(其中包含异常回调、HcommThreadJoin、团队/窗口 ABI 结构体等声明)。
likedislike
Incorrect?
atomgit-bot
atomgit-bot
26 days ago Comments:

代码审查

✅ 未发现问题

likedislike
Incorrect?
CANN-robotCANN-robotCollaborators
26 days ago Added label: cann-cla/yes
CANN-robot
CANN-robotCollaborators
26 days ago Comments:

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
examples ✅ 石楠翔, zhanghao_0689 (2/2) ✅ 石楠翔 (1/1)
include ✅ zhanghao_0689, 石楠翔 (2/2) ✅ zhanghao_0689 (1/1)
repo-cann/asc-comm ✅ 石楠翔, zhanghao_0689 (2/2) ✅ 石楠翔, zhanghao_0689 (2/1)
src ✅ 石楠翔, zhanghao_0689 (2/2) ✅ 石楠翔 (1/1)
tests ✅ 石楠翔, zhanghao_0689 (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

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

likedislike
DDragonBornHD84Collaborators
26 days ago Associated issue: [Requirement|需求建议]:样例引用的头文件路径需要更新
DragonBornHD84Collaborators
26 days ago Comments:

compile

likedislike
DDragonBornHD84Collaborators
26 days ago Pre merge succeeded (commit_id: 2cdf99e18e7c54c9e2a38f102bfa271a00569b47)
CANN-robot
CANN-robotCollaborators
26 days ago Comments:
🚀 CI 流水线已启动
📋 执行详情: 点击查看流水线
likedislike
CANN-robotCANN-robotCollaborators
26 days ago Added label: ci-pipeline-running
6 event messages are collapsed here。 See more
CANN-robotCANN-robotCollaborators
26 days ago Removed label: ci-pipeline-passed
CANN-robot
CANN-robotCollaborators
26 days ago Comments:

Notification

This pull request has been changed(code update) or closed, so removes the following label(s): ci-pipeline-passed.

likedislike
CANN-robotCANN-robotCollaborators
26 days ago Added label: cann-cla/yes
DragonBornHD84Collaborators
26 days ago Comments:

compile

likedislike
DDragonBornHD84Collaborators
26 days ago Pre merge succeeded (commit_id: 08a5530629a461784b90bc17806429105bf3461f)
CANN-robot
CANN-robotCollaborators
26 days ago Comments:
🚀 CI 流水线已启动
📋 执行详情: 点击查看流水线
likedislike
CANN-robotCANN-robotCollaborators
26 days ago Added label: ci-pipeline-running
6 event messages are collapsed here。 See more
CANN-robotCANN-robotCollaborators
26 days ago Removed label: ci-pipeline-passed
CANN-robot
CANN-robotCollaborators
26 days ago Comments:

Notification

This pull request has been changed(code update) or closed, so removes the following label(s): ci-pipeline-passed.

likedislike
CANN-robotCANN-robotCollaborators
26 days ago Added label: cann-cla/yes
DragonBornHD84Collaborators
26 days ago Comments:

compile

likedislike
DDragonBornHD84Collaborators
26 days ago Pre merge succeeded (commit_id: e383aa67661d6c412156bc8deefe5cfb41e496a6)
CANN-robot
CANN-robotCollaborators
26 days ago Comments:
🚀 CI 流水线已启动
📋 执行详情: 点击查看流水线
likedislike
CANN-robotCANN-robotCollaborators
26 days ago Added label: ci-pipeline-running
CANN-robotCANN-robotCollaborators
26 days ago Removed label: ci-pipeline-running
CANN-robotCANN-robotCollaborators
26 days ago Added label: ci-pipeline-passed
zhanghao_0689
zhanghao_0689Collaborators
26 days ago Comments:

/lgtm
/approve

likedislike
shi_nanxiangCollaborators
26 days ago Comments:

/lgtm
/approve

likedislike
CANN-robotCANN-robotCollaborators
26 days ago Added label: lgtmapproved
CANN-robotCANN-robotCollaborators
26 days ago Merged pull request