已合并
[bugfix] Read DVM config dynamically #44514
[bugfix] Read DVM config dynamically #44514
已合并
SorryNaCN创建于 10 天前
SorryNaCN
SorryNaCN成员
10 天前

【合入来源】

Fixes https://gitcode.com/Ascend/pytorch/issues/3993

【修改方案】

  1. 将 DVM 配置项的值导入改为模块导入。
  2. 在使用处动态读取 dump_fx_test、融合开关、debug_mode、bf16_vector_keep_promoted 和 view_fusion_level,使运行时修改配置生效。

【资料变更】

不涉及。

【接口变更】

不涉及。

【功能验证】

  • python -m py_compile torch_npu/_inductor/dvm/init.py torch_npu/_inductor/dvm/graph_fusion.py torch_npu/_inductor/dvm/mlir_fusion.py torch_npu/_inductor/dvm/util.py
  • git diff --check
  • 按要求不新增测试用例。
  • CI 通过评论 compile 触发,结果以流水线为准。

【CheckList】

likedislike
Pull Request已成功合入, 合并人@ascend-robot
(感谢 SorryNaCN 的贡献)
SorryNaCNSorryNaCN成员
10 天前 创建了 pull request,commit f22af60a
atomgit-bot
atomgit-bot
10 天前 评论:

变更摘要

本 PR 主要将 DVM 配置项从「模块导入时的静态取值」改为「模块导入 + 使用处动态读取」,使 dump_fx_test、融合开关、debug_modebf16_vector_keep_promotedview_fusion_level 等配置在运行时修改后能够即时生效,无需重新导入模块。变更集中在 torch_npu/_inductor/dvm/ 目录下的四个文件,均通过 from . import config as dvm_config 引入配置模块,并在实际使用处通过 dvm_config.<配置项> 动态读取。

主要改动

  • 统一改为动态读取配置模块:在 __init__.pygraph_fusion.pymlir_fusion.pyutil.py 中,将原先 from .config import ... 的直接取值导入统一替换为 from . import config as dvm_config,使配置值在使用时才被读取。
  • debug_modebf16_vector_keep_promoted 动态化:在 __init__.pykernel 运行逻辑和 _install_bf16_promote 中,将 debug_modebf16_vector_keep_promoted 改为通过 dvm_config.debug_modedvm_config.bf16_vector_keep_promoted 读取。
  • dump_fx_test 动态化:在 graph_fusion.py_FusedMetamlir_fusion.pyNpuDvmScheduling 中,将 dump_fx_test 改为通过 dvm_config.dump_fx_test 读取,使 DVM 测试用例的生成开关可动态生效。
  • 融合开关动态化:在 mlir_fusion.py 中,将 disable_post_reduce_fusionenable_matmul_fusion 改为通过 dvm_config.disable_post_reduce_fusiondvm_config.enable_matmul_fusion 读取,使相关融合策略开关支持运行时修改。
  • view_fusion_level 动态化:在 util.pycodegen_maybe_view_load 中,将 view_fusion_level 改为通过 dvm_config.view_fusion_level 读取,使 view 融合级别的判断基于运行时配置。
likedislike
atomgit-bot
atomgit-bot
10 天前 评论:

代码审查

✅ 未发现问题

likedislike
ascend-robotascend-robot成员
10 天前 添加了label:ascend-cla/yes
ascend-robot
ascend-robot成员
10 天前 评论:

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
torch_npu/_inductor zichun_ye, hbhu_bin (2/2) zichun_ye (1/1)

💡 Tip:

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

CLA Signature Pass

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

likedislike
ascend-robotascend-robot成员
10 天前 添加了label:needs-issue
ascend-robot
ascend-robot成员
10 天前 评论:

Linking Issue Notice

@SorryNaCN , the pull request must be linked to at least one issue.
If an issue has already been linked, but the needs-issue label remains, you can remove the label by commenting /check-issue .

likedislike
ascend-robot
ascend-robot成员
10 天前 评论:

当前仓库存在以下 保护分支

