attention 重复安装头文件修改-ops-transformer-AtomGit

已合并

attention 重复安装头文件修改 #6020

chenglongyu创建于 5月27日从chenglongyu/ops-transformer： repeat_clean_ins 合入到 cann/ops-transformer： master

attention 重复安装头文件修改 #6020

已合并

chenglongyu创建于 5月27日

从chenglongyu/ops-transformer repeat_clean_ins合入到cann/ops-transformer master

chenglongyu成员

5月27日

描述

各算子的目录下各自维护的头文件存在命名重复的问题。各头文件加上算子名前缀做区分。

原头文件名称	新头文件名称	文件路径
common_header.h	sparse_flash_mla_grad_common_header.h	attention/sparse_flash_mla_grad/op_kernel/arch22/basic_modules/sparse_flash_mla_grad_common_header.h
common_header.h	sparse_flash_attention_grad_common_header.h	attention/sparse_flash_attention_grad/basic_modules/sparse_flash_attention_grad_common_header.h
common_header.h	nsa_selected_attention_grad_common_header.h	attention/nsa_selected_attention_grad/basic_modules/nsa_selected_attention_grad_common_header.h
common_header.h	flash_attention_score_grad_common_header.h	attention/flash_attention_score_grad/op_kernel/arch22/basic_modules/flash_attention_score_grad_common_header.h
common_utils.h	attention_worker_combine_common_utils.h	attention/attention_worker_combine/op_kernel/attention_worker_combine_common_utils.h
gm_to_l1_iterator.h	mla_preprocess_gm_to_l1_iterator.h	attention/mla_preprocess/op_kernel/mla_preprocess_gm_to_l1_iterator.h
gm_to_ub_iterator.h	mla_preprocess_gm_to_ub_iterator.h	attention/mla_preprocess/op_kernel/mla_preprocess_gm_to_ub_iterator.h
kernel_common.hpp	rain_fusion_attention_kernel_common.hpp	attention/rain_fusion_attention/op_kernel/rain_fusion_attention_kernel_common.hpp
kernel_common.hpp	fia_kernel_common.hpp	attention/fused_infer_attention_score/op_kernel/fia_kernel_common.hpp
kernel_common.hpp	block_sparse_attention_kernel_common.hpp	attention/block_sparse_attention/op_kernel/block_sparse_attention_kernel_common.hpp
l0c_to_gm_iterator.h	mla_preprocess_l0c_to_gm_iterator.h	attention/mla_preprocess/op_kernel/mla_preprocess_l0c_to_gm_iterator.h
l0c_to_l1_iterator.h	mla_preprocess_l0c_to_l1_iterator.h	attention/mla_preprocess/op_kernel/mla_preprocess_l0c_to_l1_iterator.h
l0c_to_ub_iterator.h	mla_preprocess_l0c_to_ub_iterator.h	attention/mla_preprocess/op_kernel/mla_preprocess_l0c_to_ub_iterator.h
l1_to_bt_iterator.h	mla_preprocess_l1_to_bt_iterator.h	attention/mla_preprocess/op_kernel/mla_preprocess_l1_to_bt_iterator.h
l1_to_fb_iterator.h	mla_preprocess_l1_to_fb_iterator.h	attention/mla_preprocess/op_kernel/mla_preprocess_l1_to_fb_iterator.h
l1_to_l0_iterator.h	mla_preprocess_l1_to_l0_iterator.h	attention/mla_preprocess/op_kernel/mla_preprocess_l1_to_l0_iterator.h
l1_to_ub_iterator.h	mla_preprocess_l1_to_ub_iterator.h	attention/mla_preprocess/op_kernel/mla_preprocess_l1_to_ub_iterator.h
mla_common.h	prompt_flash_attention_mla_common.h	attention/prompt_flash_attention/op_kernel/arch22/prompt_flash_attention_mla_common.h
mla_common.h	mla_preprocess_mla_common.h	attention/mla_preprocess/op_kernel/mla_preprocess_mla_common.h
cube_op.h	sparse_flash_mla_grad_cube_op.h	attention/sparse_flash_mla_grad/op_kernel/arch22/basic_modules/sparse_flash_mla_grad_cube_op.h
matmul.h	sparse_flash_mla_grad_matmul.h	attention/sparse_flash_mla_grad/op_kernel/arch22/basic_modules/sparse_flash_mla_grad_matmul.h
vec_op.h	sparse_flash_mla_grad_vec_op.h	attention/sparse_flash_mla_grad/op_kernel/arch22/basic_modules/sparse_flash_mla_grad_vec_op.h
cube_op.h	sparse_flash_attention_grad_cube_op.h	attention/sparse_flash_attention_grad/basic_modules/sparse_flash_attention_grad_cube_op.h
matmul.h	sparse_flash_attention_grad_matmul.h	attention/sparse_flash_attention_grad/basic_modules/sparse_flash_attention_grad_matmul.h
vec_op.h	sparse_flash_attention_grad_vec_op.h	attention/sparse_flash_attention_grad/basic_modules/sparse_flash_attention_grad_vec_op.h

