-
Notifications
You must be signed in to change notification settings - Fork 1k
[BugFix] SharedMemoryConnector: only use shared memory if message size is over threshold #1643
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
Closed
Closed
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 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
41 changes: 41 additions & 0 deletions
41
vllm_omni/distributed/omni_connectors/connectors/test_shm_connector.py
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,41 @@ | ||
| import pytest | ||
|
|
||
| from vllm_omni.distributed.omni_connectors.connectors.shm_connector import SharedMemoryConnector | ||
|
|
||
|
|
||
| @pytest.mark.parametrize( | ||
| "size, threshold", | ||
| [ | ||
| (50, 100), # size < threshold, inline | ||
| (200, 100), # size > threshold, shm | ||
| ], | ||
| ) | ||
| def test_shared_memory_connector(size, threshold): | ||
| from_stage = "dummy_from_stage" | ||
| to_stage = "dummy_to_stage" | ||
| key = "dummy_key" | ||
| data = b" " * size | ||
|
|
||
| tx = SharedMemoryConnector({"shm_threshold_bytes": threshold}) | ||
| rx = SharedMemoryConnector({"shm_threshold_bytes": threshold}) | ||
|
|
||
| success, _, metadata = tx.put( | ||
| from_stage=from_stage, | ||
| to_stage=to_stage, | ||
| put_key=key, | ||
| data=data, | ||
| ) | ||
| assert success | ||
|
|
||
| if size < threshold: | ||
| assert "inline_bytes" in metadata | ||
| else: | ||
| assert "shm" in metadata | ||
|
|
||
| rx_data, _ = rx.get( | ||
| from_stage=from_stage, | ||
| to_stage=to_stage, | ||
| get_key=key, | ||
| metadata=metadata, | ||
| ) | ||
| assert rx_data == data |
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.
Uh oh!
There was an error while loading. Please reload this page.
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.
On sender side, if the size <= self.threshold, we need to update metadata = {"inline_bytes": payload, "size": size}, but on the receiver side , the metadata might NOT be passes to the get function. And in this case, the receiver tries to receive data from shared memory, which does not exist.
I think you need to fix this to make sender<->receiver consistent in both with/without meta path.
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.
We should probably just drop the without metadata path. Other connectors may necessitate the use of metadata and leaving the choice of whether to pass the metadata to the caller is not ideal.
Uh oh!
There was an error while loading. Please reload this page.
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.
@R2-Y PTAL, is it possible that we remove non-metadata path for async chunk function and use meta in all model and modes?