-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Support Huawei NPU #2812
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
Open
xtuhcy
wants to merge
1
commit into
modelscope:main
Choose a base branch
from
xtuhcy:patch-1
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
Support Huawei NPU #2812
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -29,7 +29,11 @@ | |
| from funasr.train_utils.load_pretrained_model import load_pretrained_model | ||
| from funasr.utils import export_utils | ||
| from funasr.utils import misc | ||
|
|
||
| try: | ||
| import torch_npu | ||
| npu_is_available = torch_npu.npu.is_available() | ||
| except ImportError: | ||
| npu_is_available = False | ||
|
|
||
| def _resolve_ncpu(config, fallback=4): | ||
| """Return a positive integer representing CPU threads from config.""" | ||
|
|
@@ -199,6 +203,7 @@ def build_model(**kwargs): | |
| if ((device =="cuda" and not torch.cuda.is_available()) | ||
| or (device == "xpu" and not torch.xpu.is_available()) | ||
| or (device == "mps" and not torch.backends.mps.is_available()) | ||
| or (device == "npu" and not npu_is_available) | ||
|
Contributor
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. |
||
| or kwargs.get("ngpu", 1) == 0): | ||
| device = "cpu" | ||
| kwargs["batch_size"] = 1 | ||
|
|
||
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.
为了与
torch.cuda.is_available()等检查保持一致性,并提高代码的封装性,建议将NPU可用性检查封装在一个函数中。这样可以避免在模块加载时就尝试导入torch_npu,只在需要时执行检查。请在build_model方法中也相应地调用此函数。