Deprecations for v0.23 and v0.24 (#44992)
Signed-off-by: Harry Mellor <19981378+hmellor@users.noreply.github.com>
This commit is contained in:
-168
@@ -8,7 +8,6 @@ import os
|
||||
import sys
|
||||
import tempfile
|
||||
import uuid
|
||||
import warnings
|
||||
from collections.abc import Callable
|
||||
from typing import TYPE_CHECKING, Any, Literal
|
||||
|
||||
@@ -167,7 +166,6 @@ if TYPE_CHECKING:
|
||||
VLLM_HUMMING_INPUT_QUANT_CONFIG: dict[str, Any] | None = None
|
||||
VLLM_HUMMING_USE_F16_ACCUM: bool = False
|
||||
VLLM_HUMMING_MOE_GEMM_TYPE: Literal["indexed", "grouped", "auto"] | None = None
|
||||
VLLM_MXFP4_USE_MARLIN: bool | None = None
|
||||
VLLM_DEEPEPLL_NVFP4_DISPATCH: bool = False
|
||||
VLLM_V1_USE_OUTLINES_CACHE: bool = False
|
||||
VLLM_TPU_BUCKET_PADDING_GAP: int = 0
|
||||
@@ -184,13 +182,7 @@ if TYPE_CHECKING:
|
||||
] = "relax"
|
||||
VLLM_USE_FUSED_MOE_GROUPED_TOPK: bool = True
|
||||
VLLM_BLOCKSCALE_FP8_GEMM_FLASHINFER: bool = True
|
||||
VLLM_USE_FLASHINFER_MOE_FP16: bool = False
|
||||
VLLM_USE_FLASHINFER_MOE_FP8: bool = False
|
||||
VLLM_USE_FLASHINFER_MOE_FP4: bool = False
|
||||
VLLM_USE_FLASHINFER_MOE_INT4: bool = False
|
||||
VLLM_FLASHINFER_MOE_BACKEND: Literal["throughput", "latency", "masked_gemm"] = (
|
||||
"latency"
|
||||
)
|
||||
VLLM_FLASHINFER_AUTOTUNE_CACHE_DIR: str | None = None
|
||||
VLLM_FLASHINFER_ALLREDUCE_BACKEND: Literal["auto", "trtllm", "mnnvl"] = "auto"
|
||||
VLLM_FLASHINFER_WORKSPACE_BUFFER_SIZE: int = 394 * 1024 * 1024
|
||||
@@ -212,7 +204,6 @@ if TYPE_CHECKING:
|
||||
VLLM_KV_CACHE_LAYOUT: Literal["NHD", "HND"] | None = None
|
||||
VLLM_SSM_CONV_STATE_LAYOUT: Literal["SD", "DS"] | None = None
|
||||
VLLM_COMPUTE_NANS_IN_LOGITS: bool = False
|
||||
VLLM_USE_NVFP4_CT_EMULATIONS: bool = False
|
||||
VLLM_ROCM_QUICK_REDUCE_QUANTIZATION: Literal[
|
||||
"FP", "INT8", "INT6", "INT4", "NONE"
|
||||
] = "NONE"
|
||||
@@ -225,12 +216,8 @@ if TYPE_CHECKING:
|
||||
VLLM_LOOPBACK_IP: str = ""
|
||||
VLLM_ALLOW_CHUNKED_LOCAL_ATTN_WITH_HYBRID_KV_CACHE: bool = True
|
||||
VLLM_ENABLE_RESPONSES_API_STORE: bool = False
|
||||
VLLM_NVFP4_GEMM_BACKEND: str | None = None
|
||||
VLLM_HAS_FLASHINFER_CUBIN: bool = False
|
||||
VLLM_USE_FLASHINFER_MOE_MXFP4_MXFP8: bool = False
|
||||
VLLM_USE_FLASHINFER_MOE_MXFP4_BF16: bool = False
|
||||
VLLM_ROCM_FP8_MFMA_PAGE_ATTN: bool = False
|
||||
VLLM_USE_FLASHINFER_MOE_MXFP4_MXFP8_CUTLASS: bool = False
|
||||
VLLM_ALLREDUCE_USE_SYMM_MEM: bool = True
|
||||
VLLM_ALLREDUCE_USE_FLASHINFER: bool = False
|
||||
VLLM_TUNED_CONFIG_FOLDER: str | None = None
|
||||
@@ -257,7 +244,6 @@ if TYPE_CHECKING:
|
||||
VLLM_ENABLE_INDUCTOR_COORDINATE_DESCENT_TUNING: bool = True
|
||||
VLLM_USE_NCCL_SYMM_MEM: bool = False
|
||||
VLLM_NCCL_INCLUDE_PATH: str | None = None
|
||||
VLLM_USE_FBGEMM: bool = False
|
||||
VLLM_GC_DEBUG: str = ""
|
||||
VLLM_DEBUG_WORKSPACE: bool = False
|
||||
VLLM_DISABLE_SHARED_EXPERTS_STREAM: bool = False
|
||||
@@ -350,27 +336,6 @@ def use_mega_aot_artifact():
|
||||
return os.environ.get("VLLM_USE_MEGA_AOT_ARTIFACT", default_value) == "1"
|
||||
|
||||
|
||||
def deprecated_env(
|
||||
env_name: str,
|
||||
removal_version: str,
|
||||
replacement: str,
|
||||
getter: Callable[[], Any],
|
||||
) -> Callable[[], Any]:
|
||||
"""Wrap an env-var getter to emit a FutureWarning when the var is set."""
|
||||
|
||||
def _read() -> Any:
|
||||
if env_name in os.environ:
|
||||
warnings.warn(
|
||||
f"{env_name} is deprecated and will be removed in "
|
||||
f"{removal_version}. {replacement}",
|
||||
FutureWarning,
|
||||
stacklevel=2,
|
||||
)
|
||||
return getter()
|
||||
|
||||
return _read
|
||||
|
||||
|
||||
def env_with_choices(
|
||||
env_name: str,
|
||||
default: str | None,
|
||||
@@ -1371,15 +1336,6 @@ environment_variables: dict[str, Callable[[], Any]] = {
|
||||
"VLLM_MARLIN_USE_ATOMIC_ADD": lambda: (
|
||||
os.environ.get("VLLM_MARLIN_USE_ATOMIC_ADD", "0") == "1"
|
||||
),
|
||||
# Whether to use marlin kernel in mxfp4 quantization method
|
||||
# Deprecated: use --moe-backend marlin (MoE) or --linear-backend marlin
|
||||
# (linear) instead.
|
||||
"VLLM_MXFP4_USE_MARLIN": deprecated_env(
|
||||
"VLLM_MXFP4_USE_MARLIN",
|
||||
"v0.23",
|
||||
"Use --moe-backend marlin or --linear-backend marlin.",
|
||||
lambda: maybe_convert_bool(os.environ.get("VLLM_MXFP4_USE_MARLIN", None)),
|
||||
),
|
||||
# The activation dtype for marlin kernel
|
||||
"VLLM_MARLIN_INPUT_DTYPE": env_with_choices(
|
||||
"VLLM_MARLIN_INPUT_DTYPE", None, ["int8", "fp8"]
|
||||
@@ -1472,68 +1428,10 @@ environment_variables: dict[str, Callable[[], Any]] = {
|
||||
"VLLM_BLOCKSCALE_FP8_GEMM_FLASHINFER": lambda: bool(
|
||||
int(os.getenv("VLLM_BLOCKSCALE_FP8_GEMM_FLASHINFER", "1"))
|
||||
),
|
||||
# Allow use of FlashInfer BF16 MoE kernels for fused moe ops.
|
||||
# Deprecated: use --moe-backend to select a kernel explicitly.
|
||||
"VLLM_USE_FLASHINFER_MOE_FP16": deprecated_env(
|
||||
"VLLM_USE_FLASHINFER_MOE_FP16",
|
||||
"v0.23",
|
||||
"Use --moe-backend (e.g. flashinfer_trtllm, flashinfer_cutlass).",
|
||||
lambda: bool(int(os.getenv("VLLM_USE_FLASHINFER_MOE_FP16", "0"))),
|
||||
),
|
||||
# Allow use of FlashInfer FP8 MoE kernels for fused moe ops.
|
||||
# Deprecated: use --moe-backend to select a kernel explicitly.
|
||||
"VLLM_USE_FLASHINFER_MOE_FP8": deprecated_env(
|
||||
"VLLM_USE_FLASHINFER_MOE_FP8",
|
||||
"v0.23",
|
||||
"Use --moe-backend (e.g. flashinfer_trtllm, flashinfer_cutlass).",
|
||||
lambda: bool(int(os.getenv("VLLM_USE_FLASHINFER_MOE_FP8", "0"))),
|
||||
),
|
||||
# Allow use of FlashInfer NVFP4 MoE kernels for fused moe ops.
|
||||
# Deprecated: use --moe-backend to select a kernel explicitly.
|
||||
"VLLM_USE_FLASHINFER_MOE_FP4": deprecated_env(
|
||||
"VLLM_USE_FLASHINFER_MOE_FP4",
|
||||
"v0.23",
|
||||
"Use --moe-backend (e.g. flashinfer_trtllm, flashinfer_cutlass, "
|
||||
"flashinfer_cutedsl).",
|
||||
lambda: bool(int(os.getenv("VLLM_USE_FLASHINFER_MOE_FP4", "0"))),
|
||||
),
|
||||
# Allow use of FlashInfer MxInt4 MoE kernels for fused moe ops.
|
||||
"VLLM_USE_FLASHINFER_MOE_INT4": lambda: bool(
|
||||
int(os.getenv("VLLM_USE_FLASHINFER_MOE_INT4", "0"))
|
||||
),
|
||||
# If set to 1, use the FlashInfer
|
||||
# MXFP8 (activation) x MXFP4 (weight) MoE backend.
|
||||
# Deprecated: use --moe-backend flashinfer_trtllm combined with
|
||||
# --quantization_config.moe.activation mxfp8.
|
||||
"VLLM_USE_FLASHINFER_MOE_MXFP4_MXFP8": deprecated_env(
|
||||
"VLLM_USE_FLASHINFER_MOE_MXFP4_MXFP8",
|
||||
"v0.23",
|
||||
"Use --moe-backend flashinfer_trtllm with "
|
||||
"--quantization_config.moe.activation mxfp8.",
|
||||
lambda: bool(int(os.getenv("VLLM_USE_FLASHINFER_MOE_MXFP4_MXFP8", "0"))),
|
||||
),
|
||||
# If set to 1, use the FlashInfer CUTLASS backend for
|
||||
# MXFP8 (activation) x MXFP4 (weight) MoE.
|
||||
# Deprecated: use --moe-backend flashinfer_cutlass combined with
|
||||
# --quantization_config.moe.activation mxfp8.
|
||||
"VLLM_USE_FLASHINFER_MOE_MXFP4_MXFP8_CUTLASS": deprecated_env(
|
||||
"VLLM_USE_FLASHINFER_MOE_MXFP4_MXFP8_CUTLASS",
|
||||
"v0.23",
|
||||
"Use --moe-backend flashinfer_cutlass with "
|
||||
"--quantization_config.moe.activation mxfp8.",
|
||||
lambda: bool(
|
||||
int(os.getenv("VLLM_USE_FLASHINFER_MOE_MXFP4_MXFP8_CUTLASS", "0"))
|
||||
),
|
||||
),
|
||||
# If set to 1, use the FlashInfer
|
||||
# BF16 (activation) x MXFP4 (weight) MoE backend.
|
||||
# Deprecated: use --moe-backend to select a kernel explicitly.
|
||||
"VLLM_USE_FLASHINFER_MOE_MXFP4_BF16": deprecated_env(
|
||||
"VLLM_USE_FLASHINFER_MOE_MXFP4_BF16",
|
||||
"v0.23",
|
||||
"Use --moe-backend (e.g. flashinfer_trtllm, flashinfer_cutlass).",
|
||||
lambda: bool(int(os.getenv("VLLM_USE_FLASHINFER_MOE_MXFP4_BF16", "0"))),
|
||||
),
|
||||
# Control the cache sized used by the xgrammar compiler. The default
|
||||
# of 512 MB should be enough for roughly 1000 JSON schemas.
|
||||
# It can be changed with this variable if needed for some reason.
|
||||
@@ -1585,25 +1483,6 @@ environment_variables: dict[str, Callable[[], Any]] = {
|
||||
"MOONCAKE_REQUESTER_LOCAL_HOSTNAME": lambda: os.getenv(
|
||||
"MOONCAKE_REQUESTER_LOCAL_HOSTNAME"
|
||||
),
|
||||
# Flashinfer MoE backend for vLLM's fused Mixture-of-Experts support.
|
||||
# Both require compute capability 10.0 or above.
|
||||
# Available options:
|
||||
# - "throughput": [default]
|
||||
# Uses CUTLASS kernels optimized for high-throughput batch inference.
|
||||
# - "latency":
|
||||
# Uses TensorRT-LLM kernels optimized for low-latency inference.
|
||||
# Deprecated: pass --moe-backend flashinfer_{trtllm,cutlass,cutedsl} directly.
|
||||
"VLLM_FLASHINFER_MOE_BACKEND": deprecated_env(
|
||||
"VLLM_FLASHINFER_MOE_BACKEND",
|
||||
"v0.23",
|
||||
"Use --moe-backend flashinfer_trtllm, flashinfer_cutlass, or "
|
||||
"flashinfer_cutedsl.",
|
||||
env_with_choices(
|
||||
"VLLM_FLASHINFER_MOE_BACKEND",
|
||||
"latency",
|
||||
["throughput", "latency", "masked_gemm"],
|
||||
),
|
||||
),
|
||||
# Override the directory for the FlashInfer autotune config cache.
|
||||
"VLLM_FLASHINFER_AUTOTUNE_CACHE_DIR": lambda: os.getenv(
|
||||
"VLLM_FLASHINFER_AUTOTUNE_CACHE_DIR", None
|
||||
@@ -1681,16 +1560,6 @@ environment_variables: dict[str, Callable[[], Any]] = {
|
||||
"VLLM_COMPUTE_NANS_IN_LOGITS": lambda: bool(
|
||||
int(os.getenv("VLLM_COMPUTE_NANS_IN_LOGITS", "0"))
|
||||
),
|
||||
# Controls whether or not emulations are used for NVFP4
|
||||
# generations on machines < 100 for compressed-tensors
|
||||
# models
|
||||
# Deprecated: use --linear-backend emulation instead.
|
||||
"VLLM_USE_NVFP4_CT_EMULATIONS": deprecated_env(
|
||||
"VLLM_USE_NVFP4_CT_EMULATIONS",
|
||||
"v0.23",
|
||||
"Use --linear-backend emulation.",
|
||||
lambda: bool(int(os.getenv("VLLM_USE_NVFP4_CT_EMULATIONS", "0"))),
|
||||
),
|
||||
# Timeout (in seconds) for MooncakeConnector in PD disaggregated setup.
|
||||
"VLLM_MOONCAKE_ABORT_REQUEST_TIMEOUT": lambda: int(
|
||||
os.getenv("VLLM_MOONCAKE_ABORT_REQUEST_TIMEOUT", "480")
|
||||
@@ -1700,35 +1569,6 @@ environment_variables: dict[str, Callable[[], Any]] = {
|
||||
"VLLM_HAS_FLASHINFER_CUBIN": lambda: bool(
|
||||
int(os.getenv("VLLM_HAS_FLASHINFER_CUBIN", "0"))
|
||||
),
|
||||
# Supported options:
|
||||
# - "flashinfer-cudnn": use flashinfer cudnn GEMM backend
|
||||
# - "flashinfer-trtllm": use flashinfer trtllm GEMM backend
|
||||
# - "flashinfer-cutlass": use flashinfer cutlass GEMM backend
|
||||
# - "marlin": use marlin GEMM backend (for GPUs without native FP4 support)
|
||||
# - "emulation":
|
||||
# use BF16/FP16 GEMM, dequantizing weights and running QDQ on activations.
|
||||
# This is only meant for research purposes to run on devices where NVFP4
|
||||
# GEMM kernels are not available.
|
||||
# - <none>: automatically pick an available backend
|
||||
# Deprecated: use --linear-backend instead.
|
||||
"VLLM_NVFP4_GEMM_BACKEND": deprecated_env(
|
||||
"VLLM_NVFP4_GEMM_BACKEND",
|
||||
"v0.23",
|
||||
"Use --linear-backend.",
|
||||
env_with_choices(
|
||||
"VLLM_NVFP4_GEMM_BACKEND",
|
||||
None,
|
||||
[
|
||||
"flashinfer-b12x",
|
||||
"flashinfer-cudnn",
|
||||
"flashinfer-trtllm",
|
||||
"flashinfer-cutlass",
|
||||
"cutlass",
|
||||
"marlin",
|
||||
"emulation",
|
||||
],
|
||||
),
|
||||
),
|
||||
# Controls garbage collection during CUDA graph capture.
|
||||
# If set to 0 (default), enables GC freezing to speed up capture time.
|
||||
# If set to 1, allows GC to run during capture.
|
||||
@@ -1892,14 +1732,6 @@ environment_variables: dict[str, Callable[[], Any]] = {
|
||||
),
|
||||
# NCCL header path
|
||||
"VLLM_NCCL_INCLUDE_PATH": lambda: os.environ.get("VLLM_NCCL_INCLUDE_PATH", None),
|
||||
# Flag to enable FBGemm kernels on model execution
|
||||
# Deprecated: use --linear-backend fbgemm instead.
|
||||
"VLLM_USE_FBGEMM": deprecated_env(
|
||||
"VLLM_USE_FBGEMM",
|
||||
"v0.23",
|
||||
"Use --linear-backend fbgemm.",
|
||||
lambda: bool(int(os.getenv("VLLM_USE_FBGEMM", "0"))),
|
||||
),
|
||||
# GC debug config
|
||||
# - VLLM_GC_DEBUG=0: disable GC debugger
|
||||
# - VLLM_GC_DEBUG=1: enable GC debugger with gc.collect elpased times
|
||||
|
||||
Reference in New Issue
Block a user