Merge pull request #4635 from MissPenguin/dygraph

[TIPC] remove old parmas files

test_tipc/configs/ppocr_det_mobile_params.txt

-===========================train_params===========================
-model_name:ocr_det
-python:python3.7
-gpu_list:0|0,1
-Global.use_gpu:True|True
-Global.auto_cast:null
-Global.epoch_num:lite_train_lite_infer=1|whole_train_whole_infer=300
-Global.save_model_dir:./output/
-Train.loader.batch_size_per_card:lite_train_lite_infer=2|whole_train_whole_infer=4
-Global.pretrained_model:null
-train_model_name:latest
-train_infer_img_dir:./train_data/icdar2015/text_localization/ch4_test_images/
-null:null
-##
-trainer:norm_train|pact_train|fpgm_train
-norm_train:tools/train.py -c test_tipc/configs/det_mv3_db.yml -o Global.pretrained_model=./pretrain_models/MobileNetV3_large_x0_5_pretrained
-pact_train:deploy/slim/quantization/quant.py -c test_tipc/configs/det_mv3_db.yml -o
-fpgm_train:deploy/slim/prune/sensitivity_anal.py -c test_tipc/configs/det_mv3_db.yml -o Global.pretrained_model=./pretrain_models/det_mv3_db_v2.0_train/best_accuracy
-distill_train:null
-null:null
-null:null
-##
-===========================eval_params=========================== 
-eval:null
-null:null
-##
-===========================infer_params===========================
-Global.save_inference_dir:./output/
-Global.pretrained_model:
-norm_export:tools/export_model.py -c test_tipc/configs/det_mv3_db.yml -o 
-quant_export:deploy/slim/quantization/export_model.py -c test_tipc/configs/det_mv3_db.yml -o 
-fpgm_export:deploy/slim/prune/export_prune_model.py -c test_tipc/configs/det_mv3_db.yml -o 
-distill_export:null
-export1:null
-export2:null
-inference_dir:null
-train_model:./inference/ch_ppocr_mobile_v2.0_det_train/best_accuracy
-infer_export:tools/export_model.py -c configs/det/ch_ppocr_v2.0/ch_det_mv3_db_v2.0.yml -o
-infer_quant:False
-inference:tools/infer/predict_det.py
---use_gpu:True|False
---enable_mkldnn:True|False
---cpu_threads:1|6
---rec_batch_num:1
---use_tensorrt:False|True
---precision:fp32|fp16|int8
---det_model_dir:
---image_dir:./inference/ch_det_data_50/all-sum-510/
-null:null
---benchmark:True
-null:null
-===========================cpp_infer_params===========================
-use_opencv:True
-infer_model:./inference/ch_ppocr_mobile_v2.0_det_infer/
-infer_quant:False
-inference:./deploy/cpp_infer/build/ppocr det
---use_gpu:True|False
---enable_mkldnn:True|False
---cpu_threads:1|6
---rec_batch_num:1
---use_tensorrt:False|True
---precision:fp32|fp16
---det_model_dir:
---image_dir:./inference/ch_det_data_50/all-sum-510/
-null:null
---benchmark:True
-===========================serving_params===========================
-model_name:ocr_det
-python:python3.7
-trans_model:-m paddle_serving_client.convert
---dirname:./inference/ch_ppocr_mobile_v2.0_det_infer/
---model_filename:inference.pdmodel
---params_filename:inference.pdiparams
---serving_server:./deploy/pdserving/ppocr_det_mobile_2.0_serving/
---serving_client:./deploy/pdserving/ppocr_det_mobile_2.0_client/
-serving_dir:./deploy/pdserving
-web_service:web_service_det.py --config=config.yml --opt op.det.concurrency=1
-op.det.local_service_conf.devices:null|0
-op.det.local_service_conf.use_mkldnn:True|False
-op.det.local_service_conf.thread_num:1|6
-op.det.local_service_conf.use_trt:False|True
-op.det.local_service_conf.precision:fp32|fp16|int8
-pipline:pipeline_rpc_client.py|pipeline_http_client.py
---image_dir:../../doc/imgs
-===========================kl_quant_params===========================
-infer_model:./inference/ch_ppocr_mobile_v2.0_det_infer/
-infer_export:tools/export_model.py -c configs/det/ch_ppocr_v2.0/ch_det_mv3_db_v2.0.yml -o
-infer_quant:True
-inference:tools/infer/predict_det.py
---use_gpu:True|False
---enable_mkldnn:True|False
---cpu_threads:1|6
---rec_batch_num:1
---use_tensorrt:False|True
---precision:int8
---det_model_dir:
---image_dir:./inference/ch_det_data_50/all-sum-510/
-null:null
---benchmark:True
-null:null
-null:null
-===========================lite_params===========================
-inference:./ocr_db_crnn det
-infer_model:./models/ch_ppocr_mobile_v2.0_det_opt.nb|./models/ch_ppocr_mobile_v2.0_det_slim_opt.nb
---cpu_threads:1|4
---batch_size:1
---power_mode:LITE_POWER_HIGH|LITE_POWER_LOW
---image_dir:./test_data/icdar2015_lite/text_localization/ch4_test_images/|./test_data/icdar2015_lite/text_localization/ch4_test_images/img_233.jpg
---config_dir:./config.txt
---rec_dict_dir:./ppocr_keys_v1.txt
---benchmark:True
-===========================paddle2onnx_params===========================
-2onnx: paddle2onnx 
---model_dir:./inference/ch_ppocr_mobile_v2.0_det_infer/
---model_filename:inference.pdmodel
---params_filename:inference.pdiparams
---save_file:./inference/det_mobile_onnx/model.onnx
---opset_version:10 
---enable_onnx_checker:True
-inference:tools/infer/predict_det.py
---use_gpu:False
---det_model_dir:
---image_dir:./inference/ch_det_data_50/all-sum-510/
\ No newline at end of file