Protected Branch Version Release
master
v2.7.1
v2.12.0
v2.11.0
v2.10.0
v2.9.0
v2.7.1-26.1.0
v2.11.0-26.1.0
v2.12.0-26.1.0
v2.10.0-26.1.0
v2.9.0-26.1.0
ci-test

评论 /sync <branch1> <branch2> ... 可将当前 PR 修改同步到其它分支(创建同步 PR):
a) 如果当前 PR 是 Open 状态,同步操作将延迟到 PR 被合并时执行
b) 如果当前 PR 已经 Merged,将立即执行同步操作

注意:

  1. /sync 命令可以指定同步到多个分支,仅最后一个 /sync 命令生效
  2. 如果创建的同步 PR 不正确,可通过向同步 PR 的源分支提交轻量级 PR 完善,或使用 /close 命令关闭
likedislike
ascend-robotascend-robot成员
10 天前 添加了label:ci-pipeline-running
此处折叠了5条事件消息 查看更多
ascend-robotascend-robot成员
10 天前 添加了label:ascend-cla/yes
ascend-robot
ascend-robot成员
10 天前 评论:
流水线 PR-pipeline_pytorch#60638 [ commitID:c08ce042 ] 已终止运行
⚠️ 流水线执行结果已过期,当前 PR 最新 commit 为 4e197450,请重新运行流水线
>>>代码风格自动修复执行成功(无修复内容)
阶段 任务名 状态 详情
编译构建 Build_X86 🕚 >>>
Build_ARM 🕚 >>>
Build_LibTorch_x86 🕚 >>>
Build_LibTorch_ARM 🕚 >>>
Build_X86_torchair 🕚 >>>
Build_ARM_torchair 🕚 >>>
patch_test 🕚 >>>
恶意代码检查 Antipoison 🟨 >>>
编码安全与规范检查 codecheck_pre-commit 🟨 >>>
check_error 🟨 >>>
lintrunner 🟨 >>>
开源片段检查 SCA 🟨 >>>
开发者测试 UT_ARM_A3_Part_01 🕚 >>>
UT_ARM_A3_Part_02 🕚 >>>
UT_ARM_A2_Part_01 🕚 >>>
UT_ARM_A2_Part_02 🕚 >>>
UT_ARM_A2_Part_03 🕚 >>>
UT_inductor_Part_01 🕚 >>>
UT_inductor_Part_02 🕚 >>>
UT_inductor_Part_03 🕚 >>>
UT_inductor_Part_04 🕚 >>>
UT_DIST_ARM_Part_01 🕚 >>>
UT_DIST_ARM_Part_02 🕚 >>>
UT_DIST_ARM_Part_03 🕚 >>>
UT_DIST_ARM_Part_04 🕚 >>>
UT_ARM_A2_Select_Part_01 🕚 >>>
UT_ARM_A2_Select_Part_02 🕚 >>>
流水线 PR-pipeline_pytorch 🟨 >>>
此流水线已支持下列评论快捷指令,仅PR创建者和白名单成员[wujinyuan1, huangjingwei, liangsongwei, yashi999, culechan, Dring, wuyouqi1, L1919_snow, qq_52711437, WhiteNight12, nomiz, xiu_21, ffmh, wanglijun55, hss-shuai, husichao, smallsilly, lanshaozuishuai, jimmyisme1, lzy0920232, alpha-junh, Sunshine_Youngster, wei_zhuoyi, zhangyihuiben, zyw-hw, zzzkeke, rmch, yangch0324, LucciC, AACAES, renyujin, wjlflyer, senzhen-town, pengjingyou, qsc97, limuan, yule100, xiaoqi-zhou, kuhn7, chenxingying, hanye02, zichun_ye, anyrenwei, kkjocker, wangzili121, Lu_G, yvjc, puddingfjz, HandsoemLemon, bigprestigee1, huawuyi, zhenyu10, dairenjie, du-jin-hang, zou-jieyu, adelaideliu, TrHan, wanlinan, Windwindzzz, pengqihw, kisnwang, yuheng_wang, honghao_wang, jizewei, zhangguoguang, sunyu-xuan, chenrayray, hbhu_bin, liujunzhu, c_34, LiNuoh, maoyuanpeng1, zzhongmin, zhaoyu65, bellatan, jiabaolin, zhuofanshen, wencaiwen, lu_zhuge, caoshuyang, molly12, lyx324521, LQ1206, gitcode-chenjiao, cai-weiwei1989, CHDong, ogqin, yuanlipingGit, xuqinglin1, lqz2, zouwei1, chaoluoa, paradox325, jackzhang1116, yaoyao, akh, yujiacheng, dengjie0116, Hubert11111, Shine_Ws, wslhj555, longqiand, OYtao666, JiaqingQiang, luyyyy, Kingbelial, zhanghaiyu0101, wenxp1018, yanliu-luoluo, ksun_sekiro, liyong328, wgzheng, tangky, vivi_is_coding, aoiaoisola, weixin_44494597, wangmengmengwang65667, hid57809721, qq_35468730, comeonup, C547032, gcw_m5OQChA4, yao_yao_ling_xian, cnnbwcy, szqfes_12, cora_19, cann_lilin, can, shawnylee233, fanglanyue0916, hhz0, LiNuohang, taohuoquan, Jesse, WSs_321]评论有效
  • compile、compile_inductor、compile_torchair : 运行流水线
  • retry : 重试流水线所有失败子任务
  • retry <任务名> : 仅重试指定失败子任务
  • stop : 停止流水线
likedislike
ascend-robot
ascend-robot成员
10 天前 评论:

ascend docs pipeline is running...

likedislike
ascend-robotascend-robot成员
10 天前 添加了label:docs-ci-pipeline-running
ascend-robot
ascend-robot成员
10 天前 评论:

ascend docs pipeline is running...

likedislike
ascend-robot
ascend-robot成员
10 天前 评论:

✅ 跳过 docs ci 检查,没有需要检查的文档文件

likedislike
ascend-robotascend-robot成员
10 天前 删除了label:docs-ci-pipeline-running
ascend-robotascend-robot成员
10 天前 添加了label:docs-ci-pipeline-success
SorryNaCN
SorryNaCN成员
10 天前 评论:

compile

likedislike
ascend-robotascend-robot成员
10 天前 添加了label:ci-pipeline-running
ascend-robot
ascend-robot成员
10 天前 评论:

✅ 跳过 docs ci 检查,没有需要检查的文档文件

likedislike
ascend-robot
ascend-robot成员
10 天前 评论:

ascend docs pipeline is running...

likedislike
ascend-robotascend-robot成员
10 天前 删除了label:docs-ci-pipeline-success
ascend-robotascend-robot成员
10 天前 添加了label:docs-ci-pipeline-running
ascend-robot
ascend-robot成员
10 天前 评论:

✅ 跳过 docs ci 检查,没有需要检查的文档文件

