config: stop writing config onto the published ServerArgs at three sites (#33334)
Each of these wrote a value after resolution so a later reader would find it on the instance. None of them needed the instance: one write was redundant, and the two that carry a value the resolved-config readback reports move to get_context().override, which the readback overlays. - The SM100 GDN prefill default was written onto ServerArgs and read back one line later by initialize_linear_attn_config. It is now the return value of flashinfer_gdn_prefill_default, threaded into initialize_linear_attn_config (an explicit --linear-attn-prefill-backend still wins) and recorded with get_context().override so /server_info reports the backend in effect. - The XGrammar fallback recorded grammar_backend="none" on the instance. No code reads the field after the factory reads it once, but get_internal_state reports the whole resolved config, so the fallback now lands there instead: the readback tells the truth and the seed keeps the requested backend. - UnifiedRadixCache.init_hicache re-applied the direct-IO layout fixup that __post_init__ already applies: init_hicache only runs when hierarchical cache is on, which is exactly when _handle_hicache normalizes page_first to page_first_direct (pinned by test_hicache_io_backend_and_mem_layout_ compatibility::direct_with_page_first). Three fixtures reached the fixup by building ServerArgs(model_path="dummy"), whose resolution is skipped, so they now declare the layout resolution would have produced. Writer ratchet 34 -> 31.
This commit is contained in:
@@ -22,7 +22,7 @@ from typing import Dict, List, NamedTuple, Optional, Tuple
|
||||
import torch
|
||||
|
||||
from sglang.srt.parser.reasoning_parser import ReasoningParser
|
||||
from sglang.srt.runtime_context import get_resources
|
||||
from sglang.srt.runtime_context import get_context, get_resources
|
||||
from sglang.srt.server_args import ServerArgs
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
@@ -360,7 +360,7 @@ def create_grammar_backend(
|
||||
"Falling back to grammar_backend='none'. "
|
||||
"Structured outputs (JSON schema, regex, EBNF) will not be available."
|
||||
)
|
||||
server_args.override("grammar.import_fallback", grammar_backend="none")
|
||||
get_context().override("grammar.import_fallback", grammar_backend="none")
|
||||
return None
|
||||
elif name == "llguidance":
|
||||
from sglang.srt.constrained.llguidance_backend import GuidanceBackend
|
||||
|
||||
@@ -13,6 +13,7 @@ from sglang.srt.configs.linear_attn_model_registry import (
|
||||
get_linear_attn_config,
|
||||
import_backend_class,
|
||||
)
|
||||
from sglang.srt.runtime_context import get_context
|
||||
from sglang.srt.utils import get_device_capability, is_hip, is_musa, is_npu
|
||||
|
||||
_is_musa = is_musa()
|
||||
@@ -353,7 +354,7 @@ def attn_backend_wrapper(runner: "ModelRunner", full_attn_backend: "AttentionBac
|
||||
)
|
||||
from sglang.srt.layers.attention.linear.gdn_backend import (
|
||||
GDNAttnBackend,
|
||||
maybe_set_default_flashinfer_gdn_prefill,
|
||||
flashinfer_gdn_prefill_default,
|
||||
)
|
||||
else:
|
||||
from sglang.srt.hardware_backend.npu.attention.ascend_gdn_backend import (
|
||||
@@ -367,9 +368,15 @@ def attn_backend_wrapper(runner: "ModelRunner", full_attn_backend: "AttentionBac
|
||||
)
|
||||
|
||||
check_environments()
|
||||
prefill_default = None
|
||||
if hybrid_gdn_config(runner.model_config) is not None and not is_npu():
|
||||
maybe_set_default_flashinfer_gdn_prefill(runner)
|
||||
initialize_linear_attn_config(runner.server_args)
|
||||
prefill_default = flashinfer_gdn_prefill_default(runner)
|
||||
if prefill_default is not None:
|
||||
get_context().override(
|
||||
"gdn_backend.sm100_flashinfer_default",
|
||||
linear_attn_prefill_backend=prefill_default,
|
||||
)
|
||||
initialize_linear_attn_config(runner.server_args, prefill_default)
|
||||
hybrid_backend_cls = HybridLinearAttnBackend
|
||||
if hybrid_gdn_config(runner.model_config) is not None:
|
||||
if is_blackwell():
|
||||
|
||||
@@ -63,8 +63,8 @@ elif is_cpu():
|
||||
fused_gdn_gating = torch.ops.sgl_kernel.fused_gdn_gating_cpu
|
||||
|
||||
|
||||
def maybe_set_default_flashinfer_gdn_prefill(model_runner: ModelRunner) -> None:
|
||||
"""Use FlashInfer for the narrow SM100 GDN prefill domain we validated."""
|
||||
def flashinfer_gdn_prefill_default(model_runner: ModelRunner) -> Optional[str]:
|
||||
"""FlashInfer for the narrow SM100 GDN prefill domain we validated, else None."""
|
||||
args = model_runner.server_args
|
||||
if (
|
||||
args.linear_attn_prefill_backend is not None
|
||||
@@ -73,7 +73,7 @@ def maybe_set_default_flashinfer_gdn_prefill(model_runner: ModelRunner) -> None:
|
||||
or not is_cuda()
|
||||
or torch.cuda.get_device_capability()[0] != 10
|
||||
):
|
||||
return
|
||||
return None
|
||||
|
||||
cuda_version = torch.version.cuda
|
||||
chunk_size = args.chunked_prefill_size
|
||||
@@ -89,20 +89,17 @@ def maybe_set_default_flashinfer_gdn_prefill(model_runner: ModelRunner) -> None:
|
||||
or model_runner.req_to_token_pool.mamba_pool.mamba_cache.temporal.dtype
|
||||
!= torch.bfloat16
|
||||
):
|
||||
return
|
||||
return None
|
||||
|
||||
from sglang.srt.layers.attention.linear.kernels.gdn_flashinfer import (
|
||||
is_flashinfer_gdn_prefill_available,
|
||||
)
|
||||
|
||||
if is_flashinfer_gdn_prefill_available():
|
||||
# server_args is resolved (read-only) by the time backends initialize;
|
||||
# route this load-time default through the audited mutation entry.
|
||||
args.override(
|
||||
"gdn_backend.sm100_flashinfer_default",
|
||||
linear_attn_prefill_backend="flashinfer",
|
||||
)
|
||||
rank0_log("Defaulting SM100 GDN prefill backend to FlashInfer.")
|
||||
if not is_flashinfer_gdn_prefill_available():
|
||||
return None
|
||||
|
||||
rank0_log("Defaulting SM100 GDN prefill backend to FlashInfer.")
|
||||
return "flashinfer"
|
||||
|
||||
|
||||
class GDNKernelDispatcher:
|
||||
|
||||
@@ -43,13 +43,15 @@ LINEAR_ATTN_DECODE_BACKEND: Optional[LinearAttnKernelBackend] = None
|
||||
LINEAR_ATTN_PREFILL_BACKEND: Optional[LinearAttnKernelBackend] = None
|
||||
|
||||
|
||||
def initialize_linear_attn_config(server_args: ServerArgs):
|
||||
def initialize_linear_attn_config(
|
||||
server_args: ServerArgs, prefill_default: Optional[str] = None
|
||||
):
|
||||
global LINEAR_ATTN_DECODE_BACKEND
|
||||
global LINEAR_ATTN_PREFILL_BACKEND
|
||||
|
||||
base = server_args.linear_attn_backend
|
||||
decode = server_args.linear_attn_decode_backend or base
|
||||
prefill = server_args.linear_attn_prefill_backend or base
|
||||
prefill = server_args.linear_attn_prefill_backend or prefill_default or base
|
||||
|
||||
LINEAR_ATTN_DECODE_BACKEND = LinearAttnKernelBackend(decode)
|
||||
LINEAR_ATTN_PREFILL_BACKEND = LinearAttnKernelBackend(prefill)
|
||||
|
||||
@@ -311,17 +311,6 @@ class UnifiedRadixCache(BasePrefixCache):
|
||||
attach_hybrid_pool_to_unified_cache,
|
||||
)
|
||||
|
||||
# Direct IO layout fixup (must happen before pool creation)
|
||||
if server_args.hicache_io_backend == "direct":
|
||||
if server_args.hicache_mem_layout == "page_first":
|
||||
server_args.override(
|
||||
"hicache.mem_layout_force", hicache_mem_layout="page_first_direct"
|
||||
)
|
||||
logger.warning(
|
||||
"Page first layout is not supported with direct IO backend, "
|
||||
"switching to page first direct layout"
|
||||
)
|
||||
|
||||
self.load_cache_event = threading.Event()
|
||||
self.sidecar_pool_specs.clear()
|
||||
self.extra_metric_labels = server_args.extra_metric_labels
|
||||
|
||||
Reference in New Issue
Block a user