test_tipc/configs/ppocr_det_server_params.txt

-===========================train_params===========================
-model_name:ocr_server_det
-python:python3.7
-gpu_list:0|0,1
-Global.use_gpu:True|True
-Global.auto_cast:null
-Global.epoch_num:lite_train_infer=2|whole_train_infer=300
-Global.save_model_dir:./output/
-Train.loader.batch_size_per_card:lite_train_infer=2|whole_train_infer=4
-Global.pretrained_model:null
-train_model_name:latest
-train_infer_img_dir:./train_data/icdar2015/text_localization/ch4_test_images/
-null:null
-##
-trainer:norm_train|pact_train|fpgm_export
-norm_train:tools/train.py -c tests/configs/det_r50_vd_db.yml -o 
-quant_export:deploy/slim/quantization/export_model.py -c tests/configs/det_r50_vd_db.yml -o 
-fpgm_export:deploy/slim/prune/export_prune_model.py -c tests/configs/det_r50_vd_db.yml -o 
-distill_train:null
-null:null
-null:null
-##
-===========================eval_params=========================== 
-eval:tools/eval.py -c tests/configs/det_r50_vd_db.yml -o
-null:null
-##
-===========================infer_params===========================
-Global.save_inference_dir:./output/
-Global.pretrained_model:
-norm_export:tools/export_model.py -c tests/configs/det_r50_vd_db.yml -o 
-quant_export:null 
-fpgm_export:null
-distill_export:null
-export1:null
-export2:null
-##
-train_model:./inference/ch_ppocr_server_v2.0_det_train/best_accuracy
-infer_export:tools/export_model.py -c configs/det/ch_ppocr_v2.0/ch_det_res18_db_v2.0.yml -o
-infer_quant:False
-inference:tools/infer/predict_det.py
---use_gpu:True|False
---enable_mkldnn:True|False
---cpu_threads:1|6
---rec_batch_num:1
---use_tensorrt:False|True
---precision:fp32|fp16|int8
---det_model_dir:
---image_dir:./inference/ch_det_data_50/all-sum-510/
---save_log_path:null
---benchmark:True
-null:null
-===========================cpp_infer_params===========================
-use_opencv:True
-infer_model:./inference/ch_ppocr_server_v2.0_det_infer/
-infer_quant:False
-inference:./deploy/cpp_infer/build/ppocr det
---use_gpu:True|False
---enable_mkldnn:True|False
---cpu_threads:1|6
---rec_batch_num:1
---use_tensorrt:False|True
---precision:fp32|fp16
---det_model_dir:
---image_dir:./inference/ch_det_data_50/all-sum-510/
-null:null
---benchmark:True
-===========================serving_params===========================
-model_name:ocr_det_server
-python:python3.7
-trans_model:-m paddle_serving_client.convert
---dirname:./inference/ch_ppocr_server_v2.0_det_infer/
---model_filename:inference.pdmodel
---params_filename:inference.pdiparams
---serving_server:./deploy/pdserving/ppocr_det_mobile_2.0_serving/
---serving_client:./deploy/pdserving/ppocr_det_mobile_2.0_client/
-serving_dir:./deploy/pdserving
-web_service:web_service_det.py --config=config.yml --opt op.det.concurrency=1
-op.det.local_service_conf.devices:null|0
-op.det.local_service_conf.use_mkldnn:True|False
-op.det.local_service_conf.thread_num:1|6
-op.det.local_service_conf.use_trt:False|True
-op.det.local_service_conf.precision:fp32|fp16|int8
-pipline:pipeline_http_client.py|pipeline_rpc_client.py
---image_dir=../../doc/imgs

