feat: return partial generation results when aborting requests in waiting queue (#11673)
This commit is contained in:
@@ -71,7 +71,7 @@ suites = {
|
||||
TestFile("rl/test_fp32_lm_head.py", 30),
|
||||
TestFile("rl/test_update_weights_from_disk.py", 114),
|
||||
TestFile("rl/test_update_weights_from_tensor.py", 48),
|
||||
TestFile("test_abort.py", 51),
|
||||
TestFile("test_abort.py", 121),
|
||||
TestFile("test_build_eagle_tree.py", 8),
|
||||
TestFile("test_chunked_prefill.py", 313),
|
||||
TestFile("test_create_kvindices.py", 2),
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
import json
|
||||
import multiprocessing
|
||||
import os
|
||||
import time
|
||||
import unittest
|
||||
from concurrent.futures import ThreadPoolExecutor, as_completed
|
||||
|
||||
import requests
|
||||
|
||||
from sglang.srt.environ import envs
|
||||
from sglang.srt.utils import kill_process_tree
|
||||
from sglang.test.test_utils import (
|
||||
DEFAULT_MODEL_NAME_FOR_TEST,
|
||||
@@ -110,5 +112,82 @@ class TestAbortAll(CustomTestCase):
|
||||
)
|
||||
|
||||
|
||||
class TestAbortAllWithRetraction(CustomTestCase):
|
||||
@classmethod
|
||||
def setUpClass(cls):
|
||||
cls.model = DEFAULT_MODEL_NAME_FOR_TEST
|
||||
cls.base_url = DEFAULT_URL_FOR_TEST
|
||||
# Here's a small trick: in scheduler.py, when SGLANG_TEST_RETRACT is enabled,
|
||||
# retraction is triggered when the batch size reaches 10.
|
||||
# However, since SGLANG_TEST_RETRACT_NO_PREFILL_BS is set to 6, the remaining 4
|
||||
# requests will stay in the waiting queue.
|
||||
with (
|
||||
envs.SGLANG_TEST_RETRACT.override(True),
|
||||
envs.SGLANG_TEST_RETRACT_NO_PREFILL_BS.override(6),
|
||||
):
|
||||
cls.process = popen_launch_server(
|
||||
cls.model,
|
||||
cls.base_url,
|
||||
timeout=DEFAULT_TIMEOUT_FOR_SERVER_LAUNCH,
|
||||
other_args=[
|
||||
"--max-running-requests",
|
||||
16,
|
||||
"--schedule-policy",
|
||||
"random",
|
||||
],
|
||||
)
|
||||
|
||||
@classmethod
|
||||
def tearDownClass(cls):
|
||||
kill_process_tree(cls.process.pid)
|
||||
|
||||
def _run_decode(self):
|
||||
response = requests.post(
|
||||
self.base_url + "/generate",
|
||||
json={
|
||||
"text": "The capital of France is",
|
||||
"sampling_params": {
|
||||
"temperature": 0,
|
||||
"max_new_tokens": 4000,
|
||||
"ignore_eos": True,
|
||||
},
|
||||
},
|
||||
)
|
||||
return response.json()
|
||||
|
||||
def test_abort_all_with_retraction(self):
|
||||
num_requests = 32
|
||||
with ThreadPoolExecutor(num_requests) as executor:
|
||||
futures = [executor.submit(self._run_decode) for _ in range(num_requests)]
|
||||
|
||||
# ensure the decode has been started and retractions happen.
|
||||
time.sleep(8)
|
||||
|
||||
requests.post(
|
||||
self.base_url + "/abort_request",
|
||||
json={
|
||||
"abort_all": True,
|
||||
},
|
||||
)
|
||||
|
||||
abort_in_queue_count = 0
|
||||
abort_in_queue_with_none_empty_text = 0
|
||||
|
||||
for future in as_completed(futures):
|
||||
self.assertEqual(
|
||||
future.result()["meta_info"]["finish_reason"]["type"], "abort"
|
||||
)
|
||||
if (
|
||||
future.result()["meta_info"]["finish_reason"]["message"]
|
||||
== "Abort in waiting queue"
|
||||
):
|
||||
abort_in_queue_count += 1
|
||||
if len(future.result()["output_ids"]) > 0:
|
||||
abort_in_queue_with_none_empty_text += 1
|
||||
assert abort_in_queue_count > 0
|
||||
assert abort_in_queue_with_none_empty_text > 0
|
||||
print("Finished test_abort_all_with_retraction")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
|
||||
Reference in New Issue
Block a user