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
f9836660
Unverified
Commit
f9836660
authored
Sep 05, 2025
by
Huang Long
Committed by
GitHub
Sep 05, 2025
Browse files
fix MultiTokenizerWrapper name (#10049)
Signed-off-by:
huanglong
<
huanglong@linux.alibaba.com
>
parent
8b3b995a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
11 deletions
+11
-11
python/sglang/srt/managers/io_struct.py
python/sglang/srt/managers/io_struct.py
+1
-1
python/sglang/srt/managers/multi_tokenizer_mixin.py
python/sglang/srt/managers/multi_tokenizer_mixin.py
+2
-2
python/sglang/srt/managers/scheduler.py
python/sglang/srt/managers/scheduler.py
+4
-4
python/sglang/srt/managers/tokenizer_manager.py
python/sglang/srt/managers/tokenizer_manager.py
+4
-4
No files found.
python/sglang/srt/managers/io_struct.py
View file @
f9836660
...
@@ -1195,7 +1195,7 @@ class MultiTokenizerRegisterReq:
...
@@ -1195,7 +1195,7 @@ class MultiTokenizerRegisterReq:
@
dataclass
@
dataclass
class
MultiTokenizerW
a
rpper
:
class
MultiTokenizerWr
a
pper
:
worker_id
:
int
worker_id
:
int
obj
:
Optional
[
Any
]
=
None
obj
:
Optional
[
Any
]
=
None
...
...
python/sglang/srt/managers/multi_tokenizer_mixin.py
View file @
f9836660
...
@@ -34,7 +34,7 @@ from sglang.srt.managers.io_struct import (
...
@@ -34,7 +34,7 @@ from sglang.srt.managers.io_struct import (
BatchStrOut
,
BatchStrOut
,
BatchTokenIDOut
,
BatchTokenIDOut
,
MultiTokenizerRegisterReq
,
MultiTokenizerRegisterReq
,
MultiTokenizerW
a
rpper
,
MultiTokenizerWr
a
pper
,
)
)
from
sglang.srt.managers.tokenizer_manager
import
TokenizerManager
,
_Communicator
from
sglang.srt.managers.tokenizer_manager
import
TokenizerManager
,
_Communicator
from
sglang.srt.server_args
import
PortArgs
,
ServerArgs
from
sglang.srt.server_args
import
PortArgs
,
ServerArgs
...
@@ -441,7 +441,7 @@ class MultiTokenizerRouter(TokenizerManager, MultiTokenizerMixin):
...
@@ -441,7 +441,7 @@ class MultiTokenizerRouter(TokenizerManager, MultiTokenizerMixin):
async
def
_distribute_result_to_workers
(
self
,
recv_obj
):
async
def
_distribute_result_to_workers
(
self
,
recv_obj
):
"""Distribute result to corresponding workers based on rid"""
"""Distribute result to corresponding workers based on rid"""
if
isinstance
(
recv_obj
,
MultiTokenizerW
a
rpper
):
if
isinstance
(
recv_obj
,
MultiTokenizerWr
a
pper
):
worker_ids
=
[
recv_obj
.
worker_id
]
worker_ids
=
[
recv_obj
.
worker_id
]
recv_obj
=
recv_obj
.
obj
recv_obj
=
recv_obj
.
obj
else
:
else
:
...
...
python/sglang/srt/managers/scheduler.py
View file @
f9836660
...
@@ -85,7 +85,7 @@ from sglang.srt.managers.io_struct import (
...
@@ -85,7 +85,7 @@ from sglang.srt.managers.io_struct import (
LoadLoRAAdapterReqInput
,
LoadLoRAAdapterReqInput
,
LoadLoRAAdapterReqOutput
,
LoadLoRAAdapterReqOutput
,
MultiTokenizerRegisterReq
,
MultiTokenizerRegisterReq
,
MultiTokenizerW
a
rpper
,
MultiTokenizerWr
a
pper
,
OpenSessionReqInput
,
OpenSessionReqInput
,
OpenSessionReqOutput
,
OpenSessionReqOutput
,
ProfileReq
,
ProfileReq
,
...
@@ -1096,13 +1096,13 @@ class Scheduler(
...
@@ -1096,13 +1096,13 @@ class Scheduler(
self
.
send_to_tokenizer
.
send_pyobj
(
abort_req
)
self
.
send_to_tokenizer
.
send_pyobj
(
abort_req
)
continue
continue
# If it is a MultiTokenizerW
a
rpper, unwrap it and handle the inner request.
# If it is a MultiTokenizerWr
a
pper, unwrap it and handle the inner request.
if
isinstance
(
recv_req
,
MultiTokenizerW
a
rpper
):
if
isinstance
(
recv_req
,
MultiTokenizerWr
a
pper
):
worker_id
=
recv_req
.
worker_id
worker_id
=
recv_req
.
worker_id
recv_req
=
recv_req
.
obj
recv_req
=
recv_req
.
obj
output
=
self
.
_request_dispatcher
(
recv_req
)
output
=
self
.
_request_dispatcher
(
recv_req
)
if
output
is
not
None
:
if
output
is
not
None
:
output
=
MultiTokenizerW
a
rpper
(
worker_id
,
output
)
output
=
MultiTokenizerWr
a
pper
(
worker_id
,
output
)
self
.
send_to_tokenizer
.
send_pyobj
(
output
)
self
.
send_to_tokenizer
.
send_pyobj
(
output
)
continue
continue
...
...
python/sglang/srt/managers/tokenizer_manager.py
View file @
f9836660
...
@@ -94,7 +94,7 @@ from sglang.srt.managers.io_struct import (
...
@@ -94,7 +94,7 @@ from sglang.srt.managers.io_struct import (
LoadLoRAAdapterReqInput
,
LoadLoRAAdapterReqInput
,
LoadLoRAAdapterReqOutput
,
LoadLoRAAdapterReqOutput
,
LoRAUpdateResult
,
LoRAUpdateResult
,
MultiTokenizerW
a
rpper
,
MultiTokenizerWr
a
pper
,
OpenSessionReqInput
,
OpenSessionReqInput
,
OpenSessionReqOutput
,
OpenSessionReqOutput
,
ProfileReq
,
ProfileReq
,
...
@@ -1118,7 +1118,7 @@ class TokenizerManager:
...
@@ -1118,7 +1118,7 @@ class TokenizerManager:
self
,
obj
:
UpdateWeightFromDiskReqInput
self
,
obj
:
UpdateWeightFromDiskReqInput
)
->
Tuple
[
bool
,
str
]:
)
->
Tuple
[
bool
,
str
]:
if
self
.
server_args
.
tokenizer_worker_num
>
1
:
if
self
.
server_args
.
tokenizer_worker_num
>
1
:
obj
=
MultiTokenizerW
a
rpper
(
self
.
worker_id
,
obj
)
obj
=
MultiTokenizerWr
a
pper
(
self
.
worker_id
,
obj
)
self
.
send_to_scheduler
.
send_pyobj
(
obj
)
self
.
send_to_scheduler
.
send_pyobj
(
obj
)
self
.
model_update_result
=
asyncio
.
Future
()
self
.
model_update_result
=
asyncio
.
Future
()
if
self
.
server_args
.
dp_size
==
1
:
if
self
.
server_args
.
dp_size
==
1
:
...
@@ -1339,7 +1339,7 @@ class TokenizerManager:
...
@@ -1339,7 +1339,7 @@ class TokenizerManager:
return
None
return
None
if
self
.
server_args
.
tokenizer_worker_num
>
1
:
if
self
.
server_args
.
tokenizer_worker_num
>
1
:
obj
=
MultiTokenizerW
a
rpper
(
self
.
worker_id
,
obj
)
obj
=
MultiTokenizerWr
a
pper
(
self
.
worker_id
,
obj
)
self
.
send_to_scheduler
.
send_pyobj
(
obj
)
self
.
send_to_scheduler
.
send_pyobj
(
obj
)
self
.
session_futures
[
obj
.
session_id
]
=
asyncio
.
Future
()
self
.
session_futures
[
obj
.
session_id
]
=
asyncio
.
Future
()
...
@@ -2165,7 +2165,7 @@ class _Communicator(Generic[T]):
...
@@ -2165,7 +2165,7 @@ class _Communicator(Generic[T]):
if
obj
:
if
obj
:
if
_Communicator
.
enable_multi_tokenizer
:
if
_Communicator
.
enable_multi_tokenizer
:
obj
=
MultiTokenizerW
a
rpper
(
worker_id
=
os
.
getpid
(),
obj
=
obj
)
obj
=
MultiTokenizerWr
a
pper
(
worker_id
=
os
.
getpid
(),
obj
=
obj
)
self
.
_sender
.
send_pyobj
(
obj
)
self
.
_sender
.
send_pyobj
(
obj
)
self
.
_result_event
=
asyncio
.
Event
()
self
.
_result_event
=
asyncio
.
Event
()
...
...
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