Skip to content

Commit bb48adb

Browse files
committed
modify ci accroding to PaddlePaddle#4398 and adjust predictor
1 parent c3d524a commit bb48adb

File tree

8 files changed

+130
-218
lines changed

8 files changed

+130
-218
lines changed

model_zoo/ernie-3.0/deploy/simple_serving/README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@
66
- [其他参数设置](#其他参数设置)
77

88
## 环境准备
9-
10-
paddlenlp >= 2.5.0
11-
9+
使用有SimpleServing功能的PaddleNLP版本
1210

1311
## Server服务启动
1412
### 文本分类任务启动

model_zoo/ernie-m/configs/test.yaml

Lines changed: 0 additions & 53 deletions
This file was deleted.

model_zoo/ernie-m/deploy/predictor/README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ pip install -r requirements_gpu.txt
2828

2929
### 2.2 CPU端推理样例
3030
在 CPU 端,请使用如下命令进行部署
31-
```
32-
python infer_cpu.py --task_name seq_cls --model_path ../../finetuned_models/export/model
31+
```sh
32+
python inference.py --device cpu --task_name seq_cls --model_path ../../finetuned_models/export/model
3333
```
3434
输出打印如下:
3535
```
@@ -58,8 +58,8 @@ infer_cpu.py 脚本中的参数说明:
5858

5959
### 2.3 GPU端推理样例
6060
在 GPU 端,请使用如下命令进行部署
61-
```
62-
python infer_gpu.py --task_name seq_cls --model_path ../../finetuned_models/export/model
61+
```sh
62+
python inference.py --device gpu --task_name seq_cls --model_path ../../finetuned_models/export/model
6363
```
6464
输出打印如下:
6565
```
@@ -77,8 +77,8 @@ label: neutral confidence: 0.9880901575088501
7777
-----------------------------
7878
```
7979
如果需要 FP16 进行加速,可以设置 precision_mode 为 fp16,具体命令为
80-
```
81-
python infer_gpu.py --task_name seq_cls --model_path ../../finetuned_models/export/model --precision_mode fp16
80+
```sh
81+
python inference.py --device gpu --task_name seq_cls --model_path ../../finetuned_models/export/model --precision_mode fp16
8282
```
8383
infer_gpu.py 脚本中的参数说明:
8484
| 参数 |参数说明 |

model_zoo/ernie-m/deploy/predictor/infer_cpu.py

Lines changed: 0 additions & 85 deletions
This file was deleted.

model_zoo/ernie-m/deploy/predictor/infer_gpu.py renamed to model_zoo/ernie-m/deploy/predictor/inference.py

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,17 @@
1414

1515
import argparse
1616

17-
from ernie_m_predictor import ErnieMPredictor
17+
from psutil import cpu_count
18+
19+
from .ernie_m_predictor import ErnieMPredictor
1820

1921

2022
def parse_args():
2123
parser = argparse.ArgumentParser()
2224
# Required parameters
25+
parser.add_argument(
26+
"--device", default="cpu", type=str, choices=["gpu", "cpu"], help="Device selected for inference."
27+
)
2328
parser.add_argument(
2429
"--task_name",
2530
default="seq_cls",
@@ -69,14 +74,19 @@ def parse_args():
6974
choices=["fp32", "fp16", "int8"],
7075
help="Inference precision.",
7176
)
77+
parser.add_argument(
78+
"--num_threads",
79+
default=cpu_count(logical=False),
80+
type=int,
81+
help="num_threads for cpu.",
82+
)
7283
args = parser.parse_args()
7384
return args
7485

7586

7687
def main():
7788
args = parse_args()
7889
args.task_name = args.task_name.lower()
79-
args.device = "gpu"
8090
predictor = ErnieMPredictor(args)
8191

8292
if args.task_name == "seq_cls":

model_zoo/ernie-m/test.py

Lines changed: 0 additions & 69 deletions
This file was deleted.
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
classifier:
2+
default:
3+
do_train: True
4+
do_eval: True
5+
do_export: True
6+
task_type: cross-lingual-transfer
7+
model_name_or_path: __internal_testing__/ernie-m
8+
output_dir: ./output_dir
9+
export_model_dir: ./output_dir
10+
per_device_train_batch_size: 16
11+
per_device_eval_batch_size: 16
12+
max_seq_length: 256
13+
learning_rate: 5e-5
14+
classifier_dropout: 0.1
15+
weight_decay: 0.0
16+
layerwise_decay: 0.8
17+
warmup_ratio: 0.1
18+
max_steps: 2
19+
logging_steps: 1
20+
save_steps: 1
21+
eval_steps: 1
22+
device: cpu
23+
fp16: False
24+
load_best_model_at_end: True
25+
metric_for_best_model: eval_accuracy
26+
overwrite_output_dir: True
27+
28+
slow:
29+
do_train: True
30+
do_eval: True
31+
do_export: True
32+
task_type: cross-lingual-transfer
33+
model_name_or_path: ernie-m-base
34+
output_dir: ./output_dir
35+
export_model_dir: ./output_dir
36+
per_device_train_batch_size: 16
37+
per_device_eval_batch_size: 16
38+
max_seq_length: 256
39+
learning_rate: 5e-5
40+
classifier_dropout: 0.1
41+
weight_decay: 0.0
42+
layerwise_decay: 0.8
43+
num_train_epochs: 5
44+
logging_steps: 767
45+
save_steps: 12272
46+
eval_steps: 767
47+
device: gpu
48+
fp16: False
49+
load_best_model_at_end: Trues
50+
metric_for_best_model: eval_accuracy
51+
overwrite_output_dir: True

0 commit comments

Comments
 (0)