Skip to content

[Cherry-Pick] update fleet_ops(#7859)#7858

Open
liuruyan wants to merge 1 commit into
PaddlePaddle:release/2.6from
liuruyan:release_26_fleet
Open

[Cherry-Pick] update fleet_ops(#7859)#7858
liuruyan wants to merge 1 commit into
PaddlePaddle:release/2.6from
liuruyan:release_26_fleet

Conversation

@liuruyan
Copy link
Copy Markdown
Contributor

@liuruyan liuruyan commented May 19, 2026

Motivation

paddlefleet.ops.deep_eppaddlefleet.ops.deep_gemm 的 import 路径更新为 paddlefleet_ops.deep_eppaddlefleet_ops.deep_gemm,适配 paddlefleet 包重构后的新顶层包名。

Modifications

  • fastdeploy/model_executor/layers/moe/ep.py:将 import paddlefleet.ops.deep_ep as deep_ep 更改为 import paddlefleet_ops.deep_ep as deep_ep
  • fastdeploy/model_executor/layers/quantization/fp8_utils.py:将 import paddlefleet.ops.deep_gemm as deep_gemm 更改为 import paddlefleet_ops.deep_gemm as deep_gemm

Usage or Command

N/A

Accuracy Tests

N/A

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.(仅修改 import 路径,无逻辑变更,无需新增单测)
  • Provide accuracy results.(N/A,纯 import 路径变更,无精度影响)
  • 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 19, 2026

Thanks for your contribution!

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-19 20:30:34

📋 Review 摘要

PR 概述:将 paddlefleet.ops.deep_eppaddlefleet.ops.deep_gemm 的 import 路径更新为 paddlefleet_ops.deep_eppaddlefleet_ops.deep_gemm,适配 paddlefleet 包重构后的新模块路径。
变更范围model_executor/layers/moe/ep.pymodel_executor/layers/quantization/fp8_utils.py
影响面 Tag[OP] [Quantization]

问题

未发现阻塞性问题。

📝 PR 规范检查

PR 存在以下规范问题:

  1. 标题缺少 Tag 且不符合 Cherry-Pick 格式:目标分支为 release/2.6(非 develop),标题须遵循 [Cherry-Pick][Tag] 描述(#原PR号) 格式,当前标题 update fleet_ops 既无 Tag 也未加 [Cherry-Pick] 前缀。
  2. 描述模板各段落均为空MotivationModificationsUsage or CommandAccuracy Tests 均未填写,Checklist 均未勾选。

标题建议(可直接复制):

  • [Cherry-Pick][BugFix] Fix paddlefleet_ops import path for deep_ep and deep_gemm(#原PR号)

PR 描述建议(可直接复制,必须复刻 checklist §D2 模板的完整结构):

## Motivation`paddlefleet.ops.deep_ep``paddlefleet.ops.deep_gemm` 的 import 路径更新为 `paddlefleet_ops.deep_ep``paddlefleet_ops.deep_gemm`,适配 paddlefleet 包重构后的新顶层包名。

## Modifications
- `fastdeploy/model_executor/layers/moe/ep.py`:将 `import paddlefleet.ops.deep_ep as deep_ep` 更改为 `import paddlefleet_ops.deep_ep as deep_ep`
- `fastdeploy/model_executor/layers/quantization/fp8_utils.py`:将 `import paddlefleet.ops.deep_gemm as deep_gemm` 更改为 `import paddlefleet_ops.deep_gemm as deep_gemm`

## Usage or Command
N/A

## Accuracy Tests
N/A

## Checklist

- [x] 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.
- [x] Format your code, run `pre-commit` before commit.
- [x] Add unit tests. Please write the reason in this PR if no unit tests.(仅修改 import 路径,无逻辑变更,无需新增单测)
- [x] Provide accuracy results.(N/A,纯 import 路径变更,无精度影响)
- [ ] 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.

总体评价

代码变更极小且清晰,仅修正 paddlefleet_ops 包的两处 import 路径,无逻辑错误。PR 规范方面需补全标题(添加 [Cherry-Pick][BugFix] 前缀及原 PR 号)和描述内容。

@PaddlePaddle-bot
Copy link
Copy Markdown

PaddlePaddle-bot commented May 19, 2026

🤖 Paddle-CI-Agent | ci_status_monitor | 2026-05-20 08:25:37

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


1 任务总览

存在 1 个 Required 任务失败,需优先处理后方可合并。

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

2 任务状态汇总

2.1 Required任务 : 9/10 通过

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

状态 任务 耗时 根因 修复建议 日志 重跑
run_tests_with_coverage 1h13m PR问题:覆盖率未达 80%,import 行未被覆盖 在 import 行添加 # pragma: no cover Job -
其余 9 个必选任务通过 - - - - -

2.2 可选任务 — 22/26 通过

可选任务不阻塞合并,失败仅供参考。

状态 任务 耗时 日志 重跑
run_iluvatar_cases 13m49s Job -
Check PR Template 14s Job -
Trigger Jenkins for PR 1m5s Job -
⏸️ CI_HPU - - -
其余 22 个可选任务通过 - - -

3 失败详情(仅 required)

Run FastDeploy Unit Tests and Coverage / run_tests_with_coverage — 代码覆盖率不达标(置信度: 中)

run_tests_with_coverage

  • 状态: ❌ 失败
  • 错误类型: 代码覆盖率不达标
  • 置信度: 中(完整日志下载超时,基于失败步骤信息和 PR diff 推断)
  • 根因摘要: 修改文件覆盖率未达 80% 阈值,可选硬件 import 行未被覆盖
  • 分析器: ci_analyze_unittest_fastdeploy

失败步骤:

  • ✅ Run FastDeploy Unit Tests and Coverage(单测全部通过)
  • ✅ Check Unit Test Success(单测验证通过)
  • Verify Code Coverage Threshold (80%) ← 覆盖率检查失败

根因详情:

本 PR 仅修改了 2 个 import 路径(paddlefleet.ops.deep_eppaddlefleet_ops.deep_eppaddlefleet.ops.deep_gemmpaddlefleet_ops.deep_gemm),这两处修改位于 ep.pyfp8_utils.pytry/except 块内。由于 paddlefleet_ops 在 CI 环境中未安装,该 try 分支无法被执行到,导致这两处修改行的覆盖率为 0%,拉低了文件整体覆盖率,未能达到 80% 阈值要求。

修复建议:

  1. .coveragerc(或 pyproject.toml 的 coverage 配置)中添加 # pragma: no cover 注释或 exclude 规则,豁免 ep.pyfp8_utils.py 中的可选硬件 import 行
  2. 或者在对应 import 行末尾添加 # pragma: no cover

修复建议摘要: 在 import 行添加 # pragma: no cover 豁免覆盖率检查

@EmmonsCurse EmmonsCurse changed the title update fleet_ops [Cherry-Pick] update fleet_ops(#7859) May 19, 2026
@codecov-commenter
Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 0% with 2 lines in your changes missing coverage. Please review.
⚠️ Please upload report for BASE (release/2.6@41d44d6). Learn more about missing BASE report.

Files with missing lines Patch % Lines
fastdeploy/model_executor/layers/moe/ep.py 0.00% 1 Missing ⚠️
...oy/model_executor/layers/quantization/fp8_utils.py 0.00% 1 Missing ⚠️
Additional details and impacted files
@@              Coverage Diff               @@
##             release/2.6    #7858   +/-   ##
==============================================
  Coverage               ?   72.37%           
==============================================
  Files                  ?      381           
  Lines                  ?    54215           
  Branches               ?     8473           
==============================================
  Hits                   ?    39237           
  Misses                 ?    12215           
  Partials               ?     2763           
Flag Coverage Δ
GPU 72.37% <0.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.

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