diff --git a/PTDN/common_func.sh b/test_tipc/common_func.sh similarity index 100% rename from PTDN/common_func.sh rename to test_tipc/common_func.sh diff --git a/PTDN/compare_results.py b/test_tipc/compare_results.py similarity index 100% rename from PTDN/compare_results.py rename to test_tipc/compare_results.py diff --git a/PTDN/configs/det_mv3_db.yml b/test_tipc/configs/det_mv3_db.yml similarity index 100% rename from PTDN/configs/det_mv3_db.yml rename to test_tipc/configs/det_mv3_db.yml diff --git a/PTDN/configs/det_r50_vd_db.yml b/test_tipc/configs/det_r50_vd_db.yml similarity index 100% rename from PTDN/configs/det_r50_vd_db.yml rename to test_tipc/configs/det_r50_vd_db.yml diff --git a/PTDN/configs/ppocr_det_mobile_params.txt b/test_tipc/configs/ppocr_det_mobile_params.txt similarity index 100% rename from PTDN/configs/ppocr_det_mobile_params.txt rename to test_tipc/configs/ppocr_det_mobile_params.txt diff --git a/PTDN/configs/ppocr_det_server_params.txt b/test_tipc/configs/ppocr_det_server_params.txt similarity index 100% rename from PTDN/configs/ppocr_det_server_params.txt rename to test_tipc/configs/ppocr_det_server_params.txt diff --git a/PTDN/configs/ppocr_rec_mobile_params.txt b/test_tipc/configs/ppocr_rec_mobile_params.txt similarity index 100% rename from PTDN/configs/ppocr_rec_mobile_params.txt rename to test_tipc/configs/ppocr_rec_mobile_params.txt diff --git a/PTDN/configs/ppocr_rec_server_params.txt b/test_tipc/configs/ppocr_rec_server_params.txt similarity index 100% rename from PTDN/configs/ppocr_rec_server_params.txt rename to test_tipc/configs/ppocr_rec_server_params.txt diff --git a/PTDN/configs/ppocr_sys_mobile_params.txt b/test_tipc/configs/ppocr_sys_mobile_params.txt similarity index 100% rename from PTDN/configs/ppocr_sys_mobile_params.txt rename to test_tipc/configs/ppocr_sys_mobile_params.txt diff --git a/PTDN/configs/ppocr_sys_server_params.txt b/test_tipc/configs/ppocr_sys_server_params.txt similarity index 100% rename from PTDN/configs/ppocr_sys_server_params.txt rename to test_tipc/configs/ppocr_sys_server_params.txt diff --git a/PTDN/configs/rec_icdar15_r34_train.yml b/test_tipc/configs/rec_icdar15_r34_train.yml similarity index 100% rename from PTDN/configs/rec_icdar15_r34_train.yml rename to test_tipc/configs/rec_icdar15_r34_train.yml diff --git a/PTDN/docs/compare_cpp_right.png b/test_tipc/docs/compare_cpp_right.png similarity index 100% rename from PTDN/docs/compare_cpp_right.png rename to test_tipc/docs/compare_cpp_right.png diff --git a/PTDN/docs/compare_cpp_wrong.png b/test_tipc/docs/compare_cpp_wrong.png similarity index 100% rename from PTDN/docs/compare_cpp_wrong.png rename to test_tipc/docs/compare_cpp_wrong.png diff --git a/PTDN/docs/compare_right.png b/test_tipc/docs/compare_right.png similarity index 100% rename from PTDN/docs/compare_right.png rename to test_tipc/docs/compare_right.png diff --git a/PTDN/docs/compare_wrong.png b/test_tipc/docs/compare_wrong.png similarity index 100% rename from PTDN/docs/compare_wrong.png rename to test_tipc/docs/compare_wrong.png diff --git a/PTDN/docs/guide.png b/test_tipc/docs/guide.png similarity index 100% rename from PTDN/docs/guide.png rename to test_tipc/docs/guide.png diff --git a/PTDN/docs/install.md b/test_tipc/docs/install.md similarity index 100% rename from PTDN/docs/install.md rename to test_tipc/docs/install.md diff --git a/PTDN/docs/test.png b/test_tipc/docs/test.png similarity index 100% rename from PTDN/docs/test.png rename to test_tipc/docs/test.png diff --git a/PTDN/docs/test_inference_cpp.md b/test_tipc/docs/test_inference_cpp.md similarity index 69% rename from PTDN/docs/test_inference_cpp.md rename to test_tipc/docs/test_inference_cpp.md index 25db1b5b6b1aa101a8f8969cfae3efc02e542971..24655d96ba1acaadd489019ec260999c981107de 100644 --- a/PTDN/docs/test_inference_cpp.md +++ b/test_tipc/docs/test_inference_cpp.md @@ -15,15 +15,15 @@ C++预测功能测试的主程序为`test_inference_cpp.sh`,可以测试基于 ## 2. 测试流程 ### 2.1 功能测试 -先运行`prepare.sh`准备数据和模型,然后运行`test_inference_cpp.sh`进行测试,最终在```PTDN/output```目录下生成`cpp_infer_*.log`后缀的日志文件。 +先运行`prepare.sh`准备数据和模型,然后运行`test_inference_cpp.sh`进行测试,最终在```test_tipc/output```目录下生成`cpp_infer_*.log`后缀的日志文件。 ```shell -bash PTDN/prepare.sh ./PTDN/configs/ppocr_det_mobile_params.txt "cpp_infer" +bash test_tipc/prepare.sh ./test_tipc/configs/ppocr_det_mobile_params.txt "cpp_infer" # 用法1: -bash PTDN/test_inference_cpp.sh ./PTDN/configs/ppocr_det_mobile_params.txt +bash test_tipc/test_inference_cpp.sh ./test_tipc/configs/ppocr_det_mobile_params.txt # 用法2: 指定GPU卡预测,第三个传入参数为GPU卡号 -bash PTDN/test_inference_cpp.sh ./PTDN/configs/ppocr_det_mobile_params.txt '1' +bash test_tipc/test_inference_cpp.sh ./test_tipc/configs/ppocr_det_mobile_params.txt '1' ``` @@ -37,12 +37,12 @@ bash PTDN/test_inference_cpp.sh ./PTDN/configs/ppocr_det_mobile_params.txt '1' #### 使用方式 运行命令: ```shell -python3.7 PTDN/compare_results.py --gt_file=./PTDN/results/cpp_*.txt --log_file=./PTDN/output/cpp_*.log --atol=1e-3 --rtol=1e-3 +python3.7 test_tipc/compare_results.py --gt_file=./test_tipc/results/cpp_*.txt --log_file=./test_tipc/output/cpp_*.log --atol=1e-3 --rtol=1e-3 ``` 参数介绍: -- gt_file: 指向事先保存好的预测结果路径,支持*.txt 结尾,会自动索引*.txt格式的文件,文件默认保存在PTDN/result/ 文件夹下 -- log_file: 指向运行PTDN/test_inference_cpp.sh 脚本的infer模式保存的预测日志,预测日志中打印的有预测结果,比如:文本框,预测文本,类别等等,同样支持cpp_infer_*.log格式传入 +- gt_file: 指向事先保存好的预测结果路径,支持*.txt 结尾,会自动索引*.txt格式的文件,文件默认保存在test_tipc/result/ 文件夹下 +- log_file: 指向运行test_tipc/test_inference_cpp.sh 脚本的infer模式保存的预测日志,预测日志中打印的有预测结果,比如:文本框,预测文本,类别等等,同样支持cpp_infer_*.log格式传入 - atol: 设置的绝对误差 - rtol: 设置的相对误差 diff --git a/PTDN/docs/test_serving.md b/test_tipc/docs/test_serving.md similarity index 87% rename from PTDN/docs/test_serving.md rename to test_tipc/docs/test_serving.md index c6b35630392249ea969585c69a9e4c3d35f1cf52..fb0848bfb5e37e4b0af39fa9bb2b13b4046c9a50 100644 --- a/PTDN/docs/test_serving.md +++ b/test_tipc/docs/test_serving.md @@ -15,18 +15,18 @@ PaddleServing预测功能测试的主程序为`test_serving.sh`,可以测试 ## 2. 测试流程 ### 2.1 功能测试 -先运行`prepare.sh`准备数据和模型,然后运行`test_serving.sh`进行测试,最终在```PTDN/output```目录下生成`serving_infer_*.log`后缀的日志文件。 +先运行`prepare.sh`准备数据和模型,然后运行`test_serving.sh`进行测试,最终在```test_tipc/output```目录下生成`serving_infer_*.log`后缀的日志文件。 ```shell -bash PTDN/prepare.sh ./PTDN/configs/ppocr_det_mobile_params.txt "serving_infer" +bash test_tipc/prepare.sh ./test_tipc/configs/ppocr_det_mobile_params.txt "serving_infer" # 用法: -bash PTND/test_serving.sh ./PTDN/configs/ppocr_det_mobile_params.txt +bash test_tipc/test_serving.sh ./test_tipc/configs/ppocr_det_mobile_params.txt ``` #### 运行结果 -各测试的运行情况会打印在 `PTDN/output/results_serving.log` 中: +各测试的运行情况会打印在 `test_tipc/output/results_serving.log` 中: 运行成功时会输出: ``` @@ -44,7 +44,7 @@ Run failed with command - xxxxx ... ``` -详细的预测结果会存在 PTDN/output/ 文件夹下,例如`server_infer_gpu_usetrt_True_precision_fp16_batchsize_1.log`中会返回检测框的坐标: +详细的预测结果会存在 test_tipc/output/ 文件夹下,例如`server_infer_gpu_usetrt_True_precision_fp16_batchsize_1.log`中会返回检测框的坐标: ``` {'err_no': 0, 'err_msg': '', 'key': ['dt_boxes'], 'value': ['[[[ 78. 642.]\n [409. 640.]\n [409. 657.]\n diff --git a/PTDN/docs/test_train_inference_python.md b/test_tipc/docs/test_train_inference_python.md similarity index 73% rename from PTDN/docs/test_train_inference_python.md rename to test_tipc/docs/test_train_inference_python.md index 89885ddfa3c1f36a120d713e39689767f8fc6342..fa14863fdad02dcb9b69f45494cc18b24ceaf36f 100644 --- a/PTDN/docs/test_train_inference_python.md +++ b/test_tipc/docs/test_train_inference_python.md @@ -46,42 +46,42 @@ ### 2.2 功能测试 -先运行`prepare.sh`准备数据和模型,然后运行`test_train_inference_python.sh`进行测试,最终在```PTDN/output```目录下生成`python_infer_*.log`格式的日志文件。 +先运行`prepare.sh`准备数据和模型,然后运行`test_train_inference_python.sh`进行测试,最终在```test_tipc/output```目录下生成`python_infer_*.log`格式的日志文件。 `test_train_inference_python.sh`包含5种运行模式,每种模式的运行数据不同,分别用于测试速度和精度,分别是: - 模式1:lite_train_infer,使用少量数据训练,用于快速验证训练到预测的走通流程,不验证精度和速度; ```shell -bash PTDN/prepare.sh ./PTDN/configs/ppocr_det_mobile_params.txt 'lite_train_infer' -bash PTDN/test_train_inference_python.sh ./PTDN/configs/ppocr_det_mobile_params.txt 'lite_train_infer' +bash test_tipc/prepare.sh ./test_tipc/configs/ppocr_det_mobile_params.txt 'lite_train_infer' +bash test_tipc/test_train_inference_python.sh ./test_tipc/configs/ppocr_det_mobile_params.txt 'lite_train_infer' ``` - 模式2:whole_infer,使用少量数据训练,一定量数据预测,用于验证训练后的模型执行预测,预测速度是否合理; ```shell -bash PTDN/prepare.sh ./PTDN/configs/ppocr_det_mobile_params.txt 'whole_infer' -bash PTDN/test_train_inference_python.sh ./PTDN/configs/ppocr_det_mobile_params.txt 'whole_infer' +bash test_tipc/prepare.sh ./test_tipc/configs/ppocr_det_mobile_params.txt 'whole_infer' +bash test_tipc/test_train_inference_python.sh ./test_tipc/configs/ppocr_det_mobile_params.txt 'whole_infer' ``` - 模式3:infer,不训练,全量数据预测,走通开源模型评估、动转静,检查inference model预测时间和精度; ```shell -bash PTDN/prepare.sh ./PTDN/configs/ppocr_det_mobile_params.txt 'infer' +bash test_tipc/prepare.sh ./test_tipc/configs/ppocr_det_mobile_params.txt 'infer' # 用法1: -bash PTDN/test_train_inference_python.sh ./PTDN/configs/ppocr_det_mobile_params.txt 'infer' +bash test_tipc/test_train_inference_python.sh ./test_tipc/configs/ppocr_det_mobile_params.txt 'infer' # 用法2: 指定GPU卡预测,第三个传入参数为GPU卡号 -bash PTDN/test_train_inference_python.sh ./PTDN/configs/ppocr_det_mobile_params.txt 'infer' '1' +bash test_tipc/test_train_inference_python.sh ./test_tipc/configs/ppocr_det_mobile_params.txt 'infer' '1' ``` - 模式4:whole_train_infer,CE: 全量数据训练,全量数据预测,验证模型训练精度,预测精度,预测速度; ```shell -bash PTDN/prepare.sh ./PTDN/configs/ppocr_det_mobile_params.txt 'whole_train_infer' -bash PTDN/test_train_inference_python.sh ./PTDN/configs/ppocr_det_mobile_params.txt 'whole_train_infer' +bash test_tipc/prepare.sh ./test_tipc/configs/ppocr_det_mobile_params.txt 'whole_train_infer' +bash test_tipc/test_train_inference_python.sh ./test_tipc/configs/ppocr_det_mobile_params.txt 'whole_train_infer' ``` - 模式5:klquant_infer,测试离线量化; ```shell -bash PTDN/prepare.sh ./PTDN/configs/ppocr_det_mobile_params.txt 'klquant_infer' -bash PTDN/test_train_inference_python.sh PTDN/configs/ppocr_det_mobile_params.txt 'klquant_infer' +bash test_tipc/prepare.sh ./test_tipc/configs/ppocr_det_mobile_params.txt 'klquant_infer' +bash test_tipc/test_train_inference_python.sh test_tipc/configs/ppocr_det_mobile_params.txt 'klquant_infer' ``` @@ -95,12 +95,12 @@ bash PTDN/test_train_inference_python.sh PTDN/configs/ppocr_det_mobile_params.tx #### 使用方式 运行命令: ```shell -python3.7 PTDN/compare_results.py --gt_file=./PTDN/results/python_*.txt --log_file=./PTDN/output/python_*.log --atol=1e-3 --rtol=1e-3 +python3.7 test_tipc/compare_results.py --gt_file=./test_tipc/results/python_*.txt --log_file=./test_tipc/output/python_*.log --atol=1e-3 --rtol=1e-3 ``` 参数介绍: -- gt_file: 指向事先保存好的预测结果路径,支持*.txt 结尾,会自动索引*.txt格式的文件,文件默认保存在PTDN/result/ 文件夹下 -- log_file: 指向运行PTDN/test_train_inference_python.sh 脚本的infer模式保存的预测日志,预测日志中打印的有预测结果,比如:文本框,预测文本,类别等等,同样支持python_infer_*.log格式传入 +- gt_file: 指向事先保存好的预测结果路径,支持*.txt 结尾,会自动索引*.txt格式的文件,文件默认保存在test_tipc/result/ 文件夹下 +- log_file: 指向运行test_tipc/test_train_inference_python.sh 脚本的infer模式保存的预测日志,预测日志中打印的有预测结果,比如:文本框,预测文本,类别等等,同样支持python_infer_*.log格式传入 - atol: 设置的绝对误差 - rtol: 设置的相对误差 diff --git a/PTDN/prepare.sh b/test_tipc/prepare.sh similarity index 100% rename from PTDN/prepare.sh rename to test_tipc/prepare.sh diff --git a/PTDN/readme.md b/test_tipc/readme.md similarity index 96% rename from PTDN/readme.md rename to test_tipc/readme.md index 71e888a2fe05a0a6d700b40250dd80d5f6d041e0..e2bf6d9e9c927aee5eb802a68bde89f7bd2a641c 100644 --- a/PTDN/readme.md +++ b/test_tipc/readme.md @@ -1,9 +1,9 @@ -# 推理部署导航 +# 飞桨训推一体认证 ## 1. 简介 -飞桨除了基本的模型训练和预测,还提供了支持多端多平台的高性能推理部署工具。本文档提供了PaddleOCR中所有模型的推理部署导航PTDN(Paddle Train Deploy Navigation),方便用户查阅每种模型的推理部署打通情况,并可以进行一键测试。 +飞桨除了基本的模型训练和预测,还提供了支持多端多平台的高性能推理部署工具。本文档提供了PaddleOCR中所有模型的飞桨训推一体认证 (Training and Inference Pipeline Certification(TIPC)) 信息和测试工具,方便用户查阅每种模型的训练推理部署打通情况,并可以进行一键测试。
@@ -58,7 +58,7 @@ ### 目录介绍 ```shell -PTDN/ +test_tipc/ ├── configs/ # 配置文件目录 ├── det_mv3_db.yml # 测试mobile版ppocr检测模型训练的yml文件 ├── det_r50_vd_db.yml # 测试server版ppocr检测模型训练的yml文件 diff --git a/PTDN/results/cpp_ppocr_det_mobile_results_fp16.txt b/test_tipc/results/cpp_ppocr_det_mobile_results_fp16.txt similarity index 100% rename from PTDN/results/cpp_ppocr_det_mobile_results_fp16.txt rename to test_tipc/results/cpp_ppocr_det_mobile_results_fp16.txt diff --git a/PTDN/results/cpp_ppocr_det_mobile_results_fp32.txt b/test_tipc/results/cpp_ppocr_det_mobile_results_fp32.txt similarity index 100% rename from PTDN/results/cpp_ppocr_det_mobile_results_fp32.txt rename to test_tipc/results/cpp_ppocr_det_mobile_results_fp32.txt diff --git a/PTDN/results/python_ppocr_det_mobile_results_fp16.txt b/test_tipc/results/python_ppocr_det_mobile_results_fp16.txt similarity index 100% rename from PTDN/results/python_ppocr_det_mobile_results_fp16.txt rename to test_tipc/results/python_ppocr_det_mobile_results_fp16.txt diff --git a/PTDN/results/python_ppocr_det_mobile_results_fp32.txt b/test_tipc/results/python_ppocr_det_mobile_results_fp32.txt similarity index 100% rename from PTDN/results/python_ppocr_det_mobile_results_fp32.txt rename to test_tipc/results/python_ppocr_det_mobile_results_fp32.txt diff --git a/PTDN/test_inference_cpp.sh b/test_tipc/test_inference_cpp.sh similarity index 100% rename from PTDN/test_inference_cpp.sh rename to test_tipc/test_inference_cpp.sh diff --git a/PTDN/test_lite.sh b/test_tipc/test_lite.sh similarity index 100% rename from PTDN/test_lite.sh rename to test_tipc/test_lite.sh diff --git a/PTDN/test_serving.sh b/test_tipc/test_serving.sh similarity index 100% rename from PTDN/test_serving.sh rename to test_tipc/test_serving.sh diff --git a/PTDN/test_train_inference_python.sh b/test_tipc/test_train_inference_python.sh similarity index 100% rename from PTDN/test_train_inference_python.sh rename to test_tipc/test_train_inference_python.sh