Merge pull request #253 from wangguan1995/tipc_fix

Tipc fix

Author: HydrogenSulfate

test_tipc/README.MD

@@ -38,18 +38,22 @@ cd ./test_tipc/
 wget https://paddle-qa.bj.bcebos.com/benchmark/tools.tar.gz
 tar -zxvf tools.tar.gz
 export BENCHMARK_ROOT=$PWD/tools
+cd ..
 ```
-在根目录下运行
+在PaddleScience主目录下运行
 ```
-bash ./test_tipc/benchmark_train.sh ./test_tipc/configs/train_2d_unsteady_continuous.txt benchmark_train
+export prepare_params=./test_tipc/configs/train_2d_unsteady_continuous/prepare_2d_unsteady_continuous.txt 
+export train_params=./test_tipc/configs/train_2d_unsteady_continuous/train_2d_unsteady_continuous.txt
+source ./test_tipc/prepare.sh $prepare_params benchmark_train
+bash ./test_tipc/benchmark_train.sh  $train_params benchmark_train
 ```
 benchmark训练得到训练日志后，会自动保存训练日志并解析得到ips等信息，日志解析代码位于：
 - https://console.cloud.baidu-int.com/devops/icode/repos/baidu/paddle/benchmark-frame/blob/master/tools/scripts/analysis.py
 运行成功会显示
 ```
 Run successfully with command
 ```
-如果运行成功会生成index文件夹，该目录下面生成json文件[PaddleScience_cylinder2d_unsteady_train_newapi_bs1_fp32_SingleP_DP_N1C1_speed]，其中可以找到对应的ips数值
+如果运行成功会生成index文件夹，该目录下面生成json文件[PaddleScience_cylinder2d_unsteady_train_newapi_bs1_fp32_DP_N1C1_speed]，其中可以找到对应的ips数值
 ```
