已合并
fix: 补充requirements依赖声明,拆分构建期与运行期依赖-2.9.0 #46283
fix: 补充requirements依赖声明,拆分构建期与运行期依赖-2.9.0 #46283
已合并
mhy创建于 12 天前
mhy成员
12 天前

【合入来源】

如有社区issue,请关联issue链接
请勿携带内部流程信息(需求链接、问题单、内部issue等)

【修改方案】

请描述修改内容的具体实现,涉及哪些组件之间进行交互,可以用1、2、3、...进行罗列
如果是需求或者重构类的PR,需要补充详细设计文档(说明上下游组件关系、时序图、类图、DFX能力等内容)

  1. 新建 requirements-build.txt,拆出构建期工具依赖(pyyaml、setuptools),三个版本变体共用一份,因为这两个包不随 torch 版本变化
  2. requirements.txt开头通过 -r requirements-build.txt 引用上述文件;同时补充声明 numpy、sympy、typing-extensions 三个依赖——这三个包在 contrib/、profiler/、_inductor/ 中被无条件 import,但此前在任何依赖文件中均未声明
  3. setup.py 的 install_requires 同步补充上述三个依赖,确保 pip install 生成的 wheel 依赖清单完整(这是唯一真正被 pip 强制执行、随 wheel 发布给用户的清单)
  4. 删除test目录中的mypy依赖和beartype依赖保证最小集(运行可通过)

【资料变更】

请确认是否涉及资料变更。如涉及,需要在PR中体现,并简要说明修改内容。如不涉及,需填写“不涉及”

不涉及

【接口变更】

请确认是否涉及跨代码仓或者客户面可见的接口变更。如涉及,需要详细说明接口以及对应的变更内容,同时需要在资料中体现。如不涉及,需填写“不涉及”

不涉及

【功能验证】

说明测试场景,测试方法。如果本次测试方式与常规单元测试不同,请详细说明您的测试步骤
新增/变更内容是否已新增/适配UT测试用例看护,并补充测试自验证截图

【CheckList】

PR提交人对以下CheckList自检项进行全量自检,自检通过或不涉及,均修改 [ ] 为 [x]

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

变更摘要

本 PR(fix: 补充requirements依赖声明,拆分构建期与运行期依赖-2.9.0)主要聚焦于 2.9.0 版本依赖声明的补全与构建期/运行期依赖的拆分:新建 requirements-build.txt 承载构建期工具依赖(pyyaml、setuptools),由 requirements.txt 通过 -r requirements-build.txt 引用;同时补充此前未声明的 numpy、sympy、typing-extensions 三个运行期依赖,并在 setup.py 的 install_requires 中同步补齐,确保随 wheel 发布的依赖清单完整;此外删除 test 目录中的 mypy、beartype 依赖以保证最小依赖集。

主要改动

  • 新增 requirements-build.txt: 将构建期工具依赖(pyyaml、setuptools)拆分到独立文件,三个版本变体共用一份,因其不随 torch 版本变化。
  • requirements.txt 引用构建期依赖并补充声明: 文件开头通过 -r requirements-build.txt 引入上述构建期依赖,并补充声明 numpy、sympy、typing-extensions——这三个包在 contrib/、profiler/、_inductor/ 中被无条件 import,但此前未在任何依赖文件中声明。
  • setup.py 同步补齐依赖: install_requires 中补充 numpy、sympy、typing-extensions 三个依赖,确保 pip install 生成的 wheel 依赖清单完整(这是唯一真正被 pip 强制执行、随 wheel 发布给用户的清单)。
  • 删除测试目录冗余依赖: 移除 test 目录中的 mypy 依赖与 beartype 依赖,保证依赖最小集且测试可运行通过。
likedislike
不准确?
atomgit-bot
atomgit-bot
12 天前 评论:

代码审查

✅ 未发现问题

likedislike
不准确?
ascend-robotascend-robot成员
12 天前 添加了label:stat/needs-squash
ascend-robotascend-robot成员
12 天前 添加了label:ascend-cla/yes
ascend-robotascend-robot成员
12 天前 添加了label:needs-issue
ascend-robot
ascend-robot成员
12 天前 评论:

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.


PR Approval Progress

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

Module Approval Details

