已合并
update: dlog头文件路径调整,更新文件 Finddlog.cmake #1314
fujun19创建于 9 天前
update: dlog头文件路径调整,更新文件 Finddlog.cmake #1314
已合并
fujun19创建于 9 天前
fujun19
9 天前

描述

本次变更适配 dlog 头文件目录调整,更新 cmake/modules/Finddlog.cmakeDLOG_HEAD_SEARCH_PATHS 的 CI 编译搜索路径:

  • ${TOP_DIR}/abl/slog/inc/toolchain 替换为 ${TOP_DIR}/runtime/pkg_inc/base
  • 保留现有 Ascend 安装目录下的 toolchain/pkg_inc/base 查找路径,确保 dlog 头文件可从新的 runtime 包结构中定位。

关联的Issue

测试

已验证构建出包正常,确认更新后的 dlog 头文件搜索路径可满足编译查找。

文档更新

NA,未涉及文档更新。

类型标签

likedislike
Pull Request已成功合入, 合并人@CANN-robot
(感谢 fujun19 的贡献)
Ffujun19
9 天前 创建了 pull request,commit 15add7ff
atomgit-bot
atomgit-bot
9 天前 评论:

变更摘要

本次变更主要调整了 dlog 头文件的搜索路径。PR 将 cmake/modules/Finddlog.cmakeDLOG_HEAD_SEARCH_PATHS 里用于 CI 编译的头文件路径从旧的 slog 目录结构更新为新的 runtime 包目录结构,以适配 dlog 接口路径的迁移。测试方面已验证构建出包正常。

主要改动

  • 更新 dlog 头文件搜索路径: 将 DLOG_HEAD_SEARCH_PATHS 中标注为 compile with ci 的路径由 ${TOP_DIR}/abl/slog/inc/toolchain 修改为 ${TOP_DIR}/runtime/pkg_inc/base,使 CMake 在 CI 编译时能够从新的 runtime 包目录查找 dlog 头文件。
likedislike
CANN-robot
CANN-robot成员
9 天前 评论:

Hi @fujun19, welcome to submitting your first PR to ops-cv!

PR Merge Steps

1. CLA Signing

If the current PR label includes cann-cla/yes, it means you have signed the CLA and can proceed to the next step. If the label includes cann-cla/no, please sign the CLA first. If you have any questions, please refer to the FAQ.

2. CI Check

Please comment /compile to trigger the CI pipeline check. If the CI run is successful, the PR will be tagged with ci-pipeline-passed and you can proceed to the next step. If the CI run fails, the PR will be tagged with ci-pipeline-failed, please check the CI logs to fix the issues in the PR. If you have any questions, please refer to the FAQ.

3. Code Review

After CI passes, please refer to the PR Approval Progress and proactively @ the committers in the table to review the code. After approval, committers will comment /lgtm and /approve. Once the lgtm and approved labels are successfully added, the PR will be merged automatically.

likedislike
atomgit-bot
atomgit-bot
9 天前 评论:

代码审查

✅ 未发现问题

likedislike
CANN-robotCANN-robot成员
9 天前 添加了label:cann-cla/yes
CANN-robot
CANN-robot成员
9 天前 评论:

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
repo-cann/ops-cv 汤平川, 刘伟 (2/2) 汤平川, 刘伟 (2/1)

💡 Tip:

  • Committer can comment /approve or /lgtm
  • Commenting /approve implies both code review (lgtm) and intent to merge (approve)

CLA Signature Pass

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

likedislike
CANN-robotCANN-robot成员
9 天前 将yue-ma,zhou-qilong,rxtfeng,loov1,zhangzijie,zl_hw,liu-wei,pingchuantang,llimwang,gubaocheng设为评审人
CANN-robotCANN-robot成员
9 天前 将yue-ma,zhou-qilong,rxtfeng,loov1,zhangzijie,zl_hw,liu-wei,pingchuantang,llimwang,gubaocheng设为审查人
Ffujun19
9 天前 修改了pull request 的描述
Ffujun19
9 天前 修改标题为 “update: dlog头文件路径调整,更新文件 Finddlog.cmake”,原标题为“update: 更新文件 Finddlog.cmake”
fujun19
9 天前 评论:

compile

likedislike
Ffujun19
9 天前 update merge request[project id: 7657293, iid: 1314, commit_id: ea461e8d5269f7afb93a317e299805ea43b1637d] virtual merging success
CANN-robotCANN-robot成员
9 天前 添加了label:ci-pipeline-running
CANN-robot
CANN-robot成员
9 天前 评论:

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

任务名称状态日志下载链接
Compile_Ascend_X86 ✅ SUCCESS >>>>> >>>>>
Compile_Ascend_X86_mobile_station ✅ SUCCESS >>>>> >>>>>
Compile_Ascend_ARM ✅ SUCCESS >>>>> >>>>>
Compile_Ascend_X86_experimental ✅ SUCCESS >>>>> >>>>>
Compile_Ascend_ARM_experimental ✅ SUCCESS >>>>> >>>>>
Compile_Ascend_X86_A5 ✅ SUCCESS >>>>> >>>>>
Compile_Ascend_ARM_A5 ✅ SUCCESS >>>>> >>>>>
pre_comment ✅ SUCCESS >>>>>
Compile_Pre ✅ SUCCESS >>>>>
Compile_Ascend_X86_ubuntu24 ✅ SUCCESS >>>>> >>>>>
Compile_Ascend_X86_mobile_station_ubuntu24 ✅ SUCCESS >>>>> >>>>>
Compile_Ascend_X86_experimental_ubuntu24 ✅ SUCCESS >>>>> >>>>>
Compile_Ascend_X86_A5_ubuntu24 ✅ SUCCESS >>>>> >>>>>
Compile_Ascend_ARM_ubuntu24 ✅ SUCCESS >>>>> >>>>>
Compile_Ascend_ARM_experimental_ubuntu24 ✅ SUCCESS >>>>> >>>>>
Compile_Ascend_ARM_A5_ubuntu24 ✅ SUCCESS >>>>> >>>>>
Compile_X86_monitor_910b ✅ SUCCESS >>>>> >>>>>
Compile_X86_monitor_910c ✅ SUCCESS >>>>> >>>>>
Compile_X86_monitor_950 ✅ SUCCESS >>>>> >>>>>
Compile_classify ✅ SUCCESS >>>>>
Compile_Ascend_X86_mobile_station_9030_ubuntu24 ✅ SUCCESS >>>>> >>>>>

[2026-08-17 16:27:49]    CI执行结束

likedislike
CANN-robot
CANN-robot成员
9 天前 评论:

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

任务名称状态日志下载链接
SCA ✅ SUCCESS >>>>>
antipoison ✅ SUCCESS >>>>>
codecheck_checkpr ✅ SUCCESS
StaticCheck_codespell ✅ SUCCESS
StaticCheck_link_validity ✅ SUCCESS
StaticCheck_resource_existence ✅ SUCCESS
StaticCheck_tag_closed ✅ SUCCESS
StaticCheck_markdownlint ✅ SUCCESS
codecheck_precommit ✅ SUCCESS >>>>>

[2026-08-17 16:24:14]    CI执行结束

likedislike
Ffujun19
9 天前 update merge request[project id: 7657293, iid: 1314, commit_id: 8f57030d19cc93b1493b555721ccbf68e5ae614e] virtual merging success
Ffujun19
9 天前 推送  1 个提交:8f128142-update: 更新文件 Finddlog.cmake
Ffujun19
9 天前 update merge request[project id: 7657293, iid: 1314, commit_id: f3dd65b76daf82be8e61e11135e0332f6edcc9a6] virtual merging success
CANN-robotCANN-robot成员
9 天前 删除了label:cann-cla/yes
CANN-robotCANN-robot成员
9 天前 添加了label:stat/needs-squash
CANN-robotCANN-robot成员
9 天前 添加了label:cann-cla/yes
fujun19
9 天前 评论:

compile

likedislike
Ffujun19
9 天前 update merge request[project id: 7657293, iid: 1314, commit_id: 9b985e6c186fe8095752ac68cf2cc8d57a55c7a4] virtual merging success
CANN-robotCANN-robot成员
9 天前 删除了label:ci-pipeline-running
CANN-robotCANN-robot成员
9 天前 添加了label:ci-pipeline-running
CANN-robot
CANN-robot成员
9 天前 评论:

流水线任务触发成功
任务链接 [13de7dee939f4972b165edaccb7ee05c][流水线指导]

任务名称状态日志下载链接
Compile_Ascend_X86 ✅ SUCCESS >>>>> >>>>>
Compile_Ascend_X86_mobile_station ✅ SUCCESS >>>>> >>>>>
Compile_Ascend_ARM ✅ SUCCESS >>>>> >>>>>
Compile_Ascend_X86_experimental ✅ SUCCESS >>>>> >>>>>
Compile_Ascend_ARM_experimental ✅ SUCCESS >>>>> >>>>>
Compile_Ascend_X86_A5 ✅ SUCCESS >>>>> >>>>>
Compile_Ascend_ARM_A5 ✅ SUCCESS >>>>> >>>>>
pre_comment ✅ SUCCESS >>>>>
Compile_Pre ✅ SUCCESS >>>>>
Compile_Ascend_X86_ubuntu24 ✅ SUCCESS >>>>> >>>>>
Compile_Ascend_X86_mobile_station_ubuntu24 ✅ SUCCESS >>>>> >>>>>
Compile_Ascend_X86_experimental_ubuntu24 ✅ SUCCESS >>>>> >>>>>
Compile_Ascend_X86_A5_ubuntu24 ✅ SUCCESS >>>>> >>>>>
Compile_Ascend_ARM_ubuntu24 ✅ SUCCESS >>>>> >>>>>
Compile_Ascend_ARM_experimental_ubuntu24 ✅ SUCCESS >>>>> >>>>>
Compile_Ascend_ARM_A5_ubuntu24 ✅ SUCCESS >>>>> >>>>>
Compile_X86_monitor_910b ✅ SUCCESS >>>>> >>>>>
Compile_X86_monitor_910c ✅ SUCCESS >>>>> >>>>>
Compile_X86_monitor_950 ✅ SUCCESS >>>>> >>>>>
Compile_classify ✅ SUCCESS >>>>>
Compile_Ascend_X86_mobile_station_9030_ubuntu24 ✅ SUCCESS >>>>> >>>>>
UT_Test ✅ SUCCESS
PreSmoke_A900 ✅ SUCCESS >>>>>
API_Check ✅ SUCCESS >>>>>
PreSmoke_ATK_Test_A2 ✅ SUCCESS >>>>>
UT_Test_report_lcov ✅ SUCCESS

[2026-08-17 16:34:37]    CI执行结束

likedislike
CANN-robot
CANN-robot成员
9 天前 评论:

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

任务名称状态日志下载链接
SCA ✅ SUCCESS >>>>>
antipoison ✅ SUCCESS >>>>>
codecheck_checkpr ✅ SUCCESS
StaticCheck_codespell ✅ SUCCESS
StaticCheck_link_validity ✅ SUCCESS
StaticCheck_resource_existence ✅ SUCCESS
StaticCheck_tag_closed ✅ SUCCESS
StaticCheck_markdownlint ✅ SUCCESS
codecheck_precommit ✅ SUCCESS >>>>>

[2026-08-17 16:29:55]    CI执行结束

likedislike
CANN-robotCANN-robot成员
9 天前 添加了label:api-check-pass
CANN-robotCANN-robot成员
9 天前 删除了label:ci-pipeline-running
CANN-robotCANN-robot成员
9 天前 添加了label:ci-pipeline-passed
Ffujun19
9 天前 修改了pull request 的描述
Ffujun19
9 天前 修改了pull request 的描述
fujun19
9 天前 评论:

@zhangzijie dlog头文件路径更新,麻烦加分

likedislike
TangPC
TangPC成员
9 天前 评论:

/lgtm
/approve

likedislike
CANN-robotCANN-robot成员
9 天前 添加了label:approved
liu-wei
liu-wei成员
9 天前 评论:

/lgtm
/approve

likedislike
CANN-robotCANN-robot成员
9 天前 添加了label:lgtm
CANN-robotCANN-robot成员
9 天前 合入了pull request