forked from sgl-project/sglang
-
Notifications
You must be signed in to change notification settings - Fork 1
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.
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
add zmq radix cache #12
Open
josephydu
wants to merge
1
commit into
yukavio:main
Choose a base branch
from
josephydu:radix_cache
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -46,6 +46,7 @@ class LoadBalanceMethod(Enum): | |
|
||
ROUND_ROBIN = auto() | ||
SHORTEST_QUEUE = auto() | ||
PRE_RADIX = auto() | ||
|
||
@classmethod | ||
def from_str(cls, method: str): | ||
|
@@ -86,20 +87,31 @@ def __init__( | |
self.recv_from_tokenizer = context.socket(zmq.PULL) | ||
self.recv_from_tokenizer.bind(f"tcp://127.0.0.1:{port_args.controller_port}") | ||
|
||
self.recv_from_tree_cache = context.socket(zmq.PULL) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 通信的机制改一下 |
||
self.recv_from_tree_cache.setsockopt(zmq.RCVHWM, 8) | ||
self.recv_from_tree_cache.bind(f"tcp://127.0.0.1:10000") | ||
|
||
# Dispatch method | ||
self.round_robin_counter = 0 | ||
dispatch_lookup = { | ||
LoadBalanceMethod.ROUND_ROBIN: self.round_robin_scheduler, | ||
LoadBalanceMethod.SHORTEST_QUEUE: self.shortest_queue_scheduler, | ||
LoadBalanceMethod.PRE_RADIX: self.pre_radix_scheduler, | ||
} | ||
self.dispatching = dispatch_lookup[self.load_balance_method] | ||
|
||
# Start data parallel workers | ||
self.workers = [] | ||
|
||
self.newest_tree_cache = {} | ||
|
||
for i in range(server_args.dp_size): | ||
self.start_dp_worker(i) | ||
|
||
def start_dp_worker(self, dp_worker_id: int): | ||
def start_dp_worker( | ||
self, | ||
dp_worker_id: int, | ||
): | ||
tp_size = self.server_args.tp_size | ||
|
||
pipe_controller_reader, pipe_controller_writer = multiprocessing.Pipe( | ||
|
@@ -135,6 +147,13 @@ def start_dp_worker(self, dp_worker_id: int): | |
) | ||
) | ||
|
||
# TODO 找到哪些操作会改变树 | ||
def pre_radix_scheduler(self, input_requests): | ||
if len(input_requests) == 0: | ||
return | ||
|
||
self.round_robin_scheduler(input_requests=input_requests) | ||
|
||
def round_robin_scheduler(self, input_requests): | ||
for r in input_requests: | ||
self.workers[self.round_robin_counter].queue.put(r) | ||
|
@@ -151,8 +170,34 @@ def shortest_queue_scheduler(self, input_requests): | |
def loop_for_forward(self): | ||
while True: | ||
recv_reqs = self.recv_requests() | ||
|
||
if len(recv_reqs) == 0: | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 不要加无关代码 |
||
continue | ||
|
||
self.recv_tree_cache() | ||
self.dispatching(recv_reqs) | ||
|
||
def recv_tree_cache(self): | ||
flag = False | ||
while True: | ||
try: | ||
recv_radix_cache = self.recv_from_tree_cache.recv_pyobj(zmq.NOBLOCK) | ||
except zmq.ZMQError: | ||
break | ||
|
||
gpu_id = recv_radix_cache.gpu_id | ||
if ( | ||
gpu_id not in self.newest_tree_cache | ||
or recv_radix_cache.time > self.newest_tree_cache[gpu_id].time | ||
): | ||
self.newest_tree_cache[gpu_id] = recv_radix_cache | ||
flag = True | ||
|
||
# 使用日志记录器记录信息 | ||
if flag: | ||
# logger.info(f"latest_cache={len(self.newest_tree_cache)}") | ||
pass | ||
|
||
def recv_requests(self): | ||
recv_reqs = [] | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
不应该是单独的一个 Method,可以融入到 Resources_aware里面