已合并
Conv3D DX/DW算子单仓重名文件修改,arch35与arch22同名头文件添加_arch35后缀避免歧义 #8907
cheng_gao创建于 23 天前
Conv3D DX/DW算子单仓重名文件修改,arch35与arch22同名头文件添加_arch35后缀避免歧义 #8907
已合并
cheng_gao创建于 23 天前
cheng_gao
cheng_gao成员
23 天前

描述

Conv3D DX/DW算子单仓重名文件修改,arch35与arch22同名头文件添加_arch35后缀避免歧义

关联的Issue

单仓重名文件整改,不涉及Issue

测试

RDV验证

文档更新

不涉及

类型标签

  • [x ] 其他,请描述:单仓重名文件整改

AI/Agent生成声明

likedislike
Pull Request已成功合入, 合并人@CANN-robot
(感谢 cheng_gao 的贡献)
cheng_gaocheng_gao成员
23 天前 创建了 pull request,commit d642d4bd
atomgit-bot
atomgit-bot
23 天前 评论:

变更摘要

该 PR 属于纯重构改动,目的是消除 arch35arch22 目录下同名头文件带来的歧义:将 arch35 下与 arch22 同名的头文件统一添加 _arch35 后缀后重命名,并同步更新所有引用处。改动不涉及业务逻辑,仅涉及头文件命名、#include 引用及文件路径清单。

主要改动

  • arch35 同名头文件重命名: 为 conv3d_backprop_filter_v2conv3d_backprop_input_v2conv3d_transpose_v2 中与 arch22 同名的头文件添加 _arch35 后缀,例如 conv_bp_func.hconv_bp_func_arch35.hconv_bp_util.hconv_bp_util_arch35.hconv_bp_register.hconv_bp_register_arch35.hconv3d_bp_util.hconv3d_bp_util_arch35.hconv3d_transpose_v2_base_tiling.hconv3d_transpose_v2_base_tiling_arch35.h
  • 更新 #include 引用: 同步修改所有引用被重命名头文件的包含语句,涉及 conv_bp_config_base.hconv_bp_impl_base.hconv_bp_large_kernel_func.hconv3d_bp_filter.hconv3d_bp_filter_impl.hconv3d_bp_filter_intf.hconv3d_bp_input.hconv3d_bp_input_impl.hconv3d_bp_input_intf.hconv3d_bp_common_func.hconv3d_bp_config_base.hconv3d_bp_impl_base.hconv3d_transpose_v2_base_tiling.cpp 等文件
  • 更新 classify_rule.yaml 路径清单: 将 convolution_backprop@ops-nn 规则中 conv3d_backprop_input_v2conv3d_backprop_filter_v2 对应的头文件路径同步改为带 _arch35 后缀的新文件名
  • 补充文件末尾换行: 对 conv_bp_intf_base_arch35.hconv3d_bp_filter_impl.hconv3d_bp_input_impl.h 等重命名文件补充缺失的文件末尾换行符,属于格式性调整
likedislike
不准确?
atomgit-bot
atomgit-bot
23 天前 评论:

代码审查

我已完成对全部 25 个变更文件的审查。以下是逐文件审查结论与总体风险判断。

关闭总结

审查结论(按文件)

存在缺陷的文件(7 处 P0,均为 arch35 构建失败):

  1. conv/conv3d_backprop_filter_v2/op_kernel/arch35/conv3d_backprop/conv_bp_func_arch35.h — 内部仍 #include "conv_bp_util.h"(已重命名),编译失败
  2. conv/conv3d_backprop_filter_v2/op_kernel/arch35/conv3d_backprop/conv_bp_intf_base_arch35.h — 内部仍 include conv_bp_func.h/conv_bp_util.h(均已重命名),编译失败
  3. conv/conv3d_backprop_filter_v2/op_kernel/arch35/conv3d_backprop/conv_bp_register_arch35.h — 仍 include conv_bp_intf_base.h(已重命名),编译失败
  4. conv/conv3d_backprop_input_v2/op_kernel/arch35/convolution_3d_backprop/conv3d_bp_intf_base_arch35.h — 仍 include conv3d_bp_util.h(已重命名),编译失败
  5. conv/conv3d_backprop_input_v2/op_kernel/arch35/convolution_3d_backprop/conv3d_bp_register_arch35.h — 仍 include conv3d_bp_intf_base.h(已重命名),编译失败
  6. conv/conv3d_backprop_filter_v2/op_kernel/arch35/conv3d_backprop_filter_v2/conv3d_backprop_filter_v2_init_output_arch35.h — 重命名导致未修改的入口文件 conv3d_backprop_filter_v2_arch35.h:19-20 引用失效
  7. conv/conv3d_backprop_input_v2/op_kernel/arch35/conv3d_backprop_input_v2/conv3d_backprop_input_v2_init_output_arch35.h — 重命名导致三个未修改的消费方(conv3d_backprop_input_v2_arch35.h:19conv3d_transpose_v2_arch35.h:19extend_conv_transpose.cpp:19)引用失效

