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
zhaoyu6
sglang
Commits
3295cd8a
"git@developer.sourcefind.cn:OpenDAS/mmdetection3d.git" did not exist on "a2e7387eba111aa647537505e37a39146a65c431"
Unverified
Commit
3295cd8a
authored
Nov 20, 2024
by
Lianmin Zheng
Committed by
GitHub
Nov 20, 2024
Browse files
Allow skipping warmup in bench_offline_throughput.py (#2103)
parent
5942dfc0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
11 deletions
+18
-11
python/sglang/bench_offline_throughput.py
python/sglang/bench_offline_throughput.py
+15
-8
python/sglang/srt/managers/tp_worker_overlap_thread.py
python/sglang/srt/managers/tp_worker_overlap_thread.py
+3
-3
No files found.
python/sglang/bench_offline_throughput.py
View file @
3295cd8a
...
@@ -57,6 +57,7 @@ class BenchArgs:
...
@@ -57,6 +57,7 @@ class BenchArgs:
disable_ignore_eos
:
bool
=
False
disable_ignore_eos
:
bool
=
False
extra_request_body
:
Optional
[
str
]
=
None
extra_request_body
:
Optional
[
str
]
=
None
seed
:
int
=
1
seed
:
int
=
1
skip_warmup
:
bool
=
False
do_not_exit
:
bool
=
False
do_not_exit
:
bool
=
False
@
staticmethod
@
staticmethod
...
@@ -152,6 +153,11 @@ class BenchArgs:
...
@@ -152,6 +153,11 @@ class BenchArgs:
"additional generate params like sampling params."
,
"additional generate params like sampling params."
,
)
)
parser
.
add_argument
(
"--seed"
,
type
=
int
,
default
=
1
,
help
=
"The random seed."
)
parser
.
add_argument
(
"--seed"
,
type
=
int
,
default
=
1
,
help
=
"The random seed."
)
parser
.
add_argument
(
"--skip-warmup"
,
action
=
"store_true"
,
help
=
"Skip the warmup batches."
,
)
parser
.
add_argument
(
parser
.
add_argument
(
"--do-not-exit"
,
"--do-not-exit"
,
action
=
"store_true"
,
action
=
"store_true"
,
...
@@ -261,14 +267,15 @@ def throughput_test(
...
@@ -261,14 +267,15 @@ def throughput_test(
)
)
# Warm up
# Warm up
logging
.
info
(
"
\n
Warmup..."
)
if
not
bench_args
.
skip_warmup
:
throughput_test_once
(
logging
.
info
(
"
\n
Warmup..."
)
backend_name
=
bench_args
.
backend
,
throughput_test_once
(
backend
=
backend
,
backend_name
=
bench_args
.
backend
,
reqs
=
warmup_requests
,
backend
=
backend
,
ignore_eos
=
not
bench_args
.
disable_ignore_eos
,
reqs
=
warmup_requests
,
extra_request_body
=
extra_request_body
,
ignore_eos
=
not
bench_args
.
disable_ignore_eos
,
)
extra_request_body
=
extra_request_body
,
)
logging
.
info
(
"
\n
Benchmark..."
)
logging
.
info
(
"
\n
Benchmark..."
)
result
=
throughput_test_once
(
result
=
throughput_test_once
(
...
...
python/sglang/srt/managers/tp_worker_overlap_thread.py
View file @
3295cd8a
...
@@ -156,9 +156,6 @@ class TpModelWorkerClient:
...
@@ -156,9 +156,6 @@ class TpModelWorkerClient:
return
logits_output
,
next_token_ids
return
logits_output
,
next_token_ids
def
forward_batch_generation
(
self
,
model_worker_batch
:
ModelWorkerBatch
):
def
forward_batch_generation
(
self
,
model_worker_batch
:
ModelWorkerBatch
):
# A cuda stream sync here to avoid the cuda illegal memory access error.
torch
.
cuda
.
current_stream
().
synchronize
()
# Create a new copy of sampling_info because it will be updated in-place by the scheduler for the next batch.
# Create a new copy of sampling_info because it will be updated in-place by the scheduler for the next batch.
sampling_info
=
model_worker_batch
.
sampling_info
sampling_info
=
model_worker_batch
.
sampling_info
sampling_info
.
update_penalties
()
sampling_info
.
update_penalties
()
...
@@ -169,6 +166,9 @@ class TpModelWorkerClient:
...
@@ -169,6 +166,9 @@ class TpModelWorkerClient:
linear_penalties
=
sampling_info
.
linear_penalties
,
linear_penalties
=
sampling_info
.
linear_penalties
,
)
)
# A cuda stream sync here to avoid the cuda illegal memory access error.
torch
.
cuda
.
current_stream
().
synchronize
()
# Push a new batch to the queue
# Push a new batch to the queue
self
.
input_queue
.
put
((
model_worker_batch
,
self
.
future_token_ids_ct
))
self
.
input_queue
.
put
((
model_worker_batch
,
self
.
future_token_ids_ct
))
...
...
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