likedislike
ascend-robotascend-robot成员
10 天前 删除了label:docs-ci-pipeline-running
ascend-robotascend-robot成员
10 天前 添加了label:docs-ci-pipeline-success
ascend-robotascend-robot成员
10 天前 删除了label:ci-pipeline-running
ascend-robotascend-robot成员
10 天前 添加了label:ci-pipeline-passed
ascend-robot
ascend-robot成员
10 天前 评论:
流水线 PR-pipeline_pytorch#60644 [ commitID:4e197450 ] 已完成
>>>代码风格自动修复执行成功(无修复内容)
阶段 任务名 状态 详情
编译构建 Build_X86 >>>
Build_ARM >>>
Build_LibTorch_x86 >>>
Build_LibTorch_ARM >>>
Build_X86_torchair 🛑 >>>
Build_ARM_torchair 🛑 >>>
patch_test 🛑 >>>
恶意代码检查 Antipoison >>>
编码安全与规范检查 codecheck_pre-commit >>>
check_error >>>
lintrunner >>>
开源片段检查 SCA >>>
开发者测试 UT_ARM_A3_Part_01 >>>
UT_ARM_A3_Part_02 >>>
UT_ARM_A2_Part_01 >>>
UT_ARM_A2_Part_02 >>>
UT_ARM_A2_Part_03 >>>
UT_inductor_Part_01 >>>
UT_inductor_Part_02 >>>
UT_inductor_Part_03 >>>
UT_inductor_Part_04 >>>
UT_DIST_ARM_Part_01 🛑 >>>
UT_DIST_ARM_Part_02 🛑 >>>
UT_DIST_ARM_Part_03 🛑 >>>
UT_DIST_ARM_Part_04 🛑 >>>
UT_ARM_A2_Select_Part_01 >>>
UT_ARM_A2_Select_Part_02 >>>
流水线 PR-pipeline_pytorch >>>
此流水线已支持下列评论快捷指令,仅PR创建者和白名单成员[wujinyuan1, huangjingwei, liangsongwei, yashi999, culechan, Dring, wuyouqi1, L1919_snow, qq_52711437, WhiteNight12, nomiz, xiu_21, ffmh, wanglijun55, hss-shuai, husichao, smallsilly, lanshaozuishuai, jimmyisme1, lzy0920232, alpha-junh, Sunshine_Youngster, wei_zhuoyi, zhangyihuiben, zyw-hw, zzzkeke, rmch, yangch0324, LucciC, AACAES, renyujin, wjlflyer, senzhen-town, pengjingyou, qsc97, limuan, yule100, xiaoqi-zhou, kuhn7, chenxingying, hanye02, zichun_ye, anyrenwei, kkjocker, wangzili121, Lu_G, yvjc, puddingfjz, HandsoemLemon, bigprestigee1, huawuyi, zhenyu10, dairenjie, du-jin-hang, zou-jieyu, adelaideliu, TrHan, wanlinan, Windwindzzz, pengqihw, kisnwang, yuheng_wang, honghao_wang, jizewei, zhangguoguang, sunyu-xuan, chenrayray, hbhu_bin, liujunzhu, c_34, LiNuoh, maoyuanpeng1, zzhongmin, zhaoyu65, bellatan, jiabaolin, zhuofanshen, wencaiwen, lu_zhuge, caoshuyang, molly12, lyx324521, LQ1206, gitcode-chenjiao, cai-weiwei1989, CHDong, ogqin, yuanlipingGit, xuqinglin1, lqz2, zouwei1, chaoluoa, paradox325, jackzhang1116, yaoyao, akh, yujiacheng, dengjie0116, Hubert11111, Shine_Ws, wslhj555, longqiand, OYtao666, JiaqingQiang, luyyyy, Kingbelial, zhanghaiyu0101, wenxp1018, yanliu-luoluo, ksun_sekiro, liyong328, wgzheng, tangky, vivi_is_coding, aoiaoisola, weixin_44494597, wangmengmengwang65667, hid57809721, qq_35468730, comeonup, C547032, gcw_m5OQChA4, yao_yao_ling_xian, cnnbwcy, szqfes_12, cora_19, cann_lilin, can, shawnylee233, fanglanyue0916, hhz0, LiNuohang, taohuoquan, Jesse, WSs_321]评论有效
  • compile、compile_inductor、compile_torchair : 运行流水线
  • retry : 重试流水线所有失败子任务
  • retry <任务名> : 仅重试指定失败子任务
  • stop : 停止流水线
likedislike
SorryNaCNSorryNaCN成员
9 天前 修改了pull request 的描述
ascend-robotascend-robot成员
9 天前 删除了label:needs-issue
zichun_ye
zichun_ye成员
9 天前 评论:

/approve

likedislike
ascend-robotascend-robot成员
9 天前 添加了label:approved
hbhu_bin成员
9 天前 评论:

/lgtm

likedislike
ascend-robotascend-robot成员
9 天前 添加了label:lgtm
ascend-robotascend-robot成员
9 天前 合入了pull request
ascend-robot
ascend-robot成员
9 天前 评论:
流水线 pytorch_gitcode_PR_multiVersion#14018 [ commitID:4e197450 ] 已完成
likedislike