Skip to content

[Cherry-Pick] [Others] remove flashmaske and using paddlefleet (#7819)#7913

Open
BingooYang wants to merge 2 commits into
PaddlePaddle:release/2.6from
BingooYang:remove_flahsmask
Open

[Cherry-Pick] [Others] remove flashmaske and using paddlefleet (#7819)#7913
BingooYang wants to merge 2 commits into
PaddlePaddle:release/2.6from
BingooYang:remove_flahsmask

Conversation

@BingooYang
Copy link
Copy Markdown
Contributor

Motivation

flashinfer升级到0.6.11版本要求nvidia-cutlass-dsl>=4.4.2(https://github.com/PaddlePaddle/FastDeploy/pull/7799),flash mask旧版本锁死了nvidia-cutlass-dsl==4.4.2,产生冲突,因此升级一下flash mask版本

Modifications

删除flash mask依赖,直接使用paddlefleet中的flashmask
升级flash mask版本
版本信息记录在:https://ku.baidu-int.com/knowledge/HFVrC7hq1Q/pKzJfZczuc/YeqWcBGW4m/EUBpKxHfTurV5G

Usage or Command

NA

Accuracy Tests

NA

Checklist

  • Add at least a tag in the PR title.
    • Tag list: [[FDConfig],[APIServer],[Engine], [Scheduler], [PD Disaggregation], [Executor], [Graph Optimization], [Speculative Decoding], [RL], [Models], [Quantization], [Loader], [OP], [KVCache], [DataProcessor], [BugFix], [Docs], [CI], [Optimization], [Feature], [Benchmark], [Others], [XPU], [HPU], [GCU], [DCU], [Iluvatar], [Metax]]
    • You can add new tags based on the PR content, but the semantics must be clear.
  • Format your code, run pre-commit before commit.
  • Add unit tests. Please write the reason in this PR if no unit tests.
  • Provide accuracy results.
  • If the current PR is submitting to the release branch, make sure the PR has been submitted to the develop branch, then cherry-pick it to the release branch with the [Cherry-Pick] PR tag.

@paddle-bot
Copy link
Copy Markdown

paddle-bot Bot commented May 25, 2026

Thanks for your contribution!

PaddlePaddle-bot

This comment was marked as outdated.

@PaddlePaddle-bot
Copy link
Copy Markdown

PaddlePaddle-bot commented May 25, 2026

🤖 Paddle-CI-Agent | ci_status_monitor | 2026-05-25 22:10:23

CI报告基于以下代码生成(30分钟更新一次):


1 任务总览

当前 Required 任务 8/10 通过、0 个失败、2 个运行中;暂不建议合并,请等待 Required 任务全部完成。Optional 有 1 个失败和 1 个等待中,不阻塞合并。

总执行(rerun次数) 总任务 ✅ 通过 ❌ 失败 ⏳ 运行中 ⏸️ 等待中 跳过
35(0) 35 31 1 2 1 0

2 任务状态汇总

日志列说明:失败任务直接使用 CI 工具预生成的日志链接;运行中任务链接到 PR Checks 页面。

2.1 Required任务 : 8/10 通过

必选任务阻塞合并,失败需优先处理。

状态 任务 耗时 根因 修复建议 日志 重跑
Extracted partial CE model tasks to run in CI. / run_ce_cases - 运行中 等待任务完成 Checks -
Run FastDeploy Unit Tests and Coverage / run_tests_with_coverage - 运行中 等待任务完成 Checks -
其余 8 个必选任务通过 - - - - -

2.2 可选任务 — 23/25 通过

可选任务不阻塞合并,失败仅供参考;本轮不对 optional 失败任务做深度分析。

状态 任务 耗时 日志 重跑
Run iluvatar Tests / run_iluvatar_cases 15m17s Job -
⏸️ CI_HPU - - -
其余 23 个可选任务通过 - - -

3 失败详情(仅 required)

无。当前无 required 失败任务;2 个 required 任务仍在运行中,本轮未触发 ci_failure_analyzer。

@BingooYang
Copy link
Copy Markdown
Contributor Author

/re-run all-failed

@codecov-commenter
Copy link
Copy Markdown

codecov-commenter commented May 25, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
⚠️ Please upload report for BASE (release/2.6@e7a02e2). Learn more about missing BASE report.

Additional details and impacted files
@@              Coverage Diff               @@
##             release/2.6    #7913   +/-   ##
==============================================
  Coverage               ?   73.03%           
==============================================
  Files                  ?      382           
  Lines                  ?    54473           
  Branches               ?     8525           
==============================================
  Hits                   ?    39786           
  Misses                 ?    11901           
  Partials               ?     2786           
Flag Coverage Δ
GPU 73.03% <100.00%> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Copy link
Copy Markdown

@PaddlePaddle-bot PaddlePaddle-bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤖 Paddle-CI-Agent | pr_review | 2026-05-25 19:56:19

📋 Review 摘要

PR 概述:移除 flash_mask 独立依赖,改为从 paddlefleet.ops(旧 API)或 paddlefleet_ops(新 API)动态加载 flashmask_attention,并补充完整单测。
变更范围fastdeploy/model_executor/layers/attention/requirements.txttests/layers/
影响面 Tag[OP]

问题

级别 文件 概述
📝 PR 规范 标题 Tag 间多余空格;(#7913) 疑为自引用(当前 PR 号),应改为原 develop 分支 PR 号
🟡 建议 flash_attn_backend.py ~L115 except (ImportError, ModuleNotFoundError) 冗余:ModuleNotFoundError 已是 ImportError 子类,只需 except ImportError

📝 PR 规范检查

PR 描述结构(Motivation / Modifications / Usage or Command / Accuracy Tests / Checklist)完整合规,无需修改。

标题存在两处格式问题:

  1. [Cherry-Pick] [Others] → Tag 间有空格,规范要求无空格,应为 [Cherry-Pick][Others]
  2. (#7913) 与当前 PR 号相同,疑为自引用;Cherry-Pick 规范要求括号内填写原 develop 分支 PR 号(请确认并替换)

标题建议(可直接复制,将 #<原PR号> 替换为实际 develop 分支 PR 号):

[Cherry-Pick][Others] remove flash_mask dependency and use paddlefleet (#<原PR号>)

总体评价

依赖迁移逻辑清晰,双路径降级处理合理,新增单测覆盖全面(老/新 API、flash_mask 不可用、两路径均不可用等场景)。建议修复标题格式后合入。

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants