diff --git a/tests/kernels/moe/modular_kernel_tools/common.py b/tests/kernels/moe/modular_kernel_tools/common.py index 646cff4c2d..8041db68d7 100644 --- a/tests/kernels/moe/modular_kernel_tools/common.py +++ b/tests/kernels/moe/modular_kernel_tools/common.py @@ -328,7 +328,10 @@ class Config: if self.needs_deep_ep_v2() and not has_deep_ep_v2(): return False, "Needs DeepEP v2, but DeepEP v2 not available." if self.needs_deep_gemm() and not has_deep_gemm(): - return False, "Needs DeepGEMM, but DeepGEMM not available." + return ( + False, + "Needs DeepGEMM, but the current vLLM environment does not provide it.", + ) if self.needs_aiter() and not has_aiter(): # noqa: SIM103 return False, "Needs Aiter, but Aiter not available." if self.needs_mori() and not has_mori(): # noqa: SIM103 diff --git a/vllm/model_executor/layers/sparse_attn_indexer.py b/vllm/model_executor/layers/sparse_attn_indexer.py index 9597708b62..45c5d5f781 100644 --- a/vllm/model_executor/layers/sparse_attn_indexer.py +++ b/vllm/model_executor/layers/sparse_attn_indexer.py @@ -442,7 +442,8 @@ class SparseAttnIndexer(CustomOp): self.use_fp4_cache = use_fp4_cache if current_platform.is_cuda() and not has_deep_gemm(): raise RuntimeError( - "Sparse Attention Indexer CUDA op requires DeepGEMM to be installed." + "Sparse Attention Indexer CUDA op requires DeepGEMM support in " + "the current vLLM environment." ) def forward_native( diff --git a/vllm/utils/deep_gemm.py b/vllm/utils/deep_gemm.py index 4252ce8775..3c884aad6c 100644 --- a/vllm/utils/deep_gemm.py +++ b/vllm/utils/deep_gemm.py @@ -120,8 +120,9 @@ def is_deep_gemm_e8m0_used() -> bool: def _missing(*_: Any, **__: Any) -> NoReturn: """Placeholder for unavailable DeepGEMM backend.""" raise RuntimeError( - "DeepGEMM backend is not available or outdated. Please install or " - "update the `deep_gemm` to a newer version to enable FP8 kernels." + "DeepGEMM backend is unavailable in the current vLLM environment, " + "or the available DeepGEMM package does not provide the required APIs " + "for these kernels." ) @@ -156,7 +157,7 @@ def _import_deep_gemm(): logger.debug_once("Imported deep_gemm module from site-packages") return module except ImportError: - logger.debug_once( + logger.info_once( "deep_gemm not found in site-packages, " "trying vendored vllm.third_party.deep_gemm" ) @@ -167,7 +168,7 @@ def _import_deep_gemm(): logger.debug_once("Imported deep_gemm module from vllm.third_party.deep_gemm") return module except ImportError: - logger.debug_once("Vendored deep_gemm not found either") + logger.info_once("Vendored deep_gemm not found either") except Exception as e: # The vendored module may raise RuntimeError during _C.init() # if JIT include files are missing (e.g. incomplete wheel).