Unverified Commit afa5b7ca authored by Zhewen Li's avatar Zhewen Li Committed by GitHub
Browse files

[Misc][gpt-oss] guard import when triton kernel when not up to date (#22584)


Signed-off-by: default avatarzhewenli <zhewenli@meta.com>
parent 1b990280
...@@ -5,15 +5,24 @@ from typing import TYPE_CHECKING, Any, Optional ...@@ -5,15 +5,24 @@ from typing import TYPE_CHECKING, Any, Optional
import torch import torch
import vllm.model_executor.layers.fused_moe.modular_kernel as mk import vllm.model_executor.layers.fused_moe.modular_kernel as mk
from vllm.logger import init_logger
from vllm.model_executor.layers.fused_moe.topk_weight_and_reduce import ( from vllm.model_executor.layers.fused_moe.topk_weight_and_reduce import (
TopKWeightAndReduceDelegate) TopKWeightAndReduceDelegate)
from vllm.model_executor.layers.fused_moe.utils import extract_required_args from vllm.model_executor.layers.fused_moe.utils import extract_required_args
from vllm.utils import has_triton_kernels from vllm.utils import has_triton_kernels
logger = init_logger(__name__)
if has_triton_kernels(): if has_triton_kernels():
try:
import triton_kernels.swiglu import triton_kernels.swiglu
from triton_kernels.matmul_ogs import FnSpecs, FusedActivation, matmul_ogs from triton_kernels.matmul_ogs import (FnSpecs, FusedActivation,
matmul_ogs)
from triton_kernels.routing import routing from triton_kernels.routing import routing
except ModuleNotFoundError:
logger.error(
"Failed to import Triton kernels. Please make sure your triton "
"version is compatible.")
if TYPE_CHECKING: if TYPE_CHECKING:
from triton_kernels.matmul_ogs import PrecisionConfig from triton_kernels.matmul_ogs import PrecisionConfig
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment