Skip to content

Commit

Permalink
Expose more arguments to control the scheduling policy (#32)
Browse files Browse the repository at this point in the history
  • Loading branch information
merrymercy committed Jan 18, 2024
1 parent c0454b3 commit 22ec7bc
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 5 deletions.
2 changes: 1 addition & 1 deletion python/sglang/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

from sglang.backend.anthropic import Anthropic
from sglang.backend.base_backend import BaseBackend
from sglang.backend.vertexai import VertexAI
from sglang.backend.openai import OpenAI
from sglang.backend.runtime_endpoint import RuntimeEndpoint
from sglang.backend.vertexai import VertexAI
from sglang.global_config import global_config
from sglang.lang.ir import (
SglExpr,
Expand Down
8 changes: 6 additions & 2 deletions python/sglang/lang/ir.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,9 @@ def to_openai_kwargs(self):

def to_vertexai_kwargs(self):
if self.regex is not None:
warnings.warn("Regular expression is not supported in the VertexAI backend.")
warnings.warn(
"Regular expression is not supported in the VertexAI backend."
)
return {
"candidate_count": 1,
"max_output_tokens": self.max_new_tokens,
Expand All @@ -67,7 +69,9 @@ def to_vertexai_kwargs(self):
def to_anthropic_kwargs(self):
# Anthropic does not support frequency_penalty or presence_penalty, so we drop it here
if self.regex is not None:
warnings.warn("Regular expression is not supported in the Anthropic backend.")
warnings.warn(
"Regular expression is not supported in the Anthropic backend."
)
return {
"max_tokens_to_sample": self.max_new_tokens,
"stop_sequences": self.stop,
Expand Down
5 changes: 4 additions & 1 deletion python/sglang/srt/managers/router/model_rpc.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ def exposed_init_model(
self.tp_rank = tp_rank
self.tp_size = server_args.tp_size
self.schedule_heuristic = server_args.schedule_heuristic
self.schedule_conservativeness = server_args.schedule_conservativeness

# Init model and tokenizer
self.model_config = ModelConfig(
Expand Down Expand Up @@ -248,7 +249,9 @@ def get_new_fill_batch(self):
available_size = (
self.token_to_kv_pool.available_size() + self.tree_cache.evictable_size()
)
new_ratio = self.scheduler.new_token_estimation_ratio()
new_ratio = (
self.scheduler.new_token_estimation_ratio() * self.schedule_conservativeness
)
if self.running_batch:
available_size -= sum(
[
Expand Down
9 changes: 8 additions & 1 deletion python/sglang/srt/server_args.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ class ServerArgs:
tp_size: int = 1
model_mode: List[str] = ()
schedule_heuristic: str = "lpm"
schedule_conservativeness: float = 1.0
random_seed: int = 42
stream_interval: int = 2
disable_log_stats: bool = False
Expand Down Expand Up @@ -85,7 +86,7 @@ def add_cli_args(parser: argparse.ArgumentParser):
"--mem-fraction-static",
type=float,
default=ServerArgs.mem_fraction_static,
help="The fraction of the memory used for static allocation (model weights and KV cache memory pool)",
help="The fraction of the memory used for static allocation (model weights and KV cache memory pool). Use a smaller value if you see out-of-memory errors.",
)
parser.add_argument(
"--tp-size",
Expand All @@ -107,6 +108,12 @@ def add_cli_args(parser: argparse.ArgumentParser):
default=ServerArgs.schedule_heuristic,
help="Schudule mode: [lpm, weight, random, fcfs]",
)
parser.add_argument(
"--schedule-conservativeness",
type=float,
default=ServerArgs.schedule_conservativeness,
help="How conservative the schedule policy is. A larger value means more conservative scheduling. Use a larger value if you see out-of-memory errors.",
)
parser.add_argument(
"--random-seed",
type=int,
Expand Down

0 comments on commit 22ec7bc

Please sign in to comment.