Skip to content

Commit 2a42d65

Browse files
zhewenlamd-xiaoyu12
authored andcommitted
[Misc][gpt-oss] guard import when triton kernel when not up to date (vllm-project#22584)
Signed-off-by: zhewenli <zhewenli@meta.com> Signed-off-by: Xiao Yu <xiao.yu@amd.com>
1 parent c0968ee commit 2a42d65

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

vllm/model_executor/layers/fused_moe/gpt_oss_triton_kernels_moe.py

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,24 @@
55
import torch
66

77
import vllm.model_executor.layers.fused_moe.modular_kernel as mk
8+
from vllm.logger import init_logger
89
from vllm.model_executor.layers.fused_moe.topk_weight_and_reduce import (
910
TopKWeightAndReduceDelegate)
1011
from vllm.model_executor.layers.fused_moe.utils import extract_required_args
1112
from vllm.utils import has_triton_kernels
1213

14+
logger = init_logger(__name__)
15+
1316
if has_triton_kernels():
14-
import triton_kernels.swiglu
15-
from triton_kernels.matmul_ogs import FnSpecs, FusedActivation, matmul_ogs
16-
from triton_kernels.routing import routing
17+
try:
18+
import triton_kernels.swiglu
19+
from triton_kernels.matmul_ogs import (FnSpecs, FusedActivation,
20+
matmul_ogs)
21+
from triton_kernels.routing import routing
22+
except ModuleNotFoundError:
23+
logger.error(
24+
"Failed to import Triton kernels. Please make sure your triton "
25+
"version is compatible.")
1726

1827
if TYPE_CHECKING:
1928
from triton_kernels.matmul_ogs import PrecisionConfig

0 commit comments

Comments
 (0)