From af681065faacd269762a3962ce39255f405535f4 Mon Sep 17 00:00:00 2001
From: Birdylx <29754889+Birdylx@users.noreply.github.com>
Date: Thu, 20 Oct 2022 19:25:30 +0800
Subject: [PATCH] [TIPC] Unify log and cfg name (#709)

* Rename cfg file

* Update benchmark iters in esrgan

* Standardlize log name in cpp infer
---
 ...x_gpu_normal_amp_infer_python_linux_gpu_cpu.txt} |  0
 test_tipc/configs/esrgan/train_infer_python.txt     |  2 +-
 ...x_gpu_normal_normal_infer_cpp_linux_gpu_cpu.txt} |  0
 ...x_gpu_normal_amp_infer_python_linux_gpu_cpu.txt} |  0
 test_tipc/test_inference_cpp.sh                     | 13 +++++++++----
 5 files changed, 10 insertions(+), 5 deletions(-)
 rename test_tipc/configs/edvr/{train_amp_infer_python.txt => train_linux_gpu_normal_amp_infer_python_linux_gpu_cpu.txt} (100%)
 rename test_tipc/configs/msvsr/{inference_cpp.txt => model_linux_gpu_normal_normal_infer_cpp_linux_gpu_cpu.txt} (100%)
 rename test_tipc/configs/msvsr/{train_amp_infer_python.txt => train_linux_gpu_normal_amp_infer_python_linux_gpu_cpu.txt} (100%)

diff --git a/test_tipc/configs/edvr/train_amp_infer_python.txt b/test_tipc/configs/edvr/train_linux_gpu_normal_amp_infer_python_linux_gpu_cpu.txt
similarity index 100%
rename from test_tipc/configs/edvr/train_amp_infer_python.txt
rename to test_tipc/configs/edvr/train_linux_gpu_normal_amp_infer_python_linux_gpu_cpu.txt
diff --git a/test_tipc/configs/esrgan/train_infer_python.txt b/test_tipc/configs/esrgan/train_infer_python.txt
index 8a91eff..dfbb98d 100644
--- a/test_tipc/configs/esrgan/train_infer_python.txt
+++ b/test_tipc/configs/esrgan/train_infer_python.txt
@@ -52,6 +52,6 @@ null:null
 ===========================train_benchmark_params==========================
 batch_size:32|64
 fp_items:fp32
-total_iters:100
+total_iters:500
 --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/msvsr/inference_cpp.txt b/test_tipc/configs/msvsr/model_linux_gpu_normal_normal_infer_cpp_linux_gpu_cpu.txt
similarity index 100%
rename from test_tipc/configs/msvsr/inference_cpp.txt
rename to test_tipc/configs/msvsr/model_linux_gpu_normal_normal_infer_cpp_linux_gpu_cpu.txt
diff --git a/test_tipc/configs/msvsr/train_amp_infer_python.txt b/test_tipc/configs/msvsr/train_linux_gpu_normal_amp_infer_python_linux_gpu_cpu.txt
similarity index 100%
rename from test_tipc/configs/msvsr/train_amp_infer_python.txt
rename to test_tipc/configs/msvsr/train_linux_gpu_normal_amp_infer_python_linux_gpu_cpu.txt
diff --git a/test_tipc/test_inference_cpp.sh b/test_tipc/test_inference_cpp.sh
index 90f0488..c5f533c 100644
--- a/test_tipc/test_inference_cpp.sh
+++ b/test_tipc/test_inference_cpp.sh
@@ -22,16 +22,21 @@ gpu_id=$(func_parser_value "${lines[9]}")
 use_mkldnn=$(func_parser_value "${lines[10]}")
 cpu_threads=$(func_parser_value "${lines[11]}")
 
-LOG_PATH="./test_tipc/output/infer_cpp"
+# only support fp32、bs=1, trt is not supported yet.
+precision="fp32"
+use_trt=false
+batch_size=1
+
+LOG_PATH="./test_tipc/output/${model_name}/${MODE}"
 mkdir -p ${LOG_PATH}
-status_log="${LOG_PATH}/results_cpp_infer.log"
+status_log="${LOG_PATH}/results_cpp.log"
 
 function func_cpp_inference(){
     # set log
     if [ ${device} = "GPU" ]; then
-        _save_log_path="${LOG_PATH}/infer_cpp_${device}.log"
+        _save_log_path="${LOG_PATH}/cpp_infer_gpu_usetrt_${use_trt}_precision_${precision}_batchsize_${batch_size}.log"
     elif [ ${device} = "CPU" ]; then
-        _save_log_path="${LOG_PATH}/infer_cpp_${device}_usemkldnn_${usemkldnn}_threads_${cpu_threads}.log"
+        _save_log_path="${LOG_PATH}/cpp_infer_cpu_usemkldnn_${use_mkldnn}_threads_${cpu_threads}_precision_${precision}_batchsize_${batch_size}.log"
     fi
 
     # set params
-- 
GitLab