关联的Issue

https://gitcode.com/cann/ops-transformer/issues/2680

测试

文档更新

类型标签

🐛 Bug 修复
✨ 新特性
⚡ 性能优化
♻️ 重构
🧪 测试
📦 构建/CI
🔧 配置变更
📝 文档更新
⬆️ 依赖升级
🔒 安全修复
🧹 代码清理
❓ 其他，请描述：

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

（感谢 chenglongyu 的贡献）

chenglongyu成员

5月27日创建了 pull request，commit 401f61fb

CANN-robot成员

5月27日添加了label：stat/needs-squash

CANN-robot成员

5月27日评论：

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

PR Approval Progress

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

Module Approval Details

module	lgtm status	approve status
attention	✅ haijie_699874, zzy__ (2/2)	✅ haijie_699874 (1/1)

💡 Tip:

Committer can comment /approve or /lgtm

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

CLA Signature Pass

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

CANN-robot成员

5月27日添加了label：cann-cla/yes

CANN-robot成员

5月27日将juyangokok,monologue815,crystalhu,yu-xinjie62,huangwei791,jiang-lirui,yang-binrong,Allan_Yu,liudan12,wangzhe123456789,cc-z,shen_weiling,gaoxiang618,songjionghui,wenxin_fight,miaofangzheng,mabing1118,tang-hao-hw-gitcode,haijie_699874,zzy__设为评审人

CANN-robot成员

chenglongyu成员

5月27日评论：

compile

chenglongyu成员

5月27日 update merge request[project id: 7673863, iid: 6020, commit_id: 647b9d9ab41ea4641417466539daec41fec194c8] virtual merging success

CANN-robot成员

5月27日添加了label：ci-pipeline-running

CANN-robot成员

5月27日评论：

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

任务名称	状态	日志	下载链接
Compile_Ascend_X86	✅ SUCCESS	>>>>>	>>>>>
Compile_Ascend_ARM	✅ SUCCESS	>>>>>	>>>>>
Compile_Ascend_X86_mobile_station	✅ SUCCESS	>>>>>	>>>>>
Compile_Ascend_X86_experimental	✅ SUCCESS	>>>>>	>>>>>
Compile_Ascend_ARM_experimental	✅ SUCCESS	>>>>>	>>>>>
Compile_Pre	✅ SUCCESS	>>>>>
pre_comment	✅ SUCCESS	>>>>>
Compile_Ascend_X86_ubuntu24	✅ SUCCESS	>>>>>	>>>>>
Compile_Ascend_X86_mobile_station_ubuntu24	✅ SUCCESS	>>>>>	>>>>>
Compile_Ascend_ARM_ubuntu24	✅ SUCCESS	>>>>>	>>>>>
Compile_Ascend_X86_experimental_ubuntu24	✅ SUCCESS	>>>>>	>>>>>
Compile_Ascend_ARM_experimental_ubuntu24	✅ SUCCESS	>>>>>	>>>>>
Compile_X86_monitor_910b	✅ SUCCESS	>>>>>	>>>>>
Compile_X86_monitor_910c	✅ SUCCESS	>>>>>	>>>>>
Compile_X86_monitor_950	✅ SUCCESS	>>>>>	>>>>>
Compile_Ascend_X86_experimental_950	✅ SUCCESS	>>>>>	>>>>>
Compile_Ascend_ARM_experimental_950	✅ SUCCESS	>>>>>	>>>>>
Compile_Ascend_X86_experimental_950_ubuntu24	✅ SUCCESS	>>>>>	>>>>>
Compile_Ascend_ARM_experimental_950_ubuntu24	✅ SUCCESS	>>>>>	>>>>>
UT_Test	✅ SUCCESS
PreSmoke_A900	✅ SUCCESS		>>>>>
API_Check	✅ SUCCESS	>>>>>
PreSmoke_ATK_Test_A2	✅ SUCCESS		>>>>>

[2026-05-28 00:17:51] CI执行结束

CANN-robot成员

5月27日评论：

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

任务名称	状态	日志	下载链接
codecheck	❌ FAILED
SCA	✅ SUCCESS	>>>>>
antipoison	✅ SUCCESS	>>>>>
codecheck_style	✅ SUCCESS	>>>>>
StaticCheck_codespell_check	✅ SUCCESS
StaticCheck_link_validity_check	✅ SUCCESS
StaticCheck_resource_existence_check	✅ SUCCESS
StaticCheck_tag_closed_check	✅ SUCCESS
StaticCheck_markdownlint	✅ SUCCESS
codecheck_checkpr	✅ SUCCESS
codecheck_precommit	⚠️ WARNING	>>>>>	>>>>>

CANN-robot成员

5月28日添加了label：api-check-pass

此处折叠了7条事件消息查看更多

CANN-robot成员

5月28日删除了label：stat/needs-squash

chenglongyu成员

5月28日评论：

compile

chenglongyu成员

5月28日 update merge request[project id: 7673863, iid: 6020, commit_id: d7fbfa8683efe433a15538e96f926478fb6982fd] virtual merging success

CANN-robot成员

5月28日删除了label：ci-pipeline-failedapi-check-pass

CANN-robot成员

5月28日添加了label：ci-pipeline-running

CANN-robot成员

5月28日评论：

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

任务名称	状态	日志	下载链接
Compile_Ascend_X86	✅ SUCCESS	>>>>>	>>>>>
Compile_Ascend_ARM	✅ SUCCESS	>>>>>	>>>>>
Compile_Ascend_X86_mobile_station	✅ SUCCESS	>>>>>	>>>>>
Compile_Ascend_X86_experimental	✅ SUCCESS	>>>>>	>>>>>
Compile_Ascend_ARM_experimental	✅ SUCCESS	>>>>>	>>>>>
Compile_Pre	✅ SUCCESS	>>>>>
pre_comment	✅ SUCCESS	>>>>>
Compile_Ascend_X86_ubuntu24	✅ SUCCESS	>>>>>	>>>>>
Compile_Ascend_X86_mobile_station_ubuntu24	✅ SUCCESS	>>>>>	>>>>>
Compile_Ascend_ARM_ubuntu24	✅ SUCCESS	>>>>>	>>>>>
Compile_Ascend_X86_experimental_ubuntu24	✅ SUCCESS	>>>>>	>>>>>
Compile_Ascend_ARM_experimental_ubuntu24	✅ SUCCESS	>>>>>	>>>>>
Compile_X86_monitor_910b	✅ SUCCESS	>>>>>	>>>>>
Compile_X86_monitor_910c	✅ SUCCESS	>>>>>	>>>>>
Compile_X86_monitor_950	✅ SUCCESS	>>>>>	>>>>>
Compile_Ascend_X86_experimental_950	✅ SUCCESS	>>>>>	>>>>>
Compile_Ascend_ARM_experimental_950	✅ SUCCESS	>>>>>	>>>>>
Compile_Ascend_X86_experimental_950_ubuntu24	✅ SUCCESS	>>>>>	>>>>>
Compile_Ascend_ARM_experimental_950_ubuntu24	✅ SUCCESS	>>>>>	>>>>>
UT_Test	✅ SUCCESS
PreSmoke_A900	✅ SUCCESS		>>>>>
API_Check	✅ SUCCESS	>>>>>
PreSmoke_ATK_Test_A2	✅ SUCCESS		>>>>>

[2026-05-28 20:09:04] CI执行结束

CANN-robot成员

5月28日评论：

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

任务名称	状态	日志	下载链接
codecheck	❌ FAILED
SCA	✅ SUCCESS	>>>>>
antipoison	✅ SUCCESS	>>>>>
codecheck_style	✅ SUCCESS	>>>>>
StaticCheck_codespell_check	✅ SUCCESS
StaticCheck_link_validity_check	✅ SUCCESS
StaticCheck_resource_existence_check	✅ SUCCESS
StaticCheck_tag_closed_check	✅ SUCCESS
StaticCheck_markdownlint	✅ SUCCESS
codecheck_checkpr	✅ SUCCESS
codecheck_precommit	⚠️ WARNING	>>>>>	>>>>>

chenglongyu成员

5月28日关联了issue：[Requirement|需求建议]: 子包内存在重名头文件安装在不同目录的问题

此处折叠了6条事件消息查看更多

CANN-robot成员

5月29日添加了label：ci-pipeline-running

CANN-robot成员

5月29日评论：

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

任务名称	状态	日志	下载链接
codecheck	✅ SUCCESS
SCA	✅ SUCCESS	>>>>>
antipoison	✅ SUCCESS	>>>>>
codecheck_style	✅ SUCCESS	>>>>>
StaticCheck_codespell_check	✅ SUCCESS
StaticCheck_link_validity_check	✅ SUCCESS
StaticCheck_resource_existence_check	✅ SUCCESS
StaticCheck_tag_closed_check	✅ SUCCESS
StaticCheck_markdownlint	✅ SUCCESS
codecheck_checkpr	✅ SUCCESS
codecheck_precommit	⚠️ WARNING	>>>>>	>>>>>

[2026-05-29 09:34:02] CI执行结束

CANN-robot成员

5月29日删除了label：ci-pipeline-running

CANN-robot成员

5月29日添加了label：ci-pipeline-passed

赵

赵志勇成员

5月29日评论：

/lgtm

张海杰成员

5月29日评论：

/approve

CANN-robot成员

5月29日添加了label：lgtmapproved

CANN-robot成员

5月29日评论：

Review Guide

This pull-request passes review.
Committers who wrote a comment of /approve are: haijie_699874.
Reviewers who wrote a comment of /lgtm are: haijie_699874, zzy__.

CANN-robot成员

5月29日合入了pull request