From 4b56069d84138096817bcf30460f7ee0ecc63d1c Mon Sep 17 00:00:00 2001
From: LDOUBLEV <liuvv0203@outlook.com>
Date: Wed, 9 Jun 2021 12:53:22 +0800
Subject: [PATCH] fix bug

---
 test/infer.sh | 35 ++++++++++++++++++++++-------------
 test/test.sh  |  4 ++--
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/test/infer.sh b/test/infer.sh
index 18aab1f1..30b91df7 100644
--- a/test/infer.sh
+++ b/test/infer.sh
@@ -45,13 +45,14 @@ for train_model in ${train_model_list[*]}; do
     if [ ${train_model} = "ocr_det" ];then
         model_name="det"
         yml_file="configs/det/det_mv3_db.yml"
-        # wget -nc -P ./inference https://paddleocr.bj.bcebos.com/dygraph_v2.0/test/ch_det_data_50.tar 
-        tar xf ./inference/ch_det_data_50.tar 
+        wget -nc -P ./inference https://paddleocr.bj.bcebos.com/dygraph_v2.0/test/ch_det_data_50.tar
+        cd ./inference && tar xf ch_det_data_50.tar && cd ../
         img_dir="./inference/ch_det_data_50/"
     elif [ ${train_model} = "ocr_rec" ];then
         model_name="rec"
         yml_file="configs/rec/rec_mv3_none_bilstm_ctc.yml"
-        wget -nc -P ./inference https://paddleocr.bj.bcebos.com/dygraph_v2.0/test/ch_rec_data_200.tar && tar xf ./inference/ch_rec_data_200.tar 
+        wget -nc -P ./inference https://paddleocr.bj.bcebos.com/dygraph_v2.0/test/ch_rec_data_200.tar 
+        cd ./inference && tar xf ch_rec_data_200.tar  && cd ../
         img_dir="./inference/ch_rec_data_200/"
     fi
 
@@ -59,45 +60,53 @@ for train_model in ${train_model_list[*]}; do
     for slim_trainer in ${slim_trainer_list[*]}; do 
         if [ ${slim_trainer} = "norm" ]; then
             if [ ${model_name} = "det" ]; then
-                eval_model_name="ch_ppocr_mobile_v2.0_det_infer"
+                eval_model_name="ch_ppocr_mobile_v2.0_det_train"
                 wget -nc  -P ./inference https://paddleocr.bj.bcebos.com/dygraph_v2.0/ch/ch_ppocr_mobile_v2.0_det_train.tar
+                cd ./inference && tar xf ${eval_model_name}.tar && cd ../
             else 
-                eval_model_name="ch_ppocr_mobile_v2.0_rec_infer"
+                eval_model_name="ch_ppocr_mobile_v2.0_rec_train"
                 wget -nc  -P ./inference https://paddleocr.bj.bcebos.com/dygraph_v2.0/ch/ch_ppocr_mobile_v2.0_rec_train.tar
+                cd ./inference && tar xf ${eval_model_name}.tar && cd ../
             fi 
         elif [ ${slim_trainer} = "quant" ]; then
             if [ ${model_name} = "det" ]; then
-                eval_model_name="ch_ppocr_mobile_v2.0_det_quant_infer"
+                eval_model_name="ch_ppocr_mobile_v2.0_det_quant_train"
                 wget -nc  -P ./inference https://paddleocr.bj.bcebos.com/dygraph_v2.0/slim/ch_ppocr_mobile_v2.0_det_quant_train.tar
+                cd ./inference && tar xf ${eval_model_name}.tar && cd ../
             else
-                eval_model_name="ch_ppocr_mobile_v2.0_rec_quant_infer"
+                eval_model_name="ch_ppocr_mobile_v2.0_rec_quant_train"
                 wget -nc  -P ./inference https://paddleocr.bj.bcebos.com/dygraph_v2.0/slim/ch_ppocr_mobile_v2.0_rec_quant_train.tar
+                cd ./inference && tar xf ${eval_model_name}.tar && cd ../
             fi
         elif [ ${slim_trainer} = "distill" ]; then
             if [ ${model_name} = "det" ]; then
-                eval_model_name="ch_ppocr_mobile_v2.0_det_distill_infer"
+                eval_model_name="ch_ppocr_mobile_v2.0_det_distill_train"
                 wget -nc  -P ./inference https://paddleocr.bj.bcebos.com/dygraph_v2.0/slim/ch_ppocr_mobile_v2.0_det_distill_train.tar
+                cd ./inference && tar xf ${eval_model_name}.tar && cd ../
             else
-                eval_model_name="ch_ppocr_mobile_v2.0_rec_distill_infer"
+                eval_model_name="ch_ppocr_mobile_v2.0_rec_distill_train"
                 wget -nc  -P ./inference https://paddleocr.bj.bcebos.com/dygraph_v2.0/slim/ch_ppocr_mobile_v2.0_rec_distill_train.tar
