Skip to content
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.

Sign up for GitHub

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

Open
wants to merge 13 commits into
base: develop
Choose a base branch
from
+8 −3
Open

Develop: rectify face_recognition.yaml & PP-ShiTuV2.yaml, del device=gpu. #2705

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b0c9a49
Docs: fix error in time_series_pipelines/time_series_anomaly_detectio…
yutian929 Dec 19, 2024
fcebd1f
Merge branch 'PaddlePaddle:develop' into develop
yutian929 Dec 19, 2024
5f5a516
rectify face_recognition.yaml & PP-ShiTuV2.yaml, del device=gpu.
yutian929 Dec 20, 2024
171fcc3
Merge branch 'PaddlePaddle:develop' into develop
yutian929 Dec 30, 2024
d834a28
change the method of get_default_device, in order to fix the bug abou…
yutian929 Dec 30, 2024
bf2c212
Merge branch 'PaddlePaddle:develop' into develop
yutian929 Dec 30, 2024
815a489
renew the func of get_default_device, in order to avoid the confilict…
yutian929 Dec 30, 2024
fe529ac
del DEBUG lines.
yutian929 Dec 30, 2024
33a8a7e
Merge branch 'PaddlePaddle:develop' into develop
yutian929 Dec 31, 2024
f9f20f1
renew
yutian929 Dec 31, 2024
85e8be9
Fix code style
yutian929 Dec 31, 2024
95e4566
Merge branch 'PaddlePaddle:develop' into develop
yutian929 Jan 6, 2025
eef7687
renew logging.
yutian929 Jan 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion paddlex/pipelines/PP-ShiTuV2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ Pipeline:
rec_model: PP-ShiTuV2_rec
det_batch_size: 1
rec_batch_size: 1
device: gpu
index: None
score_thres: 0.5
return_k: 5
1 change: 0 additions & 1 deletion paddlex/pipelines/face_recognition.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ Pipeline:
rec_model: "MobileFaceNet"
det_batch_size: 1
rec_batch_size: 1
device: gpu
index: None
score_thres: 0.4
return_k: 5
7 changes: 6 additions & 1 deletion paddlex/utils/device.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@

import os
import GPUtil
import lazy_paddle as paddle

import lazy_paddle as paddle
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

需确认下是否安装了pre-commit钩子

from . import logging
from .errors import raise_unsupported_device_error

Expand All @@ -32,6 +32,11 @@ 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"):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这种方式看起来有点儿hack，建议加一句debug日志

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

DONE。

avail_gpus = [0]
# print(f"* DEBUG: avail_gpus = {avail_gpus}")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

去掉调试用的注释

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

在最新的commit里已经删除。

if not avail_gpus:
return "cpu"
else:
Expand Down