-
Notifications
You must be signed in to change notification settings - Fork 234
Fix the device error when using ray and add initialize_cache to support vllm main #884
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
Merged
Merged
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
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
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 |
---|---|---|
|
@@ -54,6 +54,8 @@ | |
|
||
ASCEND_QUATIZATION_METHOD = "ascend" | ||
|
||
CUSTOM_OP_ENABLED = None | ||
|
||
|
||
def try_register_lib(lib_name: str, lib_info: str = ""): | ||
import importlib | ||
|
@@ -68,6 +70,31 @@ def try_register_lib(lib_name: str, lib_info: str = ""): | |
pass | ||
|
||
|
||
def enable_custom_op(): | ||
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. make CUSTOM_OP_ENABLED as global var.
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. Ok, I have changed CUSTOM_OP_ENABLED to a global variable. |
||
""" | ||
Enable lazy init for vllm_ascend_C to avoid early initialization of CANN's RTS component. | ||
Ensure that ASCEND_RT_VISIBLE_DEVICES can be dynamically modified before torch.npu.set_device(). | ||
""" | ||
global CUSTOM_OP_ENABLED | ||
|
||
if CUSTOM_OP_ENABLED is not None: | ||
return CUSTOM_OP_ENABLED | ||
|
||
else: | ||
try: | ||
# register custom ops into torch_library here | ||
import vllm_ascend.vllm_ascend_C # type: ignore # noqa: F401 | ||
CUSTOM_OP_ENABLED = True | ||
|
||
except ImportError: | ||
CUSTOM_OP_ENABLED = False | ||
logger.warning( | ||
"Warning: Failed to register custom ops, all custom ops will be disabled" | ||
) | ||
|
||
return CUSTOM_OP_ENABLED | ||
|
||
|
||
def find_hccl_library() -> str: | ||
""" | ||
We either use the library file specified by the `HCCL_SO_PATH` | ||
|
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.
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.
TODO: Add ut for ray backend. we should do this after this pr and #1235