Merge pull request #308 from wangguan1995/tipc_fix_0515

Tipc fix 0515

Author: HydrogenSulfate

test_tipc/benchmark_train.sh

@@ -17,6 +17,7 @@ export PDSC_DIR=$(cd "$( dirname ${BASH_SOURCE[0]})"; cd ..; pwd)
 export TEST_DIR="${PDSC_DIR}"
 export TIPC_TEST="ON" # open tipc log in solver.py 
 export PYTHONPATH=${PDSC_DIR}
+BENCHMARK_ROOT="${TEST_DIR}/test_tipc/tools"
 source ${TEST_DIR}/test_tipc/common_func.sh
 
 function func_parser_params(){

test_tipc/configs/train_2d_unsteady_continuous/train_2d_unsteady_continuous.txt

@@ -1,6 +1,6 @@
 ===========================train_params===========================
 model_name:cylinder2d_unsteady_train_newapi
-python:python3.7
+python:python3.10
 gpu_list:0
 Global.use_gpu:null
 Global.auto_cast:fp32

test_tipc/configs/train_eular_beam/train_eular_beam.txt

@@ -0,0 +1,60 @@
+===========================train_params===========================
+model_name:euler_beam
+python:python3.10
+gpu_list:0
+Global.use_gpu:null
+null:null
+--epochs
+null:null
+null:null
+null:null
+train_model_name:latest
+train_infer_img_dir:null
+null:null
+##
+trainer:norm_train
+norm_train:/examples/euler_beam/euler_beam.py
+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.checkpoints:
+norm_export:null
+quant_export:null
+fpgm_export:null
+distill_export:null
+export1:null
+export2:null
+inference_dir:null
+train_model:null
+infer_export:tools/export_model.py -c null -o
+infer_quant:False
+inference:tools/infer/predict_det.py
+--use_gpu:True
+--enable_mkldnn:null
+--cpu_threads:null
+--rec_batch_num:1
+--use_tensorrt:null
+--precision:fp32
+--det_model_dir:
+--image_dir:null
+null:null
+--benchmark:True
+null:null
+===========================train_benchmark_params==========================
+batch_size:1
+fp_items:fp32
+epoch:20
+--profiler_options:batch_range=[1,1];state=GPU;tracer_option=Default;profile_path=model.profile
+flags:FLAGS_eager_delete_tensor_gb=0.0;FLAGS_fraction_of_gpu_memory_to_use=0.98;FLAGS_conv_workspace_size_limit=0
+===========================prepare_params==========================
+download_dataset:
+pip:pip

test_tipc/prepare.sh

@@ -4,20 +4,24 @@ export TEST_DIR="${PDSC_DIR}"
 export TIPC_TEST="ON" # open tipc log in solver.py 
 export PYTHONPATH=${PDSC_DIR}
 
+BENCHMARK_ROOT="${TEST_DIR}/test_tipc/tools"
 echo -e "\n* [TEST_DIR] is now set : \n" ${TEST_DIR} "\n"
 echo -e "\n* [BENCHMARK_ROOT] is now set : \n" ${BENCHMARK_ROOT} "\n"
 echo -e "\n* [PYTHONPATH] is now set : \n" ${PYTHONPATH} "\n"
 
-BENCHMARK_ROOT=${TEST_DIR}"/test_tipc/tools"
 source ${TEST_DIR}/test_tipc/common_func.sh
 
-# Read parameters from [prepare_2d_unsteady_continuous.txt]
+# Read parameters from [/tipc/config/*/*.txt]
 PREPARE_PARAM_FILE=$1
 dataline=`cat $PREPARE_PARAM_FILE`
 lines=(${dataline})
 download_dataset=$(func_parser_value "${lines[61]}")
 python=$(func_parser_value "${lines[2]}")
 export pip=$(func_parser_value "${lines[62]}")
-
+${pip} install --upgrade pip
+${pip} install pybind11
 ${pip} install -r requirements.txt
-${python} ${PDSC_DIR}${download_dataset}
+
+if [ -n ${download_dataset} ] ; then
+    ${python} ${PDSC_DIR}${download_dataset}
+fi