Skip to content

Delete the external-engine path from SGLangEngine #1981

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fzyzcjy wants to merge 1 commit into
base: tom/refactor-miles/op13-25
Choose a base branch
from
Open

Delete the external-engine path from SGLangEngine #1981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 5 additions & 48 deletions miles/backends/sglang_utils/sglang_engine.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import multiprocessing
import os

import httpx
from sglang.srt.server_args import ServerArgs
from sglang.srt.utils import kill_process_tree

Expand Down Expand Up @@ -123,7 +122,7 @@ def init(
ip_part, port_part = dist_init_addr.rsplit(":", 1)
dist_init_addr = f"{format_v6_uri(ip_part)}:{port_part}"

server_args_dict, external_engine_need_check_fields = _compute_server_args(
server_args_dict = _compute_server_args(
self.args,
self.rank,
dist_init_addr,
Expand All @@ -144,30 +143,7 @@ def init(

self.server_url = build_server_url(self.server_host, self.server_port)

if self.args.rollout_external:
self._init_external(server_args_dict, external_engine_need_check_fields=external_engine_need_check_fields)
else:
self._init_normal(server_args_dict)

def _init_external(self, expect_server_args, external_engine_need_check_fields):
logger.info(f"Use external SGLang engine (rank={self.rank}, expect_server_args={expect_server_args})")

def _get_actual_server_args():
response = httpx.get(f"{self.server_url}/get_server_info", timeout=None)
response.raise_for_status()
return response.json()

def _sanity_check_server_args(actual_server_args, expect_server_args):
for name in external_engine_need_check_fields:
expect_value = expect_server_args.get(name)
actual_value = actual_server_args.get(name)
assert (
actual_value == expect_value
), f"{name=} {expect_value=} {actual_value=} {expect_server_args=} {actual_server_args=}"

async_utils.run(wait_server_healthy(server_url=self.server_url, api_key=None, is_process_alive=lambda: True))
actual_server_args = _get_actual_server_args()
_sanity_check_server_args(actual_server_args, expect_server_args)
self._init_normal(server_args_dict)

def _init_normal(self, server_args_dict):
logger.info(f"Launch HttpServerEngineAdapter at: {self.server_host}:{self.server_port}")
Expand All @@ -178,18 +154,12 @@ def _init_normal(self, server_args_dict):
self.process = launch_server_process(server_args)

def shutdown(self):
if self.args.rollout_external:
return

logger.info(f"Shutdown engine {self.server_host}:{self.server_port}...")
kill_process_tree(self.process.pid)

def simulate_crash(self):
if self.args.rollout_external or not getattr(self, "process", None):
logger.info(
"simulate_crash called but no local engine process exists (rollout_external=%s); skip kill",
self.args.rollout_external,
)
if not getattr(self, "process", None):
logger.info("simulate_crash called but no local engine process exists; skip kill")
return

logger.info(f"Simulating crash on engine {self.server_host}:{self.server_port}...")
Expand Down Expand Up @@ -319,17 +289,4 @@ def _compute_server_args(
for key in unused_keys:
kwargs.pop(key)

return kwargs, external_engine_need_check_fields


_EXTERNAL_ENGINE_SKIP_CHECK_FIELDS = [
"model_path",
"trust_remote_code",
"random_seed",
"nccl_port",
"dist_init_addr",
"skip_server_warmup",
"enable_draft_weights_cpu_backup",
"enable_metrics",
"mem_fraction_static",
]
return kwargs
4 changes: 2 additions & 2 deletions tests/fast/backends/sglang_utils/test_sglang_engine_init_addressing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def test_init_brackets_bare_ipv6_inputs_and_keeps_the_allocated_port():
from miles.backends.sglang_utils.sglang_engine import SGLangEngine

engine = SGLangEngine.__new__(SGLangEngine)
engine.args = Namespace(env_report=None, rollout_external=False)
engine.args = Namespace(env_report=None)
engine.rank = 0
engine.worker_type = "regular"
engine.base_gpu_id = 0
Expand All @@ -25,7 +25,7 @@ def test_init_brackets_bare_ipv6_inputs_and_keeps_the_allocated_port():
def fake_compute_server_args(*args, **kwargs):
forwarded["dist_init_addr"] = args[2]
forwarded["host"] = args[4]
return {"node_rank": 0, "host": "fd00::2", "port": 31007, "disaggregation_bootstrap_port": None}, []
return {"node_rank": 0, "host": "fd00::2", "port": 31007, "disaggregation_bootstrap_port": None}

with (
patch(f"{_MODULE}._compute_server_args", side_effect=fake_compute_server_args),
Expand Down
Loading