Merged
fix(foreach): 8个issue批量修复——错误码表对齐161002、out shape约束、列表长度错误码、资料修正、UT补齐 #13610
fix(foreach): 8个issue批量修复——错误码表对齐161002、out shape约束、列表长度错误码、资料修正、UT补齐 #13610
Merged
Tian_1122Add on 18 days ago
Tian_1122
Tian_1122Collaborators
18 days ago

描述

本 PR 针对 foreach 系列算子(aclnnForeachAddListV2、aclnnForeachAddScalar/V2、aclnnForeachAddcmulScalarV2)批量修复 8 个 issue,主要围绕错误码与参数校验规则对齐:统一列表长度不一致时的校验位置与错误码(161002),将 out 与 x1 的 shape 约束由“必须完全一致”改为“out 元素数不小于 x1”,补充 out 的最大维度检查,并同步修正接口文档中的数据类型说明、补齐 Host 与 Kernel 侧 UT。

关联的Issue

#7937
#7929
#7926
#7925
#7939
#7967
#7946
#7945

测试

文档更新

类型标签

AI/Agent生成声明

likedislike
Pull Request has been successfully merged by CANN-robot.
(Thank you for Tian_1122's contribution.)
Tian_1122Tian_1122Collaborators
18 days ago Created pull request, commit 86d5a1ad
Tian_1122Tian_1122Collaborators
18 days ago Associated issue: [Documentation|文档反馈]:[aclnnForeachAddList] aclnnForeachAddList 错误码表 4 行子项实际返回 161002/561103,而非声明的 561002,[Documentation|文档反馈]:[aclnnForeachAddListV2] aclnnForeachAddListV2 资料三处与实现/事实不符(out shape 约束、空 Tensor 支持面、头文件 dtype 注释),[Documentation|文档反馈]: aclnnForeachAddScalar 错误码表 561002 段缺「x 与 out 的 tensorList 长度不一致」子项(实测返回 561002),[Bug-Report|缺陷反馈]: aclnnForeachAddcmulScalarV2 拒绝 out 的 shape size 大于 x1(资料允许 ≥,同族三变体均接受),[Bug-Report|缺陷反馈]: aclnnForeachDivScalar 的 shape/rank 违规返回 161002,资料声明 561002,[Documentation|文档反馈]: aclnnForeachAsin 错误码表两段写反(257 元素实测 161002、rank=9 实测 561002),[Documentation|文档反馈]: aclnnForeachAtan 错误码表两段写反(257 元素实测 161002、rank=9 实测 561002),[Documentation|文档反馈]: aclnnForeachLerpScalar 错误码表把「Tensor 维度超过8维」列在 561002 下,实测返回 161002
atomgit-bot
atomgit-bot
18 days ago Comments:

变更摘要

本 PR 针对 foreach 系列算子(aclnnForeachAddListV2、aclnnForeachAddScalar/V2、aclnnForeachAddcmulScalarV2)批量修复 8 个 issue,主要围绕错误码与参数校验规则对齐:统一列表长度不一致时的校验位置与错误码(161002),将 out 与 x1 的 shape 约束由“必须完全一致”改为“out 元素数不小于 x1”,补充 out 的最大维度检查,并同步修正接口文档中的数据类型说明、补齐 Host 与 Kernel 侧 UT。

主要改动

  • out shape 约束放宽:ForeachAddcMulScalarV2CheckShape 中去掉 OP_CHECK_SHAPE_NOT_EQUAL,改为比较 GetViewShape().GetShapeSize(),要求 out 元素数大于等于 x1,不满足时以 EZ0015 预定义错误消息上报并指定参数名 out;同时新增对 out 的 OP_CHECK_MAX_DIM 维度检查。
  • 列表长度校验位置调整:ForeachAddScalarCheckNotNull 与 ForeachAddScalarV2CheckNotNull 中移除 OP_CHECK_TENSORLIST_SIZE_EQUAL(self, out, ...),使长度不一致场景不再在非空校验阶段拦截,而由后续校验按 161002 错误码返回。
  • 接口文档数据类型修正:aclnn_foreach_add_list_v2.h 中 x1、x2、out 支持类型补充 INT16、INT8、UINT8,alpha 支持类型补充 DOUBLE、INT64。
  • Host 侧 UT 补齐:新增 out 元素数大于 x1(应拒绝)、空 Tensor(应放行)等用例;add_scalar/add_scalar_v2 新增 x 与 out 列表长度不一致返回 ACLNN_ERR_PARAM_INVALID 的用例;addcmul_scalar_v2 原有 shape 不同用例期望改为 ACL_SUCCESS,并新增 out 元素数更大、元素数相同但 shape 不同(均放行)与元素数更小(拒绝)三组用例。
  • Kernel 侧 UT 与数据生成适配:gen_data.py 支持可选的 out_shape 参数,引入 TAIL_MARKER 标记值生成全长 golden 与 outinit 初始化文件;test_foreach_addcmul_scalar.cpp 新增 test_case_out_larger,验证 kernel 仅写入前 x1 元素数、out 尾部保持初始值。

🧩 本次 Review 已使用自定义 Skill:

likedislike
Incorrect?
atomgit-bot
atomgit-bot
18 days ago Comments:

代码审查

✅ 未发现问题


🧩 本次 Review 已使用自定义 Skill:

likedislike
Incorrect?
CANN-robotCANN-robotCollaborators
18 days ago Added label: cann-cla/yes
CANN-robot
CANN-robotCollaborators
18 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
*/*/docs/acl*.md ✅ 冯英, 杨东, 杨阳 (3/2) ✅ 冯英 (1/1)
*/*/op_host/op_api/*.h ✅ 王永光, 杨东, 杨阳 (3/2) ✅ 王永光 (1/1)
foreach ✅ 杨东, 杨阳 (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

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

likedislike
CANN-robotCANN-robotCollaborators
18 days ago Set zengjuan,u010470851,chaotang233,kevin_huang1234,crystalhu,yangyang016,fanqirui,gitee-duhuiping,wangrui_,renruhai,su-yueming,zhajianqing123,tang-lei01,yourealize,chenqi317,wang-xing001,liubo75,tangweiwei2,gitcode-chenjiao,chenxingyu18,liujie12345678,east_yang,pingchuantang,Chen_HaoWen,qianzehong,wangyongguang,fengying555682,caiwenwen,yanglu-1 as approver
CANN-robotCANN-robotCollaborators
18 days ago Set u010470851,kevin_huang1234,gitee-duhuiping,wangrui_,renruhai,su-yueming,zhajianqing123,tang-lei01,yourealize,wang-xing001,gitcode-chenjiao,chenxingyu18,liujie12345678,east_yang,pingchuantang,Chen_HaoWen,qianzehong,wangyongguang,fengying555682,caiwenwen,yanglu-1 as approver
Tian_1122
Tian_1122Collaborators
18 days ago Comments:

compile

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

/lgtm
/approve

likedislike
east_yang
east_yangCollaborators
18 days ago Comments:

/lgtm
/approve

likedislike
yangyang016
yangyang016Collaborators
17 days ago Comments:

/lgtm
/approve

likedislike
CANN-robotCANN-robotCollaborators
17 days ago Added label: lgtm
wangyongguang
wangyongguangCollaborators
17 days ago Comments:

✅ LGTM - Foreach 算子族问题修复

检视范围:

  • AddList: dtype 注释澄清 (INT16/INT8/UINT8/DOUBLE/INT64)
  • AddScalar: 移除冗余 tensorList size 检查 (issue #161002)
  • AddcmulScalar: out shape 约束放宽 (out shape size ≥ x1 shape size)
  • UT 测试补充 (list length mismatch, out shape larger)
  • 文档格式化 (asin/atan/div/lerp)

无 breaking change,约束放宽向后兼容。

/approve

likedislike
CANN-robot
CANN-robotCollaborators
17 days ago Comments:

The following users do not have permission to comment /lgtm or /approve on any module in this PR:
/approve: 杨阳

likedislike
CANN-robotCANN-robotCollaborators
17 days ago Added label: approved
CANN-robotCANN-robotCollaborators
17 days ago Closed associated issue
CANN-robotCANN-robotCollaborators
17 days ago Merged pull request