From 7249d0ba59b8ea8601f80c37d0e2c548c78079f0 Mon Sep 17 00:00:00 2001
From: huangyuxin <hyxin2014@126.com>
Date: Fri, 25 Feb 2022 07:41:05 +0000
Subject: [PATCH 1/2] fix benchmark

---
 tests/test_tipc/configs/conformer/train_benchmark.txt |  2 +-
 tests/test_tipc/configs/pwgan/train_benchmark.txt     |  2 +-
 tests/test_tipc/prepare.sh                            | 10 +++++++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/tests/test_tipc/configs/conformer/train_benchmark.txt b/tests/test_tipc/configs/conformer/train_benchmark.txt
index 3833f144..33b1debd 100644
--- a/tests/test_tipc/configs/conformer/train_benchmark.txt
+++ b/tests/test_tipc/configs/conformer/train_benchmark.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/tests/test_tipc/configs/pwgan/train_benchmark.txt b/tests/test_tipc/configs/pwgan/train_benchmark.txt
index e936da3c..c64984dc 100644
--- a/tests/test_tipc/configs/pwgan/train_benchmark.txt
+++ b/tests/test_tipc/configs/pwgan/train_benchmark.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
index 0280e5d4..f10cb06c 100644
--- a/tests/test_tipc/prepare.sh
+++ b/tests/test_tipc/prepare.sh
@@ -26,7 +26,9 @@ 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
@@ -35,6 +37,8 @@ if [ ${MODE} = "benchmark_train" ];then
         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/
@@ -42,6 +46,7 @@ if [ ${MODE} = "benchmark_train" ];then
         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
\ No newline at end of file
+fi

From f2eb5db0bdc7fdc350993478797c5bfc3862b5e1 Mon Sep 17 00:00:00 2001
From: huangyuxin <hyxin2014@126.com>
Date: Fri, 25 Feb 2022 08:49:34 +0000
Subject: [PATCH 2/2] rename config files

---
 .../conformer/{train_benchmark.txt => train_infer_python.txt}   | 0
 .../pwgan/{train_benchmark.txt => train_infer_python.txt}       | 0
 tests/test_tipc/prepare.sh                                      | 2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename tests/test_tipc/configs/conformer/{train_benchmark.txt => train_infer_python.txt} (100%)
 rename tests/test_tipc/configs/pwgan/{train_benchmark.txt => train_infer_python.txt} (100%)

diff --git a/tests/test_tipc/configs/conformer/train_benchmark.txt b/tests/test_tipc/configs/conformer/train_infer_python.txt
similarity index 100%
rename from tests/test_tipc/configs/conformer/train_benchmark.txt
rename to tests/test_tipc/configs/conformer/train_infer_python.txt
diff --git a/tests/test_tipc/configs/pwgan/train_benchmark.txt b/tests/test_tipc/configs/pwgan/train_infer_python.txt
similarity index 100%
rename from tests/test_tipc/configs/pwgan/train_benchmark.txt
rename to tests/test_tipc/configs/pwgan/train_infer_python.txt
diff --git a/tests/test_tipc/prepare.sh b/tests/test_tipc/prepare.sh
index f10cb06c..b46b2032 100644
--- a/tests/test_tipc/prepare.sh
+++ b/tests/test_tipc/prepare.sh
@@ -32,7 +32,7 @@ if [ ${MODE} = "benchmark_train" ];then
     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"