无问题(18 个):

  • classify_rule.yaml — 3 处路径更新均指向实际存在的文件,无残留旧名引用
  • conv_bp_config_base.hconv_bp_impl_base.hconv_bp_large_kernel_func.h — include 更新正确
  • conv_bp_util_arch35.h(filter 侧)— 无内部旧名引用
  • conv3d_bp_filter.hconv3d_bp_filter_impl.hconv3d_bp_filter_intf.h — include 更新正确
  • conv3d_dw_v2_basic_block_arch35.h — 内部 include 均存在
  • conv3d_bp_input.hconv3d_bp_input_impl.hconv3d_bp_input_intf.h — include 更新正确
  • conv3d_bp_common_func.hconv3d_bp_config_base.hconv3d_bp_impl_base.h — include 更新正确
  • conv3d_bp_util_arch35.h(input 侧)— 无内部旧名引用
  • conv3d_transpose_v2_base_tiling.cpp — 新头文件存在,include 正确
  • conv3d_transpose_v2_base_tiling_arch35.h — 内部 include 均存在(\file 文档注释仍为旧名,纯风格不报)

统计与总体风险判断

  • 发现总数:7 个 P0(0 个 P1/P2/P3)
  • 总体风险:严重(高风险,合入即破坏构建)

本 PR 是纯重命名重构,但重命名不完整:5 个被重命名文件自身仍引用旧名头文件(6 处 include),另有 4 个未修改的编译入口/消费方(filter/input/transpose 的 *_arch35.h 入口及 extend_conv_transpose.cpp)仍按旧名引用,旧文件名经 glob 验证在 arch35 树中已全部消失。任何一条引用都会让对应 arch35(__CCE_AICORE__==310 / __NPU_ARCH__==3510)kernel 编译单元直接报 "No such file or directory"。由于 include 链被 conv3d_bp_filter.hconv_bp_register_arch35.h 等本 diff 修改的行直接拉入编译,缺陷必然触发。建议在合入前补齐这 11 处 include 的改名(含 4 个未修改消费方),并做一次 arch35 全量编译验证。

类型 数量
🔴 阻塞 10
🟡 建议 0

⛔ 需要修改

likedislike
不准确?
CANN-robotCANN-robot成员
23 天前 添加了label:cann-cla/yes
CANN-robot
CANN-robot成员
23 天前 评论:

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
conv 余鑫, 杨阳, 沈承宗, 刘波 (4/2) 余鑫 (1/1)
repo-cann/ops-nn 刘波, 杨阳 (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

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

likedislike
此处折叠了155条消息 查看更多
CANN-robot
CANN-robot成员
21 天前 评论:

Pull Request 已合并或已关闭。

If you want to solve this problem, you can click here to do it in the FAQs.

likedislike
conv2d_ci
21 天前 评论:
pipeline history
TimeNameResultChangeidTimeStamp
2026-08-21 15:22:42SC_Result :x: 失败I7a4b4aa88f46fe2a9e503cc1bdad90f6457b19f9
likedislike
conv2d_ci
21 天前 评论:
pipeline history
TimeNameResultChangeidTimeStamp
2026-08-21 15:24:10CMETRICS :white_check_mark: 成功I7a4b4aa88f46fe2a9e503cc1bdad90f6457b19f9
likedislike
conv2d_ci
21 天前 评论:
pipeline history
TimeNameResultChangeidTimeStamp
2026-08-21 15:24:31Trigger_RDV :white_check_mark: 触发成功I7a4b4aa88f46fe2a9e503cc1bdad90f6457b19f920260821_152919111
likedislike
conv2d_ci
21 天前 评论:
pipeline history
TimeNameResultChangeidTimeStamp
2026-08-21 17:17:11commit2026-08-20T15:35:25+08:0065a11ddf
SC_Result :x: FAILUREI7a4b4aa
RDV_Result :white_check_mark: SUCCESSI7a4b4aa
本次未执行的rdv任务为
序号任务名未执行理由
1tbe该组的RDV疑似不需要运行:[1951DC, 1951MDC, rdv_tbe_1971_01, rdv_tbe_1981_01, rdv_tbe_1951dc_01, Smoke_1951lite, Smoke_1911mdc, rdv_tbe_1971_02, rdv_tbe_1911rc_01, rdv_tbe_1911ep_01, Smoke_davinci_rdv_Nano, Smoke_nanoc11, rdv_tbe_1952_01]
2David该组的RDV疑似不需要运行:[rdv_tbe_david_01, rdv_tbe_david_02, rdv_tbe_david_03]
3transpose该组的RDV疑似不需要运行:[Davinci_RDV_conv_back_V121, conv_backward_1982_rdv, conv_backward_1971_rdv, conv_transpose_1952_rdv]
likedislike