+                cd ./inference && tar xf ${eval_model_name}.tar && cd ../
             fi 
         elif [ ${slim_trainer} = "prune" ]; then
             if [ ${model_name} = "det" ]; then
                 eval_model_name="ch_ppocr_mobile_v2.0_det_prune_train"
                 wget -nc  -P ./inference https://paddleocr.bj.bcebos.com/dygraph_v2.0/slim/ch_ppocr_mobile_v2.0_det_prune_train.tar
+                cd ./inference && tar xf ${eval_model_name}.tar && cd ../
             else
                 eval_model_name="ch_ppocr_mobile_v2.0_rec_prune_train"
                 wget -nc  -P ./inference https://paddleocr.bj.bcebos.com/dygraph_v2.0/slim/ch_ppocr_mobile_v2.0_rec_prune_train.tar
+                cd ./inference && tar xf ${eval_model_name}.tar && cd ../
             fi
         fi
 
         save_log_path="${log_path}/${eval_model_name}"
-        command="${python} tools/eval.py -c ${yml_file} -o Global.pretrained_model=${eval_model_name} Global.save_model_dir=${save_log_path}"
-        ${python} tools/eval.py -c ${yml_file} -o Global.pretrained_model=${eval_model_name} Global.save_model_dir=${save_log_path}
+        command="${python} tools/eval.py -c ${yml_file} -o Global.pretrained_model="${eval_model_name}/best_accuracy" Global.save_model_dir=${save_log_path}"
+        ${python} tools/eval.py -c ${yml_file} -o Global.pretrained_model="${eval_model_name}/best_accuracy" Global.save_model_dir=${save_log_path}
         status_check $? "${trainer}" "${command}" "${save_log_path}/train.log"
 
-        command="${python} tools/export_model.py -c ${yml_file} -o Global.pretrained_model=${eval_model_name} Global.save_inference_dir=${log_path}/${eval_model_name}_infer Global.save_model_dir=${save_log_path}"
-        ${python} tools/export_model.py -c ${yml_file} -o Global.pretrained_model=${eval_model_name} Global.save_inference_dir="${log_path}/${eval_model_name}_infer" Global.save_model_dir=${save_log_path}
+        command="${python} tools/export_model.py -c ${yml_file} -o Global.pretrained_model="${eval_model_name}/best_accuracy" Global.save_inference_dir=${log_path}/${eval_model_name}_infer Global.save_model_dir=${save_log_path}"
+        ${python} tools/export_model.py -c ${yml_file} -o Global.pretrained_model="${eval_model_name}/best_accuracy" Global.save_inference_dir="${log_path}/${eval_model_name}_infer" Global.save_model_dir=${save_log_path}
         status_check $? "${trainer}" "${command}" "${save_log_path}/train.log"
 
         if [ $? -eq 0 ]; then
diff --git a/test/test.sh b/test/test.sh
index 24a68b26..a1b711b7 100644
--- a/test/test.sh
+++ b/test/test.sh
@@ -127,8 +127,8 @@ for train_model in ${train_model_list[*]}; do
                     export_model="tools/export_model.py"
                 fi
                 save_log="${log_path}/${model_name}_${slim_trainer}_autocast_${auto_cast}_gpuid_${gpu}"
-                command="${env} ${python}  ${launch}  ${trainer}  -c ${yml_file} -o Global.epoch_num=${epoch} Global.eval_batch_step=${eval_batch_step} Global.auto_cast=${auto_cast}  Global.save_model_dir=${save_log} Global.use_gpu=${use_gpu}"
-                ${env} ${python}  ${launch}  ${trainer}  -c ${yml_file} -o Global.epoch_num=${epoch} Global.eval_batch_step=${eval_batch_step} Global.auto_cast=${auto_cast}  Global.save_model_dir=${save_log} Global.use_gpu=${use_gpu}
+                command="${env} ${python}  ${launch}  ${trainer}  -c ${yml_file} -o Global.epoch_num=${epoch} Global.eval_batch_step=${eval_batch_step} Global.auto_cast=${auto_cast}  Global.save_model_dir=${save_log} Global.use_gpu=${use_gpu} Train.loader.batch_size_per_card=2"
+                ${env} ${python}  ${launch}  ${trainer}  -c ${yml_file} -o Global.epoch_num=${epoch} Global.eval_batch_step=${eval_batch_step} Global.auto_cast=${auto_cast}  Global.save_model_dir=${save_log} Global.use_gpu=${use_gpu}  Train.loader.batch_size_per_card=2
                 status_check $? "${trainer}" "${command}" "${save_log}/train.log"
 
                 command="${env} ${python} ${export_model} -c ${yml_file} -o Global.pretrained_model=${save_log}/latest Global.save_inference_dir=${save_log}/export_inference/ Global.save_model_dir=${save_log}"
-- 
GitLab