From 7c976e4bffce7494e2ef01db6ed0a3b1316837ae Mon Sep 17 00:00:00 2001
From: Birdylx <29754889+Birdylx@users.noreply.github.com>
Date: Thu, 15 Sep 2022 14:41:23 +0800
Subject: [PATCH] [TIPC] Update train_infer_python log dir (#690)

* Update TIPC log dir

* Update TIPC log dir
---
 test_tipc/configs/edvr/train_amp_infer_python.txt | 6 ------
 test_tipc/configs/edvr/train_infer_python.txt     | 2 +-
 test_tipc/test_train_inference_python.sh          | 6 ++++--
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/test_tipc/configs/edvr/train_amp_infer_python.txt b/test_tipc/configs/edvr/train_amp_infer_python.txt
index 60b915d9d..a9ed70507 100644
--- a/test_tipc/configs/edvr/train_amp_infer_python.txt
+++ b/test_tipc/configs/edvr/train_amp_infer_python.txt
@@ -24,9 +24,3 @@ null:null
 eval:null
 null:null
 ##
-===========================train_benchmark_params==========================
-batch_size:4|64
-fp_items:fp32
-total_iters:100
---profiler_options:batch_range=[10,20];state=GPU;tracer_option=Default;profile_path=model.profile
-flags:FLAGS_cudnn_exhaustive_search=1
diff --git a/test_tipc/configs/edvr/train_infer_python.txt b/test_tipc/configs/edvr/train_infer_python.txt
index d50722b7b..9aaa5933f 100644
--- a/test_tipc/configs/edvr/train_infer_python.txt
+++ b/test_tipc/configs/edvr/train_infer_python.txt
@@ -25,7 +25,7 @@ eval:null
 null:null
 ##
 ===========================train_benchmark_params==========================
-batch_size:4|64
+batch_size:64
 fp_items:fp32
 total_iters:100
 --profiler_options:batch_range=[10,20];state=GPU;tracer_option=Default;profile_path=model.profile
diff --git a/test_tipc/test_train_inference_python.sh b/test_tipc/test_train_inference_python.sh
index 9eb7c2f9f..544c3f0f2 100644
--- a/test_tipc/test_train_inference_python.sh
+++ b/test_tipc/test_train_inference_python.sh
@@ -73,7 +73,7 @@ save_log_key=$(func_parser_key "${lines[48]}")
 infer_key1=$(func_parser_key "${lines[50]}")
 infer_value1=$(func_parser_value "${lines[50]}")
 
-LOG_PATH="./test_tipc/output/${model_name}"
+LOG_PATH="./test_tipc/output/${model_name}/${MODE}"
 mkdir -p ${LOG_PATH}
 status_log="${LOG_PATH}/results_python.log"
 
@@ -248,10 +248,12 @@ else
                     cmd="${python} -m paddle.distributed.launch --ips=${ips} --gpus=${gpu} ${run_train} ${set_use_gpu} ${set_save_model} ${set_train_params1} ${set_pretrain} ${set_epoch} ${set_batchsize} ${set_amp_config} ${set_amp_level}"
                 fi
                 # run train
-                eval "unset CUDA_VISIBLE_DEVICES"
                 export FLAGS_cudnn_deterministic=True
                 eval $cmd
                 echo $cmd
+                log_name=${train_model_name/checkpoint.pdparams/.txt}
+                train_log_path=$( echo "${save_log}/${log_name}")
+                eval "cat ${train_log_path} >> ${save_log}.log"
                 status_check $? "${cmd}" "${status_log}"
 
                 set_eval_pretrain=$(func_set_params "${pretrain_model_key}" "${save_log}/${train_model_name}")