test_tipc/configs/ppocr_rec_mobile_params.txt

-===========================train_params===========================
-model_name:ocr_rec
-python:python3.7
-gpu_list:0|0,1
-Global.use_gpu:True|True
-Global.auto_cast:null
-Global.epoch_num:lite_train_infer=2|whole_train_infer=300
-Global.save_model_dir:./output/
-Train.loader.batch_size_per_card:lite_train_infer=128|whole_train_infer=128
-Global.pretrained_model:null
-train_model_name:latest
-train_infer_img_dir:./inference/rec_inference
-null:null
-##
-trainer:norm_train|pact_train
-norm_train:tools/train.py -c configs/rec/rec_icdar15_train.yml -o
-pact_train:deploy/slim/quantization/quant.py -c configs/rec/rec_icdar15_train.yml -o
-fpgm_train:null
-distill_train:null
-null:null
-null:null
-##
-===========================eval_params===========================
-eval:tools/eval.py -c configs/rec/rec_icdar15_train.yml -o
-null:null
-##
-===========================infer_params===========================
-Global.save_inference_dir:./output/
-Global.pretrained_model:
-norm_export:tools/export_model.py -c configs/rec/rec_icdar15_train.yml -o
-quant_export:deploy/slim/quantization/export_model.py -c configs/rec/rec_icdar15_train.yml -o
-fpgm_export:null
-distill_export:null
-export1:null
-export2:null
-##
-infer_model:./inference/ch_ppocr_mobile_v2.0_rec_infer/
-infer_export:null
-infer_quant:False
-inference:tools/infer/predict_rec.py
---use_gpu:True|False
---enable_mkldnn:True|False
---cpu_threads:1|6
---rec_batch_num:1|6
---use_tensorrt:True|False
---precision:fp32|fp16|int8
---rec_model_dir:
---image_dir:./inference/rec_inference
---save_log_path:./test/output/
---benchmark:True
-null:null
-===========================cpp_infer_params===========================
-use_opencv:True
-infer_model:./inference/ch_ppocr_mobile_v2.0_rec_infer/
-infer_quant:False
-inference:./deploy/cpp_infer/build/ppocr rec
---use_gpu:True|False
---enable_mkldnn:True|False
---cpu_threads:1|6
---rec_batch_num:1
---use_tensorrt:False|True
---precision:fp32|fp16
---rec_model_dir:
---image_dir:./inference/rec_inference/
-null:null
---benchmark:True
-===========================serving_params===========================
-model_name:ocr_rec
-python:python3.7
-trans_model:-m paddle_serving_client.convert
---dirname:./inference/ch_ppocr_mobile_v2.0_rec_infer/
---model_filename:inference.pdmodel
---params_filename:inference.pdiparams
---serving_server:./deploy/pdserving/ppocr_rec_mobile_2.0_serving/
---serving_client:./deploy/pdserving/ppocr_rec_mobile_2.0_client/
-serving_dir:./deploy/pdserving
-web_service:web_service_rec.py --config=config.yml --opt op.rec.concurrency=1
-op.rec.local_service_conf.devices:null|0
-op.rec.local_service_conf.use_mkldnn:True|False
-op.rec.local_service_conf.thread_num:1|6
-op.rec.local_service_conf.use_trt:False|True
-op.rec.local_service_conf.precision:fp32|fp16|int8
-pipline:pipeline_http_client.py|pipeline_rpc_client.py
---image_dir=../../doc/imgs_words_en

