From f0536dc39a67c681b5a7f2f44d6d255c4b1436a2 Mon Sep 17 00:00:00 2001 From: MissPenguin Date: Thu, 18 Nov 2021 06:27:46 +0000 Subject: [PATCH 1/4] rename model name and add slim models --- .../train_infer_python.txt | 0 .../det_mv3_db.yml | 0 ...inux_gpu_normal_normal_infer_cpp_linux_gpu_cpu.txt | 0 ...el_linux_gpu_normal_normal_infer_python_jetson.txt | 0 ...model_linux_gpu_normal_normal_lite_cpp_arm_cpu.txt | 0 ...gpu_normal_normal_paddle2onnx_python_linux_cpu.txt | 0 ...gpu_normal_normal_serving_python_linux_gpu_cpu.txt | 0 .../train_infer_python.txt | 0 ...train_linux_dcu_normal_normal_infer_python_dcu.txt | 0 ...linux_gpu_fleet_amp_infer_python_linux_gpu_cpu.txt | 0 ...inux_gpu_normal_amp_infer_python_linux_gpu_cpu.txt | 0 ...ain_mac_cpu_normal_normal_infer_python_mac_cpu.txt | 0 ...gpu_normal_normal_infer_python_windows_cpu_gpu.txt | 0 ...gpu_normal_normal_paddle2onnx_python_linux_cpu.txt | 0 ...gpu_normal_normal_serving_python_linux_gpu_cpu.txt | 0 .../det_r50_vd_db.yml | 0 ...gpu_normal_normal_paddle2onnx_python_linux_cpu.txt | 0 ...gpu_normal_normal_serving_python_linux_gpu_cpu.txt | 0 .../train_infer_python.txt | 0 ...gpu_normal_normal_paddle2onnx_python_linux_cpu.txt | 0 ...gpu_normal_normal_serving_python_linux_gpu_cpu.txt | 0 .../rec_icdar15_r34_train.yml | 0 test_tipc/readme.md | 11 +++++++---- 23 files changed, 7 insertions(+), 4 deletions(-) rename test_tipc/configs/{ppocrv2_det_mobile => ch_PP-OCRv2_det}/train_infer_python.txt (100%) rename test_tipc/configs/{ppocr_det_mobile => ch_ppocr_mobile_v2.0_det}/det_mv3_db.yml (100%) rename test_tipc/configs/{ppocr_det_mobile => ch_ppocr_mobile_v2.0_det}/model_linux_gpu_normal_normal_infer_cpp_linux_gpu_cpu.txt (100%) rename test_tipc/configs/{ppocr_det_mobile => ch_ppocr_mobile_v2.0_det}/model_linux_gpu_normal_normal_infer_python_jetson.txt (100%) rename test_tipc/configs/{ppocr_det_mobile => ch_ppocr_mobile_v2.0_det}/model_linux_gpu_normal_normal_lite_cpp_arm_cpu.txt (100%) rename test_tipc/configs/{ppocr_det_mobile => ch_ppocr_mobile_v2.0_det}/model_linux_gpu_normal_normal_paddle2onnx_python_linux_cpu.txt (100%) rename test_tipc/configs/{ppocr_det_mobile => ch_ppocr_mobile_v2.0_det}/model_linux_gpu_normal_normal_serving_python_linux_gpu_cpu.txt (100%) rename test_tipc/configs/{ppocr_det_mobile => ch_ppocr_mobile_v2.0_det}/train_infer_python.txt (100%) rename test_tipc/configs/{ppocr_det_mobile => ch_ppocr_mobile_v2.0_det}/train_linux_dcu_normal_normal_infer_python_dcu.txt (100%) rename test_tipc/configs/{ppocr_det_mobile => ch_ppocr_mobile_v2.0_det}/train_linux_gpu_fleet_amp_infer_python_linux_gpu_cpu.txt (100%) rename test_tipc/configs/{ppocr_det_mobile => ch_ppocr_mobile_v2.0_det}/train_linux_gpu_normal_amp_infer_python_linux_gpu_cpu.txt (100%) rename test_tipc/configs/{ppocr_det_mobile => ch_ppocr_mobile_v2.0_det}/train_mac_cpu_normal_normal_infer_python_mac_cpu.txt (100%) rename test_tipc/configs/{ppocr_det_mobile => ch_ppocr_mobile_v2.0_det}/train_windows_gpu_normal_normal_infer_python_windows_cpu_gpu.txt (100%) rename test_tipc/configs/{ppocr_rec_mobile => ch_ppocr_mobile_v2.0_rec}/model_linux_gpu_normal_normal_paddle2onnx_python_linux_cpu.txt (100%) rename test_tipc/configs/{ppocr_rec_mobile => ch_ppocr_mobile_v2.0_rec}/model_linux_gpu_normal_normal_serving_python_linux_gpu_cpu.txt (100%) rename test_tipc/configs/{ppocr_det_server => ch_ppocr_server_v2.0_det}/det_r50_vd_db.yml (100%) rename test_tipc/configs/{ppocr_det_server => ch_ppocr_server_v2.0_det}/model_linux_gpu_normal_normal_paddle2onnx_python_linux_cpu.txt (100%) rename test_tipc/configs/{ppocr_det_server => ch_ppocr_server_v2.0_det}/model_linux_gpu_normal_normal_serving_python_linux_gpu_cpu.txt (100%) rename test_tipc/configs/{ppocr_det_server => ch_ppocr_server_v2.0_det}/train_infer_python.txt (100%) rename test_tipc/configs/{ppocr_rec_server => ch_ppocr_server_v2.0_rec}/model_linux_gpu_normal_normal_paddle2onnx_python_linux_cpu.txt (100%) rename test_tipc/configs/{ppocr_rec_server => ch_ppocr_server_v2.0_rec}/model_linux_gpu_normal_normal_serving_python_linux_gpu_cpu.txt (100%) rename test_tipc/configs/{ppocr_rec_server => ch_ppocr_server_v2.0_rec}/rec_icdar15_r34_train.yml (100%) diff --git a/test_tipc/configs/ppocrv2_det_mobile/train_infer_python.txt b/test_tipc/configs/ch_PP-OCRv2_det/train_infer_python.txt similarity index 100% rename from test_tipc/configs/ppocrv2_det_mobile/train_infer_python.txt rename to test_tipc/configs/ch_PP-OCRv2_det/train_infer_python.txt diff --git a/test_tipc/configs/ppocr_det_mobile/det_mv3_db.yml b/test_tipc/configs/ch_ppocr_mobile_v2.0_det/det_mv3_db.yml similarity index 100% rename from test_tipc/configs/ppocr_det_mobile/det_mv3_db.yml rename to test_tipc/configs/ch_ppocr_mobile_v2.0_det/det_mv3_db.yml diff --git a/test_tipc/configs/ppocr_det_mobile/model_linux_gpu_normal_normal_infer_cpp_linux_gpu_cpu.txt b/test_tipc/configs/ch_ppocr_mobile_v2.0_det/model_linux_gpu_normal_normal_infer_cpp_linux_gpu_cpu.txt similarity index 100% rename from test_tipc/configs/ppocr_det_mobile/model_linux_gpu_normal_normal_infer_cpp_linux_gpu_cpu.txt rename to test_tipc/configs/ch_ppocr_mobile_v2.0_det/model_linux_gpu_normal_normal_infer_cpp_linux_gpu_cpu.txt diff --git a/test_tipc/configs/ppocr_det_mobile/model_linux_gpu_normal_normal_infer_python_jetson.txt b/test_tipc/configs/ch_ppocr_mobile_v2.0_det/model_linux_gpu_normal_normal_infer_python_jetson.txt similarity index 100% rename from test_tipc/configs/ppocr_det_mobile/model_linux_gpu_normal_normal_infer_python_jetson.txt rename to test_tipc/configs/ch_ppocr_mobile_v2.0_det/model_linux_gpu_normal_normal_infer_python_jetson.txt diff --git a/test_tipc/configs/ppocr_det_mobile/model_linux_gpu_normal_normal_lite_cpp_arm_cpu.txt b/test_tipc/configs/ch_ppocr_mobile_v2.0_det/model_linux_gpu_normal_normal_lite_cpp_arm_cpu.txt similarity index 100% rename from test_tipc/configs/ppocr_det_mobile/model_linux_gpu_normal_normal_lite_cpp_arm_cpu.txt rename to test_tipc/configs/ch_ppocr_mobile_v2.0_det/model_linux_gpu_normal_normal_lite_cpp_arm_cpu.txt diff --git a/test_tipc/configs/ppocr_det_mobile/model_linux_gpu_normal_normal_paddle2onnx_python_linux_cpu.txt b/test_tipc/configs/ch_ppocr_mobile_v2.0_det/model_linux_gpu_normal_normal_paddle2onnx_python_linux_cpu.txt similarity index 100% rename from test_tipc/configs/ppocr_det_mobile/model_linux_gpu_normal_normal_paddle2onnx_python_linux_cpu.txt rename to test_tipc/configs/ch_ppocr_mobile_v2.0_det/model_linux_gpu_normal_normal_paddle2onnx_python_linux_cpu.txt diff --git a/test_tipc/configs/ppocr_det_mobile/model_linux_gpu_normal_normal_serving_python_linux_gpu_cpu.txt b/test_tipc/configs/ch_ppocr_mobile_v2.0_det/model_linux_gpu_normal_normal_serving_python_linux_gpu_cpu.txt similarity index 100% rename from test_tipc/configs/ppocr_det_mobile/model_linux_gpu_normal_normal_serving_python_linux_gpu_cpu.txt rename to test_tipc/configs/ch_ppocr_mobile_v2.0_det/model_linux_gpu_normal_normal_serving_python_linux_gpu_cpu.txt diff --git a/test_tipc/configs/ppocr_det_mobile/train_infer_python.txt b/test_tipc/configs/ch_ppocr_mobile_v2.0_det/train_infer_python.txt similarity index 100% rename from test_tipc/configs/ppocr_det_mobile/train_infer_python.txt rename to test_tipc/configs/ch_ppocr_mobile_v2.0_det/train_infer_python.txt diff --git a/test_tipc/configs/ppocr_det_mobile/train_linux_dcu_normal_normal_infer_python_dcu.txt b/test_tipc/configs/ch_ppocr_mobile_v2.0_det/train_linux_dcu_normal_normal_infer_python_dcu.txt similarity index 100% rename from test_tipc/configs/ppocr_det_mobile/train_linux_dcu_normal_normal_infer_python_dcu.txt rename to test_tipc/configs/ch_ppocr_mobile_v2.0_det/train_linux_dcu_normal_normal_infer_python_dcu.txt diff --git a/test_tipc/configs/ppocr_det_mobile/train_linux_gpu_fleet_amp_infer_python_linux_gpu_cpu.txt b/test_tipc/configs/ch_ppocr_mobile_v2.0_det/train_linux_gpu_fleet_amp_infer_python_linux_gpu_cpu.txt similarity index 100% rename from test_tipc/configs/ppocr_det_mobile/train_linux_gpu_fleet_amp_infer_python_linux_gpu_cpu.txt rename to test_tipc/configs/ch_ppocr_mobile_v2.0_det/train_linux_gpu_fleet_amp_infer_python_linux_gpu_cpu.txt diff --git a/test_tipc/configs/ppocr_det_mobile/train_linux_gpu_normal_amp_infer_python_linux_gpu_cpu.txt b/test_tipc/configs/ch_ppocr_mobile_v2.0_det/train_linux_gpu_normal_amp_infer_python_linux_gpu_cpu.txt similarity index 100% rename from test_tipc/configs/ppocr_det_mobile/train_linux_gpu_normal_amp_infer_python_linux_gpu_cpu.txt rename to test_tipc/configs/ch_ppocr_mobile_v2.0_det/train_linux_gpu_normal_amp_infer_python_linux_gpu_cpu.txt diff --git a/test_tipc/configs/ppocr_det_mobile/train_mac_cpu_normal_normal_infer_python_mac_cpu.txt b/test_tipc/configs/ch_ppocr_mobile_v2.0_det/train_mac_cpu_normal_normal_infer_python_mac_cpu.txt similarity index 100% rename from test_tipc/configs/ppocr_det_mobile/train_mac_cpu_normal_normal_infer_python_mac_cpu.txt rename to test_tipc/configs/ch_ppocr_mobile_v2.0_det/train_mac_cpu_normal_normal_infer_python_mac_cpu.txt diff --git a/test_tipc/configs/ppocr_det_mobile/train_windows_gpu_normal_normal_infer_python_windows_cpu_gpu.txt b/test_tipc/configs/ch_ppocr_mobile_v2.0_det/train_windows_gpu_normal_normal_infer_python_windows_cpu_gpu.txt similarity index 100% rename from test_tipc/configs/ppocr_det_mobile/train_windows_gpu_normal_normal_infer_python_windows_cpu_gpu.txt rename to test_tipc/configs/ch_ppocr_mobile_v2.0_det/train_windows_gpu_normal_normal_infer_python_windows_cpu_gpu.txt diff --git a/test_tipc/configs/ppocr_rec_mobile/model_linux_gpu_normal_normal_paddle2onnx_python_linux_cpu.txt b/test_tipc/configs/ch_ppocr_mobile_v2.0_rec/model_linux_gpu_normal_normal_paddle2onnx_python_linux_cpu.txt similarity index 100% rename from test_tipc/configs/ppocr_rec_mobile/model_linux_gpu_normal_normal_paddle2onnx_python_linux_cpu.txt rename to test_tipc/configs/ch_ppocr_mobile_v2.0_rec/model_linux_gpu_normal_normal_paddle2onnx_python_linux_cpu.txt diff --git a/test_tipc/configs/ppocr_rec_mobile/model_linux_gpu_normal_normal_serving_python_linux_gpu_cpu.txt b/test_tipc/configs/ch_ppocr_mobile_v2.0_rec/model_linux_gpu_normal_normal_serving_python_linux_gpu_cpu.txt similarity index 100% rename from test_tipc/configs/ppocr_rec_mobile/model_linux_gpu_normal_normal_serving_python_linux_gpu_cpu.txt rename to test_tipc/configs/ch_ppocr_mobile_v2.0_rec/model_linux_gpu_normal_normal_serving_python_linux_gpu_cpu.txt diff --git a/test_tipc/configs/ppocr_det_server/det_r50_vd_db.yml b/test_tipc/configs/ch_ppocr_server_v2.0_det/det_r50_vd_db.yml similarity index 100% rename from test_tipc/configs/ppocr_det_server/det_r50_vd_db.yml rename to test_tipc/configs/ch_ppocr_server_v2.0_det/det_r50_vd_db.yml diff --git a/test_tipc/configs/ppocr_det_server/model_linux_gpu_normal_normal_paddle2onnx_python_linux_cpu.txt b/test_tipc/configs/ch_ppocr_server_v2.0_det/model_linux_gpu_normal_normal_paddle2onnx_python_linux_cpu.txt similarity index 100% rename from test_tipc/configs/ppocr_det_server/model_linux_gpu_normal_normal_paddle2onnx_python_linux_cpu.txt rename to test_tipc/configs/ch_ppocr_server_v2.0_det/model_linux_gpu_normal_normal_paddle2onnx_python_linux_cpu.txt diff --git a/test_tipc/configs/ppocr_det_server/model_linux_gpu_normal_normal_serving_python_linux_gpu_cpu.txt b/test_tipc/configs/ch_ppocr_server_v2.0_det/model_linux_gpu_normal_normal_serving_python_linux_gpu_cpu.txt similarity index 100% rename from test_tipc/configs/ppocr_det_server/model_linux_gpu_normal_normal_serving_python_linux_gpu_cpu.txt rename to test_tipc/configs/ch_ppocr_server_v2.0_det/model_linux_gpu_normal_normal_serving_python_linux_gpu_cpu.txt diff --git a/test_tipc/configs/ppocr_det_server/train_infer_python.txt b/test_tipc/configs/ch_ppocr_server_v2.0_det/train_infer_python.txt similarity index 100% rename from test_tipc/configs/ppocr_det_server/train_infer_python.txt rename to test_tipc/configs/ch_ppocr_server_v2.0_det/train_infer_python.txt diff --git a/test_tipc/configs/ppocr_rec_server/model_linux_gpu_normal_normal_paddle2onnx_python_linux_cpu.txt b/test_tipc/configs/ch_ppocr_server_v2.0_rec/model_linux_gpu_normal_normal_paddle2onnx_python_linux_cpu.txt similarity index 100% rename from test_tipc/configs/ppocr_rec_server/model_linux_gpu_normal_normal_paddle2onnx_python_linux_cpu.txt rename to test_tipc/configs/ch_ppocr_server_v2.0_rec/model_linux_gpu_normal_normal_paddle2onnx_python_linux_cpu.txt diff --git a/test_tipc/configs/ppocr_rec_server/model_linux_gpu_normal_normal_serving_python_linux_gpu_cpu.txt b/test_tipc/configs/ch_ppocr_server_v2.0_rec/model_linux_gpu_normal_normal_serving_python_linux_gpu_cpu.txt similarity index 100% rename from test_tipc/configs/ppocr_rec_server/model_linux_gpu_normal_normal_serving_python_linux_gpu_cpu.txt rename to test_tipc/configs/ch_ppocr_server_v2.0_rec/model_linux_gpu_normal_normal_serving_python_linux_gpu_cpu.txt diff --git a/test_tipc/configs/ppocr_rec_server/rec_icdar15_r34_train.yml b/test_tipc/configs/ch_ppocr_server_v2.0_rec/rec_icdar15_r34_train.yml similarity index 100% rename from test_tipc/configs/ppocr_rec_server/rec_icdar15_r34_train.yml rename to test_tipc/configs/ch_ppocr_server_v2.0_rec/rec_icdar15_r34_train.yml diff --git a/test_tipc/readme.md b/test_tipc/readme.md index 9ab6f333d9..bb9f06f00c 100644 --- a/test_tipc/readme.md +++ b/test_tipc/readme.md @@ -23,11 +23,14 @@ | 算法论文 | 模型名称 | 模型类型 | 基础
训练预测 | 更多
训练方式 | 模型压缩 | 其他预测部署 | | :--- | :--- | :----: | :--------: | :---- | :---- | :---- | -| DB |ch_ppocr_mobile_v2.0_det | 检测 | 支持 | 多机多卡
混合精度 | FPGM裁剪
离线量化| Paddle Inference: C++
Paddle Serving: Python, C++
Paddle-Lite:
(1) ARM CPU(C++) | -| DB |ch_ppocr_server_v2.0_det | 检测 | 支持 | 多机多卡
混合精度 | FPGM裁剪
离线量化| Paddle Inference: C++
Paddle Serving: Python, C++
Paddle-Lite:
(1) ARM CPU(C++) | +| DB |ch_ppocr_mobile_v2.0_det | 检测 | 支持 | 多机多卡
混合精度 | - | Paddle Inference: C++
Paddle Serving: Python, C++
Paddle-Lite:
(1) ARM CPU(C++) | +| DB |ch_ppocr_mobile_v2.0_det_FPGM | 检测 | 支持 | 多机多卡
混合精度 | FPGM裁剪 | Paddle Inference: C++
Paddle Serving: Python, C++
Paddle-Lite:
(1) ARM CPU(C++) | +| DB |ch_ppocr_mobile_v2.0_det_PACT | 检测 | 支持 | 多机多卡
混合精度 | PACT量化 | Paddle Inference: C++
Paddle Serving: Python, C++
Paddle-Lite:
(1) ARM CPU(C++) | +| DB |ch_ppocr_mobile_v2.0_det_KL | 检测 | 支持 | 多机多卡
混合精度 | 离线量化| Paddle Inference: C++
Paddle Serving: Python, C++
Paddle-Lite:
(1) ARM CPU(C++) | +| DB |ch_ppocr_server_v2.0_det | 检测 | 支持 | 多机多卡
混合精度 | - | Paddle Inference: C++
Paddle Serving: Python, C++
Paddle-Lite:
(1) ARM CPU(C++) | | DB |ch_PP-OCRv2_det | 检测 | -| CRNN |ch_ppocr_mobile_v2.0_rec | 识别 | 支持 | 多机多卡
混合精度 | PACT量化
离线量化| Paddle Inference: C++
Paddle Serving: Python, C++
Paddle-Lite:
(1) ARM CPU(C++) | -| CRNN |ch_ppocr_server_v2.0_rec | 识别 | 支持 | 多机多卡
混合精度 | PACT量化
离线量化| Paddle Inference: C++
Paddle Serving: Python, C++
Paddle-Lite:
(1) ARM CPU(C++) | +| CRNN |ch_ppocr_mobile_v2.0_rec | 识别 | 支持 | 多机多卡
混合精度 | - | Paddle Inference: C++
Paddle Serving: Python, C++
Paddle-Lite:
(1) ARM CPU(C++) | +| CRNN |ch_ppocr_server_v2.0_rec | 识别 | 支持 | 多机多卡
混合精度 | - | Paddle Inference: C++
Paddle Serving: Python, C++
Paddle-Lite:
(1) ARM CPU(C++) | | CRNN |ch_PP-OCRv2_rec | 识别 | | PP-OCR |ch_ppocr_mobile_v2.0 | 检测+识别 | 支持 | 多机多卡
混合精度 | - | Paddle Inference: C++
Paddle Serving: Python, C++
Paddle-Lite:
(1) ARM CPU(C++) | | PP-OCR |ch_ppocr_server_v2.0 | 检测+识别 | 支持 | 多机多卡
混合精度 | - | Paddle Inference: C++
Paddle Serving: Python, C++
Paddle-Lite:
(1) ARM CPU(C++) | From 5346e05d0ffc27aa0dc7e277e84f87c33fc470b4 Mon Sep 17 00:00:00 2001 From: MissPenguin Date: Thu, 18 Nov 2021 06:35:37 +0000 Subject: [PATCH 2/4] fix --- test_tipc/readme.md | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/test_tipc/readme.md b/test_tipc/readme.md index bb9f06f00c..11ec82fd15 100644 --- a/test_tipc/readme.md +++ b/test_tipc/readme.md @@ -27,13 +27,13 @@ | DB |ch_ppocr_mobile_v2.0_det_FPGM | 检测 | 支持 | 多机多卡
混合精度 | FPGM裁剪 | Paddle Inference: C++
Paddle Serving: Python, C++
Paddle-Lite:
(1) ARM CPU(C++) | | DB |ch_ppocr_mobile_v2.0_det_PACT | 检测 | 支持 | 多机多卡
混合精度 | PACT量化 | Paddle Inference: C++
Paddle Serving: Python, C++
Paddle-Lite:
(1) ARM CPU(C++) | | DB |ch_ppocr_mobile_v2.0_det_KL | 检测 | 支持 | 多机多卡
混合精度 | 离线量化| Paddle Inference: C++
Paddle Serving: Python, C++
Paddle-Lite:
(1) ARM CPU(C++) | -| DB |ch_ppocr_server_v2.0_det | 检测 | 支持 | 多机多卡
混合精度 | - | Paddle Inference: C++
Paddle Serving: Python, C++
Paddle-Lite:
(1) ARM CPU(C++) | +| DB |ch_ppocr_server_v2.0_det | 检测 | 支持 | 多机多卡
混合精度 | - | Paddle Inference: C++
Paddle Serving: Python, C++ | | DB |ch_PP-OCRv2_det | 检测 | | CRNN |ch_ppocr_mobile_v2.0_rec | 识别 | 支持 | 多机多卡
混合精度 | - | Paddle Inference: C++
Paddle Serving: Python, C++
Paddle-Lite:
(1) ARM CPU(C++) | -| CRNN |ch_ppocr_server_v2.0_rec | 识别 | 支持 | 多机多卡
混合精度 | - | Paddle Inference: C++
Paddle Serving: Python, C++
Paddle-Lite:
(1) ARM CPU(C++) | +| CRNN |ch_ppocr_server_v2.0_rec | 识别 | 支持 | 多机多卡
混合精度 | - | Paddle Inference: C++
Paddle Serving: Python, C++ | | CRNN |ch_PP-OCRv2_rec | 识别 | | PP-OCR |ch_ppocr_mobile_v2.0 | 检测+识别 | 支持 | 多机多卡
混合精度 | - | Paddle Inference: C++
Paddle Serving: Python, C++
Paddle-Lite:
(1) ARM CPU(C++) | -| PP-OCR |ch_ppocr_server_v2.0 | 检测+识别 | 支持 | 多机多卡
混合精度 | - | Paddle Inference: C++
Paddle Serving: Python, C++
Paddle-Lite:
(1) ARM CPU(C++) | +| PP-OCR |ch_ppocr_server_v2.0 | 检测+识别 | 支持 | 多机多卡
混合精度 | - | Paddle Inference: C++
Paddle Serving: Python, C++ | |PP-OCRv2|ch_PP-OCRv2 | 检测+识别 | | DB |det_mv3_db_v2.0 | 检测 | | DB |det_r50_vd_db_v2.0 | 检测 | @@ -63,25 +63,24 @@ ```shell test_tipc/ ├── configs/ # 配置文件目录 - ├── ppocr_det_mobile # ppocr_det_mobile模型的测试配置文件目录 - ├── det_mv3_db.yml # 测试mobile版ppocr检测模型训练的yml文件 - ├── train_infer_python.txt.txt # 测试Linux上python训练预测（基础训练预测）的配置文件 + ├── ch_ppocr_mobile_v2.0_det # ch_ppocr_mobile_v2.0_det模型的测试配置文件目录 + ├── train_infer_python.txt # 测试Linux上python训练预测（基础训练预测）的配置文件 ├── model_linux_gpu_normal_normal_infer_cpp_linux_gpu_cpu.txt # 测试Linux上c++预测的配置文件 ├── model_linux_gpu_normal_normal_infer_python_jetson.txt # 测试Jetson上python预测的配置文件 ├── train_linux_gpu_fleet_amp_infer_python_linux_gpu_cpu.txt # 测试Linux上多机多卡、混合精度训练和python预测的配置文件 ├── ... - ├── ppocr_det_server # ppocr_det_server模型的测试配置文件目录 + ├── ch_ppocr_server_v2.0_det # ch_ppocr_server_v2.0_det模型的测试配置文件目录 ├── ... - ├── ppocr_rec_mobile # ppocr_rec_mobile模型的测试配置文件目录 + ├── ch_ppocr_mobile_v2.0_rec # ch_ppocr_mobile_v2.0_rec模型的测试配置文件目录 ├── ... - ├── ppocr_rec_server # ppocr_rec_server模型的测试配置文件目录 + ├── ch_ppocr_server_v2.0_det # ch_ppocr_server_v2.0_det模型的测试配置文件目录 ├── ... ├── ... ├── results/ # 预先保存的预测结果，用于和实际预测结果进行精读比对 - ├── python_ppocr_det_mobile_results_fp32.txt # 预存的mobile版ppocr检测模型python预测fp32精度的结果 - ├── python_ppocr_det_mobile_results_fp16.txt # 预存的mobile版ppocr检测模型python预测fp16精度的结果 - ├── cpp_ppocr_det_mobile_results_fp32.txt # 预存的mobile版ppocr检测模型c++预测的fp32精度的结果 - ├── cpp_ppocr_det_mobile_results_fp16.txt # 预存的mobile版ppocr检测模型c++预测的fp16精度的结果 + ├── python_ch_ppocr_mobile_v2.0_det_results_fp32.txt # 预存的mobile版ppocr检测模型python预测fp32精度的结果 + ├── python_ch_ppocr_mobile_v2.0_det_results_fp16.txt # 预存的mobile版ppocr检测模型python预测fp16精度的结果 + ├── cpp_ch_ppocr_mobile_v2.0_det_results_fp32.txt # 预存的mobile版ppocr检测模型c++预测的fp32精度的结果 + ├── cpp_ch_ppocr_mobile_v2.0_det_results_fp16.txt # 预存的mobile版ppocr检测模型c++预测的fp16精度的结果 ├── ... ├── prepare.sh # 完成test_*.sh运行所需要的数据和模型下载 ├── test_train_inference_python.sh # 测试python训练预测的主程序 @@ -95,9 +94,9 @@ test_tipc/ ### 配置文件命名规范 在`configs`目录下，按模型名称划分为子目录，子目录中存放所有该模型测试需要用到的配置文件，配置文件的命名遵循如下规范： -1. 基础训练预测配置简单命名为：`train_infer_python.txt`，表示**Linux环境下单机、不使用混合精度训练+python预测**，其完整命名对应`train_linux_gpu_fleet_amp_infer_python_linux_gpu_cpu.txt`，由于本配置文件使用频率较高，这里进行了名称简化。 +1. 基础训练预测配置简单命名为：`train_infer_python.txt`，表示**Linux环境下单机、不使用混合精度训练+python预测**，其完整命名对应`train_linux_gpu_normal_normal_infer_python_linux_gpu_cpu.txt`，由于本配置文件使用频率较高，这里进行了名称简化。 -2. 其他带训练配置命名格式为：`train_训练硬件环境(linux_gpu/linux_dcu/…)_是否多机(fleet/normal)_是否混合精度(amp/normal)_预测模式(infer/lite/serving/js)_语言(cpp/python/java)_预测硬件环境(linux_gpu/mac/jetson/opencl_arm_gpu/...).txt`。如，linux gpu下多机多卡+混合精度链条测试对应配置 `train_linux_gpu_fleet_amp_infer_python_linux_gpu_cpu.txt`，linux dcu下基础训练预测对应配置 `train_linux_dcu_normal_normal_infer_python_dcu.txt`。 +2. 其他带训练配置命名格式为：`train_训练硬件环境(linux_gpu/linux_dcu/…)_是否多机(fleet/normal)_是否混合精度(amp/normal)_预测模式(infer/lite/serving/js)_语言(cpp/python/java)_预测硬件环境(linux_gpu/mac/jetson/opencl_arm_gpu/...).txt`。如，linux gpu下多机多卡+混合精度链条测试对应配置 `train_linux_gpu_fleet_amp_infer_python_linux_gpu_cpu.txt`，linux dcu下基础训练预测对应配置 `train_linux_dcu_normal_normal_infer_python_linux_dcu.txt`。 3. 仅预测的配置（如serving、lite等）命名格式：`model_训练硬件环境(linux_gpu/linux_dcu/…)_是否多机(fleet/normal)_是否混合精度(amp/normal)_(infer/lite/serving/js)_语言(cpp/python/java)_预测硬件环境(linux_gpu/mac/jetson/opencl_arm_gpu/...).txt`，即，与2相比，仅第一个字段从train换为model，测试时模型直接下载获取，这里的“训练硬件环境”表示所测试的模型是在哪种环境下训练得到的。 From 6808c9f20a174429344de9b30d680bf8caa1055a Mon Sep 17 00:00:00 2001 From: MissPenguin Date: Thu, 18 Nov 2021 06:50:50 +0000 Subject: [PATCH 3/4] fix --- test_tipc/docs/test_inference_cpp.md | 6 +++--- test_tipc/readme.md | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/test_tipc/docs/test_inference_cpp.md b/test_tipc/docs/test_inference_cpp.md index 3c9599a32c..e662f4bacc 100644 --- a/test_tipc/docs/test_inference_cpp.md +++ b/test_tipc/docs/test_inference_cpp.md @@ -20,12 +20,12 @@ C++预测功能测试的主程序为`test_inference_cpp.sh`，可以测试基于 先运行`prepare.sh`准备数据和模型，然后运行`test_inference_cpp.sh`进行测试，最终在```test_tipc/output```目录下生成`cpp_infer_*.log`后缀的日志文件。 ```shell -bash test_tipc/prepare.sh ./test_tipc/configs/ppocr_det_mobile/model_linux_gpu_normal_normal_infer_cpp_linux_gpu_cpu.txt "cpp_infer" +bash test_tipc/prepare.sh ./test_tipc/configs/ch_ppocr_mobile_v2.0_det/model_linux_gpu_normal_normal_infer_cpp_linux_gpu_cpu.txt "cpp_infer" # 用法1: -bash test_tipc/test_inference_cpp.sh test_tipc/configs/ppocr_det_mobile/model_linux_gpu_normal_normal_infer_cpp_linux_gpu_cpu.txt +bash test_tipc/test_inference_cpp.sh test_tipc/configs/ch_ppocr_mobile_v2.0_det/model_linux_gpu_normal_normal_infer_cpp_linux_gpu_cpu.txt # 用法2: 指定GPU卡预测，第三个传入参数为GPU卡号 -bash test_tipc/test_inference_cpp.sh test_tipc/configs/ppocr_det_mobile/model_linux_gpu_normal_normal_infer_cpp_linux_gpu_cpu.txt '1' +bash test_tipc/test_inference_cpp.sh test_tipc/configs/ch_ppocr_mobile_v2.0_det/model_linux_gpu_normal_normal_infer_cpp_linux_gpu_cpu.txt '1' ``` 运行预测指令后，在`test_tipc/output`文件夹下自动会保存运行日志，包括以下文件： diff --git a/test_tipc/readme.md b/test_tipc/readme.md index 11ec82fd15..31635bc2a5 100644 --- a/test_tipc/readme.md +++ b/test_tipc/readme.md @@ -57,7 +57,7 @@ -## 3. 一键测试工具使用 +## 3. 测试工具简介 ### 目录介绍 ```shell @@ -77,10 +77,10 @@ test_tipc/ ├── ... ├── ... ├── results/ # 预先保存的预测结果，用于和实际预测结果进行精读比对 - ├── python_ch_ppocr_mobile_v2.0_det_results_fp32.txt # 预存的mobile版ppocr检测模型python预测fp32精度的结果 - ├── python_ch_ppocr_mobile_v2.0_det_results_fp16.txt # 预存的mobile版ppocr检测模型python预测fp16精度的结果 - ├── cpp_ch_ppocr_mobile_v2.0_det_results_fp32.txt # 预存的mobile版ppocr检测模型c++预测的fp32精度的结果 - ├── cpp_ch_ppocr_mobile_v2.0_det_results_fp16.txt # 预存的mobile版ppocr检测模型c++预测的fp16精度的结果 + ├── python_ppocr_det_mobile_results_fp32.txt # 预存的mobile版ppocr检测模型python预测fp32精度的结果 + ├── python_ppocr_det_mobile_results_fp16.txt # 预存的mobile版ppocr检测模型python预测fp16精度的结果 + ├── cpp_ppocr_det_mobile_results_fp32.txt # 预存的mobile版ppocr检测模型c++预测的fp32精度的结果 + ├── cpp_ppocr_det_mobile_results_fp16.txt # 预存的mobile版ppocr检测模型c++预测的fp16精度的结果 ├── ... ├── prepare.sh # 完成test_*.sh运行所需要的数据和模型下载 ├── test_train_inference_python.sh # 测试python训练预测的主程序 @@ -92,7 +92,7 @@ test_tipc/ ``` ### 配置文件命名规范 -在`configs`目录下，按模型名称划分为子目录，子目录中存放所有该模型测试需要用到的配置文件，配置文件的命名遵循如下规范： +在`configs`目录下，**按模型名称划分为子目录**，子目录中存放所有该模型测试需要用到的配置文件，配置文件的命名遵循如下规范： 1. 基础训练预测配置简单命名为：`train_infer_python.txt`，表示**Linux环境下单机、不使用混合精度训练+python预测**，其完整命名对应`train_linux_gpu_normal_normal_infer_python_linux_gpu_cpu.txt`，由于本配置文件使用频率较高，这里进行了名称简化。 @@ -100,10 +100,10 @@ test_tipc/ 3. 仅预测的配置（如serving、lite等）命名格式：`model_训练硬件环境(linux_gpu/linux_dcu/…)_是否多机(fleet/normal)_是否混合精度(amp/normal)_(infer/lite/serving/js)_语言(cpp/python/java)_预测硬件环境(linux_gpu/mac/jetson/opencl_arm_gpu/...).txt`，即，与2相比，仅第一个字段从train换为model，测试时模型直接下载获取，这里的“训练硬件环境”表示所测试的模型是在哪种环境下训练得到的。 -根据上述命名规范，可以直接从配置文件名看出对应的测试场景和功能。 +根据上述命名规范，可以直接从子目录名称和配置文件名找到需要测试的场景和功能对应的配置文件。 -### 测试流程 -使用本工具，可以测试不同功能的支持情况，以及预测结果是否对齐，测试流程如下： +### 测试流程概述 +使用本工具，可以测试不同功能的支持情况，以及预测结果是否对齐，测试流程概括如下：
@@ -120,7 +120,7 @@ test_tipc/ - `test_paddle2onnx.sh`：测试Paddle2ONNX的模型转化功能，并验证正确性。 -#### 更多教程 +### 更多教程 各功能测试中涉及混合精度、裁剪、量化等训练相关，及mkldnn、Tensorrt等多种预测相关参数配置，请点击下方相应链接了解更多细节和使用教程： [test_train_inference_python 使用](docs/test_train_inference_python.md) [test_inference_cpp 使用](docs/test_inference_cpp.md) From eb8bc011d3cc36cfb169cf59e50910edae10b2a4 Mon Sep 17 00:00:00 2001 From: MissPenguin Date: Thu, 18 Nov 2021 07:01:50 +0000 Subject: [PATCH 4/4] fix --- .../model_linux_gpu_normal_normal_lite_cpp_arm_cpu.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 test_tipc/configs/ppocr_det_mobile/model_linux_gpu_normal_normal_lite_cpp_arm_cpu.txt diff --git a/test_tipc/configs/ppocr_det_mobile/model_linux_gpu_normal_normal_lite_cpp_arm_cpu.txt b/test_tipc/configs/ppocr_det_mobile/model_linux_gpu_normal_normal_lite_cpp_arm_cpu.txt new file mode 100644 index 0000000000..e69de29bb2