Merge pull request #1491 from Jackwaterveg/benchmark

[Benchmark] fix benchmark
PaddlePaddle · Feb 28, 2022 · 8f7f921 · 8f7f921
2 parents 8d474c2 + f2eb5db
commit 8f7f921
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/...ipc/configs/conformer/train_benchmark.txt → .../configs/conformer/train_infer_python.txt b/...ipc/configs/conformer/train_benchmark.txt → .../configs/conformer/train_infer_python.txt
@@ -54,4 +54,4 @@ batch_size:16|30
 fp_items:fp32
 iteration:50
 --profiler-options:"batch_range=[10,35];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=4096
+flags:null
diff --git a/...st_tipc/configs/pwgan/train_benchmark.txt → ...tipc/configs/pwgan/train_infer_python.txt b/...st_tipc/configs/pwgan/train_benchmark.txt → ...tipc/configs/pwgan/train_infer_python.txt
@@ -54,4 +54,4 @@ batch_size:6|16
 fp_items:fp32
 iteration:50
 --profiler_options:"batch_range=[10,35];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=4096
+flags:null
diff --git a/tests/test_tipc/prepare.sh b/tests/test_tipc/prepare.sh
@@ -26,22 +26,27 @@ if [ ${MODE} = "benchmark_train" ];then
  curPath=$(readlink -f "$(dirname "$0")")
  echo "curPath:"${curPath}
  cd ${curPath}/../..
- pip install .
+ apt-get install libsndfile1
+ pip install pytest-runner kaldiio setuptools_scm -i https://pypi.tuna.tsinghua.edu.cn/simple 
+ pip install . -i https://pypi.tuna.tsinghua.edu.cn/simple 
  cd -
  if [ ${model_name} == "conformer" ]; then
  # set the URL for aishell_tiny dataset
- URL='None'
+ URL=${conformer_data_URL:-"None"}
  echo "URL:"${URL}
  if [ ${URL} == 'None' ];then
  echo "please contact author to get the URL.\n"
  exit
+ else
+ wget -P ${curPath}/../../dataset/aishell/ ${URL} 
  fi
  sed -i "s#^URL_ROOT_TAG#URL_ROOT = '${URL}'#g" ${curPath}/conformer/scripts/aishell_tiny.py
  cp ${curPath}/conformer/scripts/aishell_tiny.py ${curPath}/../../dataset/aishell/
  cd ${curPath}/../../examples/aishell/asr1
  source path.sh
  # download audio data
  sed -i "s#aishell.py#aishell_tiny.py#g" ./local/data.sh
+ sed -i "s#python3#python#g" ./local/data.sh
  bash ./local/data.sh || exit -1
  if [ $? -ne 0 ]; then
  exit 1
@@ -56,7 +61,6 @@ if [ ${MODE} = "benchmark_train" ];then
  sed -i "s#conf/#test_tipc/conformer/benchmark_train/conf/#g" ${curPath}/conformer/benchmark_train/conf/conformer.yaml
  sed -i "s#data/#test_tipc/conformer/benchmark_train/data/#g" ${curPath}/conformer/benchmark_train/conf/tuning/decode.yaml
  sed -i "s#data/#test_tipc/conformer/benchmark_train/data/#g" ${curPath}/conformer/benchmark_train/conf/preprocess.yaml
-
  fi
 
  if [ ${model_name} == "pwgan" ]; then
@@ -73,4 +77,4 @@ if [ ${MODE} = "benchmark_train" ];then
  python ../paddlespeech/t2s/exps/gan_vocoder/normalize.py --metadata=dump/test/raw/metadata.jsonl --dumpdir=dump/test/norm --stats=dump/train/feats_stats.npy
  fi
 
-fi
+fi