Skip to content

[BugFix] Fix import compatibility for paddlefleet.ops and paddlefleet_ops #7873

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zoooo0820 merged 1 commit into from
May 21, 2026
+9 −6
Merged

[BugFix] Fix import compatibility for paddlefleet.ops and paddlefleet_ops #7873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions fastdeploy/model_executor/layers/moe/ep.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,8 @@
import fastdeploy
from fastdeploy import envs
from fastdeploy.config import MoEPhase
from fastdeploy.model_executor.utils import try_import
from fastdeploy.utils import singleton

paddlefleet_ops = try_import(["paddlefleet.ops"])


def load_deep_ep() -> ModuleType:
"""
Expand All @@ -46,7 +43,10 @@ def load_deep_ep() -> ModuleType:
# Enable paddle.enable_compat before importing deep_ep (required by PFCC/PaddleFleet variants)
paddle.enable_compat(scope={"deep_ep"})
try:
import paddlefleet_ops.deep_ep as deep_ep # type: ignore
try:
import paddlefleet.ops.deep_ep as deep_ep # type: ignore
except:
Copy link
Copy Markdown

@PaddlePaddle-bot PaddlePaddle-bot May 21, 2026

Choose a reason for hiding this comment

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

🟡 建议 裸 except: 捕获范围过宽

当前 except: 会捕获所有异常（包括 KeyboardInterrupt、SystemExit），若 paddlefleet.ops 已安装但因非导入原因（如内部初始化错误）抛出非 ImportError 异常，将被静默吞掉并错误地回退到旧路径，导致难以排查的问题。

建议修复方式：

try:
    import paddlefleet.ops.deep_ep as deep_ep  # type: ignore
except ImportError:
    import paddlefleet_ops.deep_ep as deep_ep  # type: ignore

import paddlefleet_ops.deep_ep as deep_ep # type: ignore

logger.info("FD use PaddleFleet/DeepEP now.")
return deep_ep
Expand Down
7 changes: 5 additions & 2 deletions fastdeploy/model_executor/layers/quantization/fp8_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
from fastdeploy.model_executor.ops.gpu import per_token_group_fp8_quant


paddlefleet_ops = try_import(["paddlefleet.ops"])
paddlefleet_ops = try_import(["paddlefleet.ops", "paddlefleet_ops"])


def load_deep_gemm():
Expand All @@ -45,7 +45,10 @@ def load_deep_gemm():
try:
import logging

import paddlefleet_ops.deep_gemm as deep_gemm
try:
import paddlefleet.ops.deep_gemm as deep_gemm
except:
Copy link
Copy Markdown

@PaddlePaddle-bot PaddlePaddle-bot May 21, 2026

Choose a reason for hiding this comment

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

🟡 建议 裸 except: 捕获范围过宽

同 ep.py 问题：当前 except: 捕获所有异常，若 paddlefleet.ops 包存在但初始化时抛出非 ImportError 异常，将被静默吞掉并错误回退。

建议修复方式：

try:
    import paddlefleet.ops.deep_gemm as deep_gemm
except ImportError:
    import paddlefleet_ops.deep_gemm as deep_gemm

import paddlefleet_ops.deep_gemm as deep_gemm

logging.getLogger().handlers.clear()
logger.info("Detected sm100, use PaddleFleet DeepGEMM")
Expand Down
Loading