Deprecations for v0.23 and v0.24 (#44992)
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
This commit is contained in:
@@ -212,6 +212,9 @@ _LINEAR_BACKEND_KERNEL_MAP: dict[str, set[type]] = {
|
||||
"flashinfer_cudnn": {
|
||||
FlashInferCudnnNvFp4LinearKernel,
|
||||
},
|
||||
"flashinfer_b12x": {
|
||||
FlashInferB12xNvFp4LinearKernel,
|
||||
},
|
||||
"marlin": {
|
||||
MarlinFP8ScaledMMLinearKernel,
|
||||
MarlinLinearKernel,
|
||||
@@ -392,7 +395,7 @@ _POSSIBLE_NVFP4_KERNELS: dict[PlatformEnum, list[type[NvFp4LinearKernel]]] = {
|
||||
PlatformEnum.CUDA: [
|
||||
# FlashInferB12xNvFp4LinearKernel excluded from auto-selection until
|
||||
# upstream CUTLASS SM121 MMA op guard is resolved; use
|
||||
# VLLM_NVFP4_GEMM_BACKEND=flashinfer-b12x to opt in explicitly.
|
||||
# --linear-backend flashinfer_b12x to opt in explicitly.
|
||||
FlashInferCutlassNvFp4LinearKernel,
|
||||
CutlassNvFp4LinearKernel,
|
||||
MarlinNvFp4LinearKernel,
|
||||
@@ -752,20 +755,6 @@ def init_mxfp4_linear_kernel() -> MxFp4LinearKernel:
|
||||
current platform."""
|
||||
linear_backend = _get_linear_backend()
|
||||
|
||||
force_kernel: type[MxFp4LinearKernel] | None = None
|
||||
if linear_backend == "auto" and envs.VLLM_MXFP4_USE_MARLIN:
|
||||
force_kernel = MarlinMxFp4LinearKernel
|
||||
|
||||
if force_kernel is not None:
|
||||
is_supported, reason = force_kernel.is_supported()
|
||||
if not is_supported:
|
||||
raise ValueError(
|
||||
f"Forced MXFP4 kernel {force_kernel.__name__} is not "
|
||||
f"supported: {reason}"
|
||||
)
|
||||
logger.info_once("Using %s for MXFP4 GEMM", force_kernel.__name__)
|
||||
return force_kernel(MxFp4LinearLayerConfig())
|
||||
|
||||
platform = current_platform._enum
|
||||
possible = list(_POSSIBLE_MXFP4_KERNELS.get(platform, []))
|
||||
|
||||
@@ -836,18 +825,6 @@ def init_wfp8_a16_linear_kernel(
|
||||
)
|
||||
|
||||
|
||||
# Maps VLLM_NVFP4_GEMM_BACKEND env var values to kernel classes.
|
||||
_NVFP4_BACKEND_TO_KERNEL: dict[str, type[NvFp4LinearKernel]] = {
|
||||
"flashinfer-b12x": FlashInferB12xNvFp4LinearKernel,
|
||||
"flashinfer-cutlass": FlashInferCutlassNvFp4LinearKernel,
|
||||
"cutlass": CutlassNvFp4LinearKernel,
|
||||
"marlin": MarlinNvFp4LinearKernel,
|
||||
"flashinfer-trtllm": FlashInferTrtllmNvFp4LinearKernel,
|
||||
"flashinfer-cudnn": FlashInferCudnnNvFp4LinearKernel,
|
||||
"emulation": EmulationNvFp4LinearKernel,
|
||||
}
|
||||
|
||||
|
||||
def init_nvfp4_linear_kernel(use_a16: bool = False) -> NvFp4LinearKernel:
|
||||
"""Select and instantiate the best NVFP4 linear kernel for the
|
||||
current platform."""
|
||||
@@ -855,8 +832,7 @@ def init_nvfp4_linear_kernel(use_a16: bool = False) -> NvFp4LinearKernel:
|
||||
|
||||
# VLLM_BATCH_INVARIANT forces deterministic execution. Prefer the
|
||||
# batch-invariant CUTLASS implementation when available, otherwise fall
|
||||
# back to emulation. It overrides both --linear-backend and the deprecated
|
||||
# env vars below.
|
||||
# back to emulation. It overrides --linear-backend.
|
||||
force_kernel: type[NvFp4LinearKernel] | None = None
|
||||
linear_backend = _get_linear_backend()
|
||||
if envs.VLLM_BATCH_INVARIANT:
|
||||
@@ -888,24 +864,9 @@ def init_nvfp4_linear_kernel(use_a16: bool = False) -> NvFp4LinearKernel:
|
||||
reason,
|
||||
)
|
||||
force_kernel = EmulationNvFp4LinearKernel
|
||||
elif linear_backend == "auto":
|
||||
# Deprecated env-var overrides — only honoured when --linear-backend
|
||||
# is "auto". Deprecation warnings are emitted from vllm/envs.py.
|
||||
if use_a16: # force a16 if running weight-only quantization
|
||||
force_kernel = MarlinNvFp4LinearKernel
|
||||
elif envs.VLLM_USE_FBGEMM:
|
||||
force_kernel = FbgemmNvFp4LinearKernel
|
||||
elif envs.VLLM_USE_NVFP4_CT_EMULATIONS:
|
||||
force_kernel = EmulationNvFp4LinearKernel
|
||||
elif envs.VLLM_NVFP4_GEMM_BACKEND is not None:
|
||||
backend_name = envs.VLLM_NVFP4_GEMM_BACKEND
|
||||
force_kernel = _NVFP4_BACKEND_TO_KERNEL.get(backend_name)
|
||||
if force_kernel is None:
|
||||
raise ValueError(
|
||||
f"Unknown VLLM_NVFP4_GEMM_BACKEND={backend_name!r}. "
|
||||
f"Valid choices: "
|
||||
f"{list(_NVFP4_BACKEND_TO_KERNEL.keys())}"
|
||||
)
|
||||
elif linear_backend == "auto" and use_a16:
|
||||
# Force a16 (Marlin) when running weight-only quantization.
|
||||
force_kernel = MarlinNvFp4LinearKernel
|
||||
|
||||
if force_kernel is not None:
|
||||
is_supported, reason = force_kernel.is_supported()
|
||||
|
||||
Reference in New Issue
Block a user