Skip to content

Commit 4402396

Browse files
authored
fix ce bug (#7873)
1 parent c9e1bf5 commit 4402396

2 files changed

Lines changed: 9 additions & 6 deletions

File tree

fastdeploy/model_executor/layers/moe/ep.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,8 @@
2727
import fastdeploy
2828
from fastdeploy import envs
2929
from fastdeploy.config import MoEPhase
30-
from fastdeploy.model_executor.utils import try_import
3130
from fastdeploy.utils import singleton
3231

33-
paddlefleet_ops = try_import(["paddlefleet.ops"])
34-
3532

3633
def load_deep_ep() -> ModuleType:
3734
"""
@@ -46,7 +43,10 @@ def load_deep_ep() -> ModuleType:
4643
# Enable paddle.enable_compat before importing deep_ep (required by PFCC/PaddleFleet variants)
4744
paddle.enable_compat(scope={"deep_ep"})
4845
try:
49-
import paddlefleet_ops.deep_ep as deep_ep # type: ignore
46+
try:
47+
import paddlefleet.ops.deep_ep as deep_ep # type: ignore
48+
except:
49+
import paddlefleet_ops.deep_ep as deep_ep # type: ignore
5050

5151
logger.info("FD use PaddleFleet/DeepEP now.")
5252
return deep_ep

fastdeploy/model_executor/layers/quantization/fp8_utils.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
from fastdeploy.model_executor.ops.gpu import per_token_group_fp8_quant
2828

2929

30-
paddlefleet_ops = try_import(["paddlefleet.ops"])
30+
paddlefleet_ops = try_import(["paddlefleet.ops", "paddlefleet_ops"])
3131

3232

3333
def load_deep_gemm():
@@ -45,7 +45,10 @@ def load_deep_gemm():
4545
try:
4646
import logging
4747

48-
import paddlefleet_ops.deep_gemm as deep_gemm
48+
try:
49+
import paddlefleet.ops.deep_gemm as deep_gemm
50+
except:
51+
import paddlefleet_ops.deep_gemm as deep_gemm
4952

5053
logging.getLogger().handlers.clear()
5154
logger.info("Detected sm100, use PaddleFleet DeepGEMM")

0 commit comments

Comments
 (0)