Merged
feat:将cv仓的aicpu算子从merge每个文件夹下的json配置算子信息更改到def文件配置算子信息自动生成json #622
zhaowenruiAdd on Mar 28
feat:将cv仓的aicpu算子从merge每个文件夹下的json配置算子信息更改到def文件配置算子信息自动生成json #622
Merged
zhaowenruiAdd on Mar 28
zhaowenrui
zhaowenruiCollaborators
Mar 28

描述

把 AICPU 算子配置从 *.json 合并配置迁移成 *_aicpu_def.cpp,并把构建链路改成 op_def -> aicpu_kernel.ini -> json,主要修改了:

  1. 把 3 个 AICPU 算子配置从 json 迁移到 *_aicpu_def.cpp
  • 删除旧 JSON,新增 OpDef C++ 定义。
  1. 改了构建链路
  • 从“合并 JSON”改为“编译 op_def 生成 aicpu_kernel.ini,再转成 cust_aicpu_kernel.json”。
  1. 抽了公共默认配置
  • 在 aicpu_op_def.h 统一封装 AICPU 默认字段,算子里按需覆盖个别项。
  1. 增强 parser_ini.py 校验
  • 区分 AICPU/非 AICPU;
  • 增加 workspaceSize、kernelSo、opsFlag、subTypeOfInferShape 等校验规则。

关联的Issue

测试

  1. change前后aicpu cust json对比
    对比成功,无缺失项
  2. change前后aicore生成json一致性对比
    image.png
  3. 针对aicpu算子信息库缺项优化补充
    image.png

文档更新

类型标签

likedislike
Pull Request has been successfully merged by CANN-robot.
(Thank you for zhaowenrui's contribution.)
zhaowenruizhaowenruiCollaborators
Mar 28 Created pull request, commit 4a7021be
CANN-robot
CANN-robotCollaborators
Mar 28 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


PR Approval Progress

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

Module Approval Details

module lgtm status approve status
image/crop_and_resize ✅ liu-wei, zhangzijie (2/2) ✅ liu-wei (1/1)
image/image_warp_offsets ✅ liu-wei, zhangzijie (2/2) ✅ liu-wei (1/1)
repo-cann/ops-cv ✅ liu-wei, zhangzijie (2/2) ✅ liu-wei, zhangzijie (2/1)

💡 Tip:

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

CLA Signature Pass

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

likedislike
CANN-robotCANN-robotCollaborators
Mar 28 Added label: cann-cla/yes
CANN-robotCANN-robotCollaborators
Mar 28 Set zhou-qilong,rxtfeng,loov1,liu-wei,LiWei79,llimwang,gubaocheng as approver
CANN-robotCANN-robotCollaborators
Mar 28 Set zhou-qilong,rxtfeng,loov1,liu-wei,LiWei79,llimwang,gubaocheng as approver
167 messages are collapsed here。 See more
zhangzijieCollaborators
Apr 2 Comments:

/lgtm
/approve

likedislike
CANN-robotCANN-robotCollaborators
Apr 2 Added label: lgtm
CANN-robot
CANN-robotCollaborators
Apr 2 Comments:

Review Guide

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

likedislike
CANN-robotCANN-robotCollaborators
Apr 2 Closed associated issue
CANN-robotCANN-robotCollaborators
Apr 2 Merged pull request