-
Notifications
You must be signed in to change notification settings - Fork 751
[feature] provide lock free scheduler #7937
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
Draft
liyonghua0910
wants to merge
2
commits into
PaddlePaddle:develop
Choose a base branch
from
liyonghua0910:develop+20260526_lockfree_scheduler
base: develop
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.
Draft
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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 hidden or 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 hidden or 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 hidden or 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 |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| """ | ||
| # Copyright (c) 2025 PaddlePaddle Authors. All Rights Reserved. | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License" | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| """ | ||
|
|
||
|
|
||
| class RequestManager: | ||
| """ | ||
| Unified interface for request slot management. | ||
|
|
||
| Wraps the existing stop_flags / tasks_list arrays from V1's | ||
| ResourceManager — no new data structures are created. All slot | ||
| operations should go through this interface rather than directly | ||
| manipulating the underlying arrays. | ||
|
|
||
| Thread-safety: | ||
| - acquire_slot / get_available_position / available_batch: called | ||
| only inside schedule() (single-writer), no locking needed. | ||
| - release_slot: also safe to call from other threads (e.g. | ||
| finish_requests) because single-element list assignment is | ||
| GIL-atomic under CPython. | ||
| """ | ||
|
|
||
| def __init__(self, stop_flags: list[bool], tasks_list: list): | ||
| self.stop_flags = stop_flags | ||
| self.tasks_list = tasks_list | ||
| self.max_num_seqs = len(stop_flags) | ||
|
|
||
| def acquire_slot(self, idx: int, task) -> None: | ||
| """Occupy slot idx with task.""" | ||
| self.stop_flags[idx] = False | ||
| self.tasks_list[idx] = task | ||
|
|
||
| def release_slot(self, idx: int) -> None: | ||
| """Release a slot. Safe to call from any thread.""" | ||
| self.stop_flags[idx] = True | ||
| self.tasks_list[idx] = None | ||
|
|
||
| def get_available_position(self) -> int: | ||
| """Return the first available slot index, or raise RuntimeError.""" | ||
| for idx in range(self.max_num_seqs): | ||
| if self.stop_flags[idx]: | ||
| return idx | ||
| raise RuntimeError("No available position for new request") | ||
|
|
||
| def available_batch(self) -> int: | ||
| """Return the number of free slots.""" | ||
| return sum(self.stop_flags) |
This file contains hidden or 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.
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.
🔴 Bug 当
ENABLE_V1_KVCACHE_SCHEDULER=0(使用默认 ResourceManager)且splitwise_role=="prefill"时,此处调用self.resource_manager.prefill_schedule()会触发AttributeError,因为默认ResourceManager没有该方法。prefill_schedule()仅在ResourceManagerV1(及继承它的 V2)中定义,但当前代码无条件地对所有 resource_manager 实例调用。建议修复方式:
或者在
ResourceManager基类中定义prefill_schedule()并回退到schedule(),确保接口一致。