test_tipc/configs/ppocr_rec_server_params.txt

-===========================train_params===========================
-model_name:ocr_server_rec
-python:python3.7
-gpu_list:0|0,1
-Global.use_gpu:True|True
-Global.auto_cast:null
-Global.epoch_num:lite_train_infer=2|whole_train_infer=300
-Global.save_model_dir:./output/
-Train.loader.batch_size_per_card:lite_train_infer=128|whole_train_infer=128
-Global.pretrained_model:null
-train_model_name:latest
-train_infer_img_dir:./inference/rec_inference
-null:null
-##
-trainer:norm_train|pact_train
-norm_train:tools/train.py -c tests/configs/rec_icdar15_r34_train.yml -o
-pact_train:deploy/slim/quantization/quant.py -c tests/configs/rec_icdar15_r34_train.yml -o
-fpgm_train:null
-distill_train:null
-null:null
-null:null
-##
-===========================eval_params===========================
-eval:tools/eval.py -c tests/configs/rec_icdar15_r34_train.yml -o
-null:null
-##
-===========================infer_params===========================
-Global.save_inference_dir:./output/
-Global.pretrained_model:
-norm_export:tools/export_model.py -c tests/configs/rec_icdar15_r34_train.yml -o
-quant_export:deploy/slim/quantization/export_model.py -c tests/configs/rec_icdar15_r34_train.yml -o
-fpgm_export:null
-distill_export:null
-export1:null
-export2:null
-##
-infer_model:./inference/ch_ppocr_server_v2.0_rec_infer/
-infer_export:null
-infer_quant:False
-inference:tools/infer/predict_rec.py
---use_gpu:True|False
---enable_mkldnn:True|False
---cpu_threads:1|6
---rec_batch_num:1|6
---use_tensorrt:True|False
---precision:fp32|fp16|int8
---rec_model_dir:
---image_dir:./inference/rec_inference
---save_log_path:./test/output/
---benchmark:True
-null:null
-===========================cpp_infer_params===========================
-use_opencv:True
-infer_model:./inference/ch_ppocr_server_v2.0_rec_infer/
-infer_quant:False
-inference:./deploy/cpp_infer/build/ppocr rec
---use_gpu:True|False
---enable_mkldnn:True|False
---cpu_threads:1|6
---rec_batch_num:1
---use_tensorrt:False|True
---precision:fp32|fp16
---rec_model_dir:
---image_dir:./inference/rec_inference/
-null:null
---benchmark:True
-===========================serving_params===========================
-model_name:ocr_server_rec
-python:python3.7
-trans_model:-m paddle_serving_client.convert
---dirname:./inference/ch_ppocr_server_v2.0_rec_infer/
---model_filename:inference.pdmodel
---params_filename:inference.pdiparams
---serving_server:./deploy/pdserving/ppocr_rec_mobile_2.0_serving/
---serving_client:./deploy/pdserving/ppocr_rec_mobile_2.0_client/
-serving_dir:./deploy/pdserving
-web_service:web_service_rec.py --config=config.yml --opt op.rec.concurrency=1
-op.rec.local_service_conf.devices:null|0
-op.rec.local_service_conf.use_mkldnn:True|False
-op.rec.local_service_conf.thread_num:1|6
-op.rec.local_service_conf.use_trt:False|True
-op.rec.local_service_conf.precision:fp32|fp16|int8
-pipline:pipeline_http_client.py|pipeline_rpc_client.py
---image_dir=../../doc/imgs_words_en

test_tipc/configs/ppocr_sys_mobile_params.txt

-===========================train_params===========================
-model_name:ocr_system_mobile
-python:python3.7
-gpu_list:null
-Global.use_gpu:null
-Global.auto_cast:null
-Global.epoch_num:null
-Global.save_model_dir:./output/
-Train.loader.batch_size_per_card:null
-Global.pretrained_model:null
-train_model_name:null
-train_infer_img_dir:null
-null:null
-##
-trainer:
-norm_train:null
-pact_train:null
-fpgm_train:null
-distill_train:null
-null:null
-null:null
-##
-===========================eval_params=========================== 
-eval:null
-null:null
-##
-===========================infer_params===========================
-Global.save_inference_dir:./output/
-Global.pretrained_model:
-norm_export:null 
-quant_export:null 
-fpgm_export:null 
-distill_export:null
-export1:null
-export2:null
-##
-infer_model:./inference/ch_ppocr_mobile_v2.0_det_infer/
-infer_export:null
-infer_quant:False
-inference:tools/infer/predict_system.py
---use_gpu:True
---enable_mkldnn:True|False
---cpu_threads:1|6
---rec_batch_num:1
---use_tensorrt:False|True
---precision:fp32|fp16|int8
---det_model_dir:
---image_dir:./inference/ch_det_data_50/all-sum-510/
---save_log_path:null
---benchmark:True
---rec_model_dir:./inference/ch_ppocr_mobile_v2.0_rec_infer/
-===========================cpp_infer_params===========================
-use_opencv:True
-infer_model:./inference/ch_ppocr_mobile_v2.0_det_infer/
-infer_quant:False
-inference:./deploy/cpp_infer/build/ppocr system
---use_gpu:True|False
---enable_mkldnn:True|False
---cpu_threads:1|6
---rec_batch_num:1
---use_tensorrt:False|True
---precision:fp32|fp16
---det_model_dir:
---image_dir:./inference/ch_det_data_50/all-sum-510/
---rec_model_dir:./inference/ch_ppocr_mobile_v2.0_rec_infer/
---benchmark:True
-

test_tipc/configs/ppocr_sys_server_params.txt

-===========================train_params===========================
-model_name:ocr_system_server
-python:python3.7
-gpu_list:null
-Global.use_gpu:null
-Global.auto_cast:null
-Global.epoch_num:null
-Global.save_model_dir:./output/
-Train.loader.batch_size_per_card:null
-Global.pretrained_model:null
-train_model_name:null
-train_infer_img_dir:null
-null:null
-##
-trainer:
-norm_train:null
-pact_train:null
-fpgm_train:null
-distill_train:null
-null:null
-null:null
-##
-===========================eval_params===========================
-eval:null
-null:null
-##
-===========================infer_params===========================
-Global.save_inference_dir:./output/
-Global.pretrained_model:
-norm_export:null
-quant_export:null
-fpgm_export:null
-distill_export:null
-export1:null
-export2:null
-##
-infer_model:./inference/ch_ppocr_server_v2.0_det_infer/
-infer_export:null
-infer_quant:False
-inference:tools/infer/predict_system.py
---use_gpu:True
---enable_mkldnn:True|False
---cpu_threads:1|6
---rec_batch_num:1
---use_tensorrt:False|True
---precision:fp32|fp16|int8
---det_model_dir:
---image_dir:./inference/ch_det_data_50/all-sum-510/
---save_log_path:null
---benchmark:True
---rec_model_dir:./inference/ch_ppocr_server_v2.0_rec_infer/
-===========================cpp_infer_params===========================
-use_opencv:True
-infer_model:./inference/ch_ppocr_server_v2.0_det_infer/
-infer_quant:False
-inference:./deploy/cpp_infer/build/ppocr system
---use_gpu:True|False
---enable_mkldnn:True|False
---cpu_threads:1|6
---rec_batch_num:1
---use_tensorrt:False|True
---precision:fp32|fp16
---det_model_dir:
---image_dir:./inference/ch_det_data_50/all-sum-510/
---rec_model_dir:./inference/ch_ppocr_server_v2.0_rec_infer/
---benchmark:True
\ No newline at end of file

test_tipc/readme.md

@@ -96,7 +96,7 @@ test_tipc/
 
 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`。
 
-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，测试时模型直接下载获取，这里的“训练硬件环境”表示所测试的模型是在哪种环境下训练得到的。
+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，测试时模型直接下载获取，这里的“训练硬件环境”表示所测试的模型是在哪种环境下训练得到的。
 
 根据上述命名规范，可以直接从配置文件名看出对应的测试场景和功能。