-{"model_branch": "branch_test_1", "model_commit": "77723dd801a83fd9bcee94fec04fdcbdbb87d85a", "model_name": "cylinder2d_unsteady_train_newapi_bs1_fp32_SingleP_DP", "batch_size": 1, "fp_item": "fp32", "run_mode": "DP", "convergence_value": "207.94940185546875", "convergence_key": "loss:", "ips": 599765.06, "speed_unit": "samples/s", "device_num": "N1C1", "model_run_time": "19", "frame_commit": "caf2008b55fe0ee34cd6fa71090701517ac33eda", "frame_version": "0.0.0"}
+{"model_branch": "tipc_fix", "model_commit": "51558e06db7b58d5683a0fccc67d77f4340719d4", "model_name": "cylinder2d_unsteady_train_newapi_bs1_fp32_DP", "batch_size": 1, "fp_item": "fp32", "run_mode": "DP", "convergence_value": "207.94940185546875", "convergence_key": "loss:", "ips": 775299.78, "speed_unit": "samples/s", "device_num": "N1C1", "model_run_time": "15", "frame_commit": "5c19bfc8015b79f861aae9be6c98371de7ccef19", "frame_version": "0.0.0"}
 ```

test_tipc/benchmark_train.sh

@@ -13,23 +13,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
-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 
-BENCHMARK_ROOT=${TEST_DIR}"/test_tipc/tools"
 source ${TEST_DIR}/test_tipc/common_func.sh
-echo -e "\n* [TEST_DIR] is now set : \n" ${TEST_DIR} "\n"
-echo -e "\n* [BENCHMARK_ROOT] is now set : \n" ${BENCHMARK_ROOT} "\n"
-
-python=python3.7
-pip="python3.7 -m pip"
-echo -e "\n* [pip] is now set : \n" ${pip} "\n"
-export model_branch=`git symbolic-ref HEAD 2>/dev/null | cut -d"/" -f 3`
-export model_commit=$(git log|head -n1|awk '{print $2}') 
-export str_tmp=$(echo `${pip} list|grep paddlepaddle-gpu|awk -F ' ' '{print $2}'`)
-export frame_version=${str_tmp%%.post*}
-export frame_commit=$(echo `${python} -c "import paddle;print(paddle.version.commit)"`)
 
 function func_parser_params(){
     strs=$1
@@ -88,20 +72,14 @@ cmd=`yes|cp $FILENAME $new_filename`
 FILENAME=$new_filename
 # MODE must be one of ['benchmark_train']
 MODE=$2
-if [ ${MODE} = "benchmark_train" ];then
-    python3.7 -m pip install -r requirements.txt
-    export PYTHONPATH=${PDSC_DIR}
-    echo -e "\n* [PYTHONPATH] is now set : \n" ${PYTHONPATH} "\n"
-    python3.7 ${PDSC_DIR}/examples/cylinder/2d_unsteady_continuous/download_dataset.py
-fi
-
 
 PARAMS=$3
 IFS=$'\n'
 dataline=`cat $FILENAME`
 IFS=$'\n'
 lines=(${dataline})
 model_name=$(func_parser_value "${lines[1]}")
+python=$(func_parser_value "${lines[2]}")
 line_num=`grep -n "train_benchmark_params" $FILENAME  | cut -d ":" -f 1`
 batch_size=$(func_parser_value "${lines[line_num]}")
 line_num=`expr $line_num + 1`
@@ -117,6 +95,12 @@ profile_option="${profile_option_key}:${profile_option_params}"
 line_num=`expr $line_num + 1`
 flags_value=$(func_parser_value "${lines[line_num]}")
 
+export model_branch=`git symbolic-ref HEAD 2>/dev/null | cut -d"/" -f 3`
+export model_commit=$(git log|head -n1|awk '{print $2}') 
+export str_tmp=$(echo `${pip} list|grep paddlepaddle-gpu|awk -F ' ' '{print $2}'`)
+export frame_version=${str_tmp%%.post*}
+export frame_commit=$(echo `${python} -c "import paddle;print(paddle.version.commit)"`)
+
 IFS=";"
 flags_list=(${flags_value})
 for _flag in ${flags_list[*]}; do
@@ -182,10 +166,10 @@ for batch_size in ${batch_size_list[*]}; do
             gpu_id=$(set_gpu_id $device_num)
 
             if [ ${#gpu_id} -le 1 ];then
-                run_process_type="SingleP"
+                # run_process_type="SingleP"
                 log_path="$SAVE_LOG/profiling_log"
                 mkdir -p $log_path
-                log_name="${repo_name}_${model_name}_bs${batch_size}_${precision}_${run_process_type}_${run_mode}_${device_num}_profiling"
+                log_name="${repo_name}_${model_name}_bs${batch_size}_${precision}_${run_mode}_${device_num}_profiling"
                 func_sed_params "$FILENAME" "${line_gpuid}" "0"  # sed used gpu_id 
                 # set profile_option params
                 tmp=`sed -i "${line_profile}s/.*/${profile_option}/" "${FILENAME}"`
@@ -201,8 +185,8 @@ for batch_size in ${batch_size_list[*]}; do
                 speed_log_path="$SAVE_LOG/index"
                 mkdir -p $log_path
                 mkdir -p $speed_log_path
-                log_name="${repo_name}_${model_name}_bs${batch_size}_${precision}_${run_process_type}_${run_mode}_${device_num}_log"
-                speed_log_name="${repo_name}_${model_name}_bs${batch_size}_${precision}_${run_process_type}_${run_mode}_${device_num}_speed"
+                log_name="${repo_name}_${model_name}_bs${batch_size}_${precision}_${run_mode}_${device_num}_log"
+                speed_log_name="${repo_name}_${model_name}_bs${batch_size}_${precision}_${run_mode}_${device_num}_speed"
                 func_sed_params "$FILENAME" "${line_profile}" "null"  # sed profile_id as null
                 cmd="bash ${TEST_DIR}/test_tipc/test_train_inference_python.sh ${FILENAME} benchmark_train > ${log_path}/${log_name} 2>&1 "
                 echo $cmd
@@ -212,7 +196,7 @@ for batch_size in ${batch_size_list[*]}; do
                 export model_run_time=$((${job_et}-${job_bt}))
                 eval "cat ${log_path}/${log_name}"
                 # parser log
-                _model_name="${model_name}_bs${batch_size}_${precision}_${run_process_type}_${run_mode}"
+                _model_name="${model_name}_bs${batch_size}_${precision}_${run_mode}"
                 cmd="${python} ${BENCHMARK_ROOT}/scripts/analysis.py --filename ${log_path}/${log_name} \
                         --speed_log_file '${speed_log_path}/${speed_log_name}' \
                         --model_name ${_model_name} \

test_tipc/configs/train_2d_unsteady_continuous/prepare_2d_unsteady_continuous.txt

@@ -0,0 +1,4 @@
+===========================prepare_params===========================
+download_dataset:/examples/cylinder/2d_unsteady/download_dataset.py
+python:python3.7
+pip:pip

test_tipc/configs/train_2d_unsteady_continuous.txt renamed to test_tipc/configs/train_2d_unsteady_continuous/train_2d_unsteady_continuous.txt

@@ -13,7 +13,7 @@ train_infer_img_dir:null
 --profiler_options:null
 ##
 trainer:norm_train
-norm_train:/examples/cylinder/2d_unsteady_continuous/cylinder2d_unsteady_train_newapi.py
+norm_train:/examples/cylinder/2d_unsteady/cylinder2d_unsteady_train_newapi.py
 pact_train:null
 fpgm_train:null
 distill_train:null
@@ -54,4 +54,4 @@ 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
+flags:FLAGS_eager_delete_tensor_gb=0.0;FLAGS_fraction_of_gpu_memory_to_use=0.98;FLAGS_conv_workspace_size_limit=0

test_tipc/prepare.sh

@@ -0,0 +1,23 @@
+# Set directories
+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}
+
+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]
+PREPARE_PARAM_FILE=$1
+dataline=`cat $PREPARE_PARAM_FILE`
+lines=(${dataline})
+download_dataset=$(func_parser_value "${lines[1]}")
+python=$(func_parser_value "${lines[2]}")
+export pip=$(func_parser_value "${lines[3]}")
+
+${pip} install -r requirements.txt
+${python} ${PDSC_DIR}${download_dataset}