Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
change
sglang
Commits
dd3809fa
"references/vscode:/vscode.git/clone" did not exist on "b9b7cfc602d68e71b4e4039d15dddfe578df9db2"
Unverified
Commit
dd3809fa
authored
Oct 17, 2024
by
Lianmin Zheng
Committed by
GitHub
Oct 17, 2024
Browse files
Fix engine unit test (#1701)
parent
7feba415
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
8 deletions
+12
-8
benchmark/llava_bench/README.md
benchmark/llava_bench/README.md
+1
-1
benchmark/llava_bench/bench_sglang.py
benchmark/llava_bench/bench_sglang.py
+1
-1
python/sglang/srt/server.py
python/sglang/srt/server.py
+4
-5
test/srt/test_srt_engine.py
test/srt/test_srt_engine.py
+6
-1
No files found.
benchmark/llava_bench/README.md
View file @
dd3809fa
...
@@ -17,7 +17,7 @@ pip3 install "torch>=2.1.2" "transformers>=4.36" pillow
...
@@ -17,7 +17,7 @@ pip3 install "torch>=2.1.2" "transformers>=4.36" pillow
### Benchmark sglang
### Benchmark sglang
Launch a server
Launch a server
```
```
python3 -m sglang.launch_server --model-path liuhaotian/llava-v1.
5
-7b --tokenizer-path llava-hf/llava-1.5-7b-hf --port 30000
python3 -m sglang.launch_server --model-path liuhaotian/llava-v1.
6-vicuna
-7b --tokenizer-path llava-hf/llava-1.5-7b-hf --port 30000
```
```
Run benchmark
Run benchmark
...
...
benchmark/llava_bench/bench_sglang.py
View file @
dd3809fa
...
@@ -20,7 +20,7 @@ def image_qa(s, image_file, question):
...
@@ -20,7 +20,7 @@ def image_qa(s, image_file, question):
def
main
(
args
):
def
main
(
args
):
lines
=
read_jsonl
(
args
.
question_file
)[:
args
.
num_questions
]
lines
=
list
(
read_jsonl
(
args
.
question_file
)
)
[:
args
.
num_questions
]
arguments
=
[
arguments
=
[
{
{
"image_file"
:
os
.
path
.
abspath
(
args
.
image_folder
+
"/"
+
l
[
"image"
]),
"image_file"
:
os
.
path
.
abspath
(
args
.
image_folder
+
"/"
+
l
[
"image"
]),
...
...
python/sglang/srt/server.py
View file @
dd3809fa
...
@@ -706,6 +706,10 @@ class Runtime:
...
@@ -706,6 +706,10 @@ class Runtime:
self
.
shutdown
()
self
.
shutdown
()
STREAM_END_SYMBOL
=
b
"data: [DONE]"
STREAM_CHUNK_START_SYMBOL
=
b
"data:"
class
Engine
:
class
Engine
:
"""
"""
SRT Engine without an HTTP server layer.
SRT Engine without an HTTP server layer.
...
@@ -749,8 +753,6 @@ class Engine:
...
@@ -749,8 +753,6 @@ class Engine:
ret
=
loop
.
run_until_complete
(
generate_request
(
obj
,
None
))
ret
=
loop
.
run_until_complete
(
generate_request
(
obj
,
None
))
if
stream
is
True
:
if
stream
is
True
:
STREAM_END_SYMBOL
=
"data: [DONE]"
STREAM_CHUNK_START_SYMBOL
=
"data:"
def
generator_wrapper
():
def
generator_wrapper
():
offset
=
0
offset
=
0
...
@@ -796,9 +798,6 @@ class Engine:
...
@@ -796,9 +798,6 @@ class Engine:
ret
=
await
generate_request
(
obj
,
None
)
ret
=
await
generate_request
(
obj
,
None
)
if
stream
is
True
:
if
stream
is
True
:
STREAM_END_SYMBOL
=
"data: [DONE]"
STREAM_CHUNK_START_SYMBOL
=
"data:"
generator
=
ret
.
body_iterator
generator
=
ret
.
body_iterator
async
def
generator_wrapper
():
async
def
generator_wrapper
():
...
...
test/srt/test_srt_engine.py
View file @
dd3809fa
"""
Usage:
python3 -m unittest test_srt_engine.TestSRTEngine.test_3_sync_streaming_combination
"""
import
asyncio
import
asyncio
import
json
import
json
import
unittest
import
unittest
...
@@ -8,7 +13,7 @@ from sglang.test.few_shot_gsm8k_engine import run_eval
...
@@ -8,7 +13,7 @@ from sglang.test.few_shot_gsm8k_engine import run_eval
from
sglang.test.test_utils
import
DEFAULT_MODEL_NAME_FOR_TEST
from
sglang.test.test_utils
import
DEFAULT_MODEL_NAME_FOR_TEST
class
TestSRT
Backend
(
unittest
.
TestCase
):
class
TestSRT
Engine
(
unittest
.
TestCase
):
def
test_1_engine_runtime_consistency
(
self
):
def
test_1_engine_runtime_consistency
(
self
):
prompt
=
"Today is a sunny day and I like"
prompt
=
"Today is a sunny day and I like"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment