-
Notifications
You must be signed in to change notification settings - Fork 972
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
Develop: rectify face_recognition.yaml & PP-ShiTuV2.yaml, del device=gpu. #2705
Merged
Merged
Changes from 13 commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
b0c9a49
Docs: fix error in time_series_pipelines/time_series_anomaly_detectio…
yutian929 fcebd1f
Merge branch 'PaddlePaddle:develop' into develop
yutian929 5f5a516
rectify face_recognition.yaml & PP-ShiTuV2.yaml, del device=gpu.
yutian929 171fcc3
Merge branch 'PaddlePaddle:develop' into develop
yutian929 d834a28
change the method of get_default_device, in order to fix the bug abou…
yutian929 bf2c212
Merge branch 'PaddlePaddle:develop' into develop
yutian929 815a489
renew the func of get_default_device, in order to avoid the confilict…
yutian929 fe529ac
del DEBUG lines.
yutian929 33a8a7e
Merge branch 'PaddlePaddle:develop' into develop
yutian929 f9f20f1
renew
yutian929 85e8be9
Fix code style
yutian929 95e4566
Merge branch 'PaddlePaddle:develop' into develop
yutian929 eef7687
renew logging.
yutian929 4d8bd40
Merge branch 'PaddlePaddle:develop' into develop
yutian929 8e28a72
Merge branch 'PaddlePaddle:develop' into develop
yutian929 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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,8 +14,8 @@ | |
|
||
import os | ||
import GPUtil | ||
import lazy_paddle as paddle | ||
|
||
import lazy_paddle as paddle | ||
from . import logging | ||
from .errors import raise_unsupported_device_error | ||
|
||
|
@@ -32,6 +32,13 @@ def _constr_device(device_type, device_ids): | |
|
||
def get_default_device(): | ||
avail_gpus = GPUtil.getAvailable() | ||
if not avail_gpus: | ||
# maybe edge devices like Jetson | ||
if os.path.exists("/etc/nv_tegra_release"): | ||
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. 这种方式看起来有点儿hack,建议加一句debug日志 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. DONE。 |
||
avail_gpus = [0] | ||
logging.info( | ||
"Detected that the current device is a Jetson edge device. The default behavior will be to use GPU: 0" | ||
) | ||
if not avail_gpus: | ||
return "cpu" | ||
else: | ||
|
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.
需确认下是否安装了pre-commit钩子