module lgtm status approve status
repo-Ascend/pytorch ✅ chenrayray, huangjingwei (2/2) ✅ chenrayray (1/1)
test ✅ chenrayray, huangjingwei (2/2) ✅ chenrayray (1/1)

💡 Tip:

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

CLA Signature Pass

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

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

Linking Issue Notice

@m0_64341872 , 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成员
12 天前 评论:

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

Protected Branch Version Release
master
v2.12.0
v2.11.0
v2.10.0
v2.9.0
v2.7.1
v2.7.1-26.1.0
v2.9.0-26.1.0
v2.10.0-26.1.0
v2.11.0-26.1.0
v2.12.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
AtlasAccountAtlasAccount成员
12 天前 添加了label:ci-pipeline-running
ascend-robot
ascend-robot成员
12 天前 评论:

ascend docs pipeline is running...

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

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

likedislike
ascend-robotascend-robot成员
12 天前 删除了label:docs-ci-pipeline-running
ascend-robotascend-robot成员
12 天前 添加了label:docs-ci-pipeline-success
AtlasAccountAtlasAccount成员
11 天前 删除了label:ci-pipeline-running
AtlasAccountAtlasAccount成员
11 天前 添加了label:ci-pipeline-passed
AtlasAccount
AtlasAccount成员
11 天前 评论:
流水线 PR-pipeline_pytorch#67457 [ commitID:4dea4dcb ] 已完成
>>>代码风格自动修复执行成功(无修复内容)
阶段 任务名 状态 详情
编译构建 Build_X86 ✅ COMPLETED >>>
Build_ARM ✅ COMPLETED >>>
Build_X86_torchair ⚪ IGNORED >>>
Build_ARM_torchair ⚪ IGNORED >>>
patch_test ⚪ IGNORED >>>
Build_X86_213 ⚪ IGNORED >>>
Build_ARM_213 ⚪ IGNORED >>>
恶意代码检查 Antipoison ✅ COMPLETED >>>
编码安全与规范检查 codecheck_pre-commit ✅ COMPLETED >>>
check_error ✅ COMPLETED >>>
lintrunner ✅ COMPLETED >>>
开源片段检查 SCA ✅ COMPLETED >>>
开发者测试 UT_ARM_A3_Part_01 ⚪ IGNORED >>>
UT_ARM_A3_Part_02 ⚪ IGNORED >>>
UT_ARM_A2_Part_01 ✅ COMPLETED >>>
UT_ARM_A2_Part_02 ⚪ IGNORED >>>
UT_ARM_A2_Part_03 ⚪ IGNORED >>>
UT_inductor_Part_01 ⚪ IGNORED >>>
UT_inductor_Part_02 ⚪ IGNORED >>>
UT_inductor_Part_03 ⚪ IGNORED >>>
UT_inductor_Part_04 ⚪ IGNORED >>>
UT_DIST_ARM_Part_01 ⚪ IGNORED >>>
UT_DIST_ARM_Part_02 ⚪ IGNORED >>>
UT_DIST_ARM_Part_03 ⚪ IGNORED >>>
UT_DIST_ARM_Part_04 ⚪ IGNORED >>>
UT_ARM_A2_Select_Part_01 ⚪ IGNORED >>>
UT_ARM_A2_Select_Part_02 ⚪ IGNORED >>>
UT_inductor_Part_213 ⚪ IGNORED >>>
流水线 PR-pipeline_pytorch ✅ COMPLETED >>>
此流水线已支持下列评论快捷指令,仅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, SCh_zx]评论有效
  • compile、compile_inductor、compile_torchair : 运行流水线
  • retry : 重试流水线所有失败子任务
  • retry <任务名> : 仅重试指定失败子任务
  • stop : 停止流水线
likedislike
Mmhy成员
11 天前 预合并成功(commit_id: 2362a91844cf0c566027b245e5bbe2342a81c672)
Mmhy成员
11 天前 推送  1 个提交:3bd3dc92-test: revert test/requirements.txt to == pending full verification
Mmhy成员
11 天前 预合并成功(commit_id: 6fd2b6b3a8c4a274e885f71c4cc12d117e73803b)
AtlasAccountAtlasAccount成员
11 天前 删除了label:ci-pipeline-passed
ascend-robotascend-robot成员
11 天前 删除了label:ascend-cla/yes
ascend-robotascend-robot成员
11 天前 添加了label:ascend-cla/yes
ascend-robot
ascend-robot成员
11 天前 评论:

ascend docs pipeline is running...

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

compile

likedislike
Mmhy成员
11 天前 预合并成功(commit_id: 1539d4d7886e7e099dc401cf692a4d9f3c885857)
ascend-robot
ascend-robot成员
11 天前 评论:

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

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

ascend docs pipeline is running...

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

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

likedislike
ascend-robotascend-robot成员
11 天前 删除了label:docs-ci-pipeline-running
ascend-robotascend-robot成员
11 天前 添加了label:docs-ci-pipeline-success
AtlasAccountAtlasAccount成员
10 天前 删除了label:ci-pipeline-running
AtlasAccountAtlasAccount成员
10 天前 添加了label:ci-pipeline-passed
AtlasAccount
AtlasAccount成员
10 天前 评论:
流水线 PR-pipeline_pytorch#67634 [ commitID:3bd3dc92 ] 已完成
>>>代码风格自动修复执行成功(无修复内容)
阶段 任务名 状态 详情
编译构建 Build_X86 ✅ COMPLETED >>>
Build_ARM ✅ COMPLETED >>>
Build_X86_torchair ⚪ IGNORED >>>
Build_ARM_torchair ⚪ IGNORED >>>
patch_test ⚪ IGNORED >>>
Build_X86_213 ⚪ IGNORED >>>
Build_ARM_213 ⚪ IGNORED >>>
恶意代码检查 Antipoison ✅ COMPLETED >>>
编码安全与规范检查 codecheck_pre-commit ✅ COMPLETED >>>
check_error ✅ COMPLETED >>>
lintrunner ✅ COMPLETED >>>
开源片段检查 SCA ✅ COMPLETED >>>
开发者测试 UT_ARM_A3_Part_01 ⚪ IGNORED >>>
UT_ARM_A3_Part_02 ⚪ IGNORED >>>
UT_ARM_A2_Part_01 ✅ COMPLETED >>>
UT_ARM_A2_Part_02 ⚪ IGNORED >>>
UT_ARM_A2_Part_03 ⚪ IGNORED >>>
UT_inductor_Part_01 ⚪ IGNORED >>>
UT_inductor_Part_02 ⚪ IGNORED >>>
UT_inductor_Part_03 ⚪ IGNORED >>>
UT_inductor_Part_04 ⚪ IGNORED >>>
UT_DIST_ARM_Part_01 ⚪ IGNORED >>>
UT_DIST_ARM_Part_02 ⚪ IGNORED >>>
UT_DIST_ARM_Part_03 ⚪ IGNORED >>>
UT_DIST_ARM_Part_04 ⚪ IGNORED >>>
UT_ARM_A2_Select_Part_01 ⚪ IGNORED >>>
UT_ARM_A2_Select_Part_02 ⚪ IGNORED >>>
UT_inductor_Part_213 ⚪ IGNORED >>>
流水线 PR-pipeline_pytorch ✅ COMPLETED >>>
此流水线已支持下列评论快捷指令,仅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, SCh_zx]评论有效
  • compile、compile_inductor、compile_torchair : 运行流水线
  • retry : 重试流水线所有失败子任务
  • retry <任务名> : 仅重试指定失败子任务
  • stop : 停止流水线
likedislike
Mmhy成员
10 天前 关联了issue:补充requirements依赖声明,拆分构建期与运行期依赖
ascend-robotascend-robot成员
10 天前 删除了label:needs-issue
Jingwei Huang
Jingwei Huang成员
10 天前 评论:

/lgtm

likedislike
chenrayray
chenrayray成员
9 天前 评论:

/approve

likedislike
ascend-robotascend-robot成员
9 天前 添加了label:approvedlgtm
ascend-robotascend-robot成员
9 天前 合入了pull request
renyujin成员
9 天前 评论:

/lgtm
/approve

likedislike
AtlasAccount
AtlasAccount成员
9 天前 评论:
流水线 pytorch_gitcode_PR_multiVersion#15283 [ commitID:3bd3dc92 ] 已完成
likedislike