Merge pull request #331 from kuke/make_setup_robust_dev

Yibing Liu · web-flow · commit 9a153cb699a2 · 2017-09-27T17:58:13.000+08:00
Make sh scripts more robust
diff --git a/deep_speech_2/examples/aishell/run_data.sh b/deep_speech_2/examples/aishell/run_data.sh
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-pushd ../.. > /dev/null
+cd ../.. > /dev/null
 
 # download data, generate manifests
 PYTHONPATH=.:$PYTHONPATH python data/aishell/aishell.py \
diff --git a/deep_speech_2/examples/aishell/run_infer.sh b/deep_speech_2/examples/aishell/run_infer.sh
@@ -1,14 +1,14 @@
 #! /usr/bin/env bash
 
-pushd ../.. > /dev/null
+cd ../.. > /dev/null
 
 # download language model
-pushd models/lm > /dev/null
+cd models/lm > /dev/null
 sh download_lm_ch.sh
 if [ $? -ne 0 ]; then
     exit 1
 fi
-popd > /dev/null
+cd - > /dev/null
 
 
 # infer
diff --git a/deep_speech_2/examples/aishell/run_infer_golden.sh b/deep_speech_2/examples/aishell/run_infer_golden.sh
@@ -1,23 +1,23 @@
 #! /usr/bin/env bash
 
-pushd ../.. > /dev/null
+cd ../.. > /dev/null
 
 # download language model
-pushd models/lm > /dev/null
+cd models/lm > /dev/null
 sh download_lm_ch.sh
 if [ $? -ne 0 ]; then
     exit 1
 fi
-popd > /dev/null
+cd - > /dev/null
 
 
 # download well-trained model
-pushd models/aishell > /dev/null
+cd models/aishell > /dev/null
 sh download_model.sh
 if [ $? -ne 0 ]; then
     exit 1
 fi
-popd > /dev/null
+cd - > /dev/null
 
 
 # infer
diff --git a/deep_speech_2/examples/aishell/run_test.sh b/deep_speech_2/examples/aishell/run_test.sh
@@ -1,14 +1,14 @@
 #! /usr/bin/env bash
 
-pushd ../.. > /dev/null
+cd ../.. > /dev/null
 
 # download language model
-pushd models/lm > /dev/null
+cd models/lm > /dev/null
 sh download_lm_ch.sh
 if [ $? -ne 0 ]; then
     exit 1
 fi
-popd > /dev/null
+cd - > /dev/null
 
 
 # evaluate model
diff --git a/deep_speech_2/examples/aishell/run_test_golden.sh b/deep_speech_2/examples/aishell/run_test_golden.sh
@@ -1,23 +1,23 @@
 #! /usr/bin/env bash
 
-pushd ../.. > /dev/null
+cd ../.. > /dev/null
 
 # download language model
-pushd models/lm > /dev/null
+cd models/lm > /dev/null
 sh download_lm_ch.sh
 if [ $? -ne 0 ]; then
     exit 1
 fi
-popd > /dev/null
+cd - > /dev/null
 
 
 # download well-trained model
-pushd models/aishell > /dev/null
+cd models/aishell > /dev/null
 sh download_model.sh
 if [ $? -ne 0 ]; then
     exit 1
 fi
-popd > /dev/null
+cd - > /dev/null
 
 
 # evaluate model
diff --git a/deep_speech_2/examples/aishell/run_train.sh b/deep_speech_2/examples/aishell/run_train.sh
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-pushd ../.. > /dev/null
+cd ../.. > /dev/null
 
 # train model
 # if you wish to resume from an exists model, uncomment --init_model_path
diff --git a/deep_speech_2/examples/librispeech/run_data.sh b/deep_speech_2/examples/librispeech/run_data.sh
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-pushd ../.. > /dev/null
+cd ../.. > /dev/null
 
 # download data, generate manifests
 PYTHONPATH=.:$PYPYTHONPATH python data/librispeech/librispeech.py \
diff --git a/deep_speech_2/examples/librispeech/run_infer.sh b/deep_speech_2/examples/librispeech/run_infer.sh
@@ -1,14 +1,14 @@
 #! /usr/bin/env bash
 
-pushd ../.. > /dev/null
+cd ../.. > /dev/null
 
 # download language model
-pushd models/lm > /dev/null
+cd models/lm > /dev/null
 sh download_lm_en.sh
 if [ $? -ne 0 ]; then
     exit 1
 fi
-popd > /dev/null
+cd - > /dev/null
 
 
 # infer
diff --git a/deep_speech_2/examples/librispeech/run_infer_golden.sh b/deep_speech_2/examples/librispeech/run_infer_golden.sh
@@ -1,23 +1,23 @@
 #! /usr/bin/env bash
 
-pushd ../.. > /dev/null
+cd ../.. > /dev/null
 
 # download language model
-pushd models/lm > /dev/null
+cd models/lm > /dev/null
 sh download_lm_en.sh
 if [ $? -ne 0 ]; then
     exit 1
 fi
-popd > /dev/null
+cd - > /dev/null
 
 
 # download well-trained model
-pushd models/librispeech > /dev/null
+cd models/librispeech > /dev/null
 sh download_model.sh
 if [ $? -ne 0 ]; then
     exit 1
 fi
-popd > /dev/null
+cd - > /dev/null
 
 
 # infer
diff --git a/deep_speech_2/examples/librispeech/run_test.sh b/deep_speech_2/examples/librispeech/run_test.sh
@@ -1,14 +1,14 @@
 #! /usr/bin/env bash
 
-pushd ../.. > /dev/null
+cd ../.. > /dev/null
 
 # download language model
-pushd models/lm > /dev/null
+cd models/lm > /dev/null
 sh download_lm_en.sh
 if [ $? -ne 0 ]; then
     exit 1
 fi
-popd > /dev/null
+cd - > /dev/null
 
 
 # evaluate model
diff --git a/deep_speech_2/examples/librispeech/run_test_golden.sh b/deep_speech_2/examples/librispeech/run_test_golden.sh
@@ -1,23 +1,23 @@
 #! /usr/bin/env bash
 
-pushd ../.. > /dev/null
+cd ../.. > /dev/null
 
 # download language model
-pushd models/lm > /dev/null
+cd models/lm > /dev/null
 sh download_lm_en.sh
 if [ $? -ne 0 ]; then
     exit 1
 fi
-popd > /dev/null
+cd - > /dev/null
 
 
 # download well-trained model
-pushd models/librispeech > /dev/null
+cd models/librispeech > /dev/null
 sh download_model.sh
 if [ $? -ne 0 ]; then
     exit 1
 fi
-popd > /dev/null
+cd - > /dev/null
 
 
 # evaluate model
diff --git a/deep_speech_2/examples/librispeech/run_train.sh b/deep_speech_2/examples/librispeech/run_train.sh
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-pushd ../.. > /dev/null
+cd ../.. > /dev/null
 
 # train model
 # if you wish to resume from an exists model, uncomment --init_model_path
diff --git a/deep_speech_2/examples/librispeech/run_tune.sh b/deep_speech_2/examples/librispeech/run_tune.sh
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-pushd ../.. > /dev/null
+cd ../.. > /dev/null
 
 # grid-search for hyper-parameters in language model
 CUDA_VISIBLE_DEVICES=0,1,2,3 \
diff --git a/deep_speech_2/examples/mandarin/run_demo_client.sh b/deep_speech_2/examples/mandarin/run_demo_client.sh
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-pushd ../.. > /dev/null
+cd ../.. > /dev/null
 
 # start demo client
 CUDA_VISIBLE_DEVICES=0 \
diff --git a/deep_speech_2/examples/mandarin/run_demo_server.sh b/deep_speech_2/examples/mandarin/run_demo_server.sh
@@ -1,24 +1,24 @@
 #! /usr/bin/env bash
 # TODO: replace the model with a mandarin model
 
-pushd ../.. > /dev/null
+cd ../.. > /dev/null
 
 # download language model
-pushd models/lm > /dev/null
+cd models/lm > /dev/null
 sh download_lm_en.sh
 if [ $? -ne 0 ]; then
     exit 1
 fi
-popd > /dev/null
+cd - > /dev/null
 
 
 # download well-trained model
-pushd models/librispeech > /dev/null
+cd models/librispeech > /dev/null
 sh download_model.sh
 if [ $? -ne 0 ]; then
     exit 1
 fi
-popd > /dev/null
+cd - > /dev/null
 
 
 # start demo server
diff --git a/deep_speech_2/examples/tiny/run_data.sh b/deep_speech_2/examples/tiny/run_data.sh
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-pushd ../.. > /dev/null
+cd ../.. > /dev/null
 
 # prepare folder
 if [ ! -e data/tiny ]; then
diff --git a/deep_speech_2/examples/tiny/run_infer.sh b/deep_speech_2/examples/tiny/run_infer.sh
@@ -1,14 +1,14 @@
 #! /usr/bin/env bash
 
-pushd ../.. > /dev/null
+cd ../.. > /dev/null
 
 # download language model
-pushd models/lm > /dev/null
+cd models/lm > /dev/null
 sh download_lm_en.sh
 if [ $? -ne 0 ]; then
     exit 1
 fi
-popd > /dev/null
+cd - > /dev/null
 
 
 # infer
diff --git a/deep_speech_2/examples/tiny/run_infer_golden.sh b/deep_speech_2/examples/tiny/run_infer_golden.sh
@@ -1,23 +1,23 @@
 #! /usr/bin/env bash
 
-pushd ../.. > /dev/null
+cd ../.. > /dev/null
 
 # download language model
-pushd models/lm > /dev/null
+cd models/lm > /dev/null
 sh download_lm_en.sh
 if [ $? -ne 0 ]; then
     exit 1
 fi
-popd > /dev/null
+cd - > /dev/null
 
 
 # download well-trained model
-pushd models/librispeech > /dev/null
+cd models/librispeech > /dev/null
 sh download_model.sh
 if [ $? -ne 0 ]; then
     exit 1
 fi
-popd > /dev/null
+cd - > /dev/null
 
 
 # infer
diff --git a/deep_speech_2/examples/tiny/run_test.sh b/deep_speech_2/examples/tiny/run_test.sh
@@ -1,14 +1,14 @@
 #! /usr/bin/env bash
 
-pushd ../.. > /dev/null
+cd ../.. > /dev/null
 
 # download language model
-pushd models/lm > /dev/null
+cd models/lm > /dev/null
 sh download_lm_en.sh
 if [ $? -ne 0 ]; then
     exit 1
 fi
-popd > /dev/null
+cd - > /dev/null
 
 
 # evaluate model
diff --git a/deep_speech_2/examples/tiny/run_test_golden.sh b/deep_speech_2/examples/tiny/run_test_golden.sh
@@ -1,23 +1,23 @@
 #! /usr/bin/env bash
 
-pushd ../.. > /dev/null
+cd ../.. > /dev/null
 
 # download language model
-pushd models/lm > /dev/null
+cd models/lm > /dev/null
 sh download_lm_en.sh
 if [ $? -ne 0 ]; then
     exit 1
 fi
-popd > /dev/null
+cd - > /dev/null
 
 
 # download well-trained model
-pushd models/librispeech > /dev/null
+cd models/librispeech > /dev/null
 sh download_model.sh
 if [ $? -ne 0 ]; then
     exit 1
 fi
-popd > /dev/null
+cd - > /dev/null
 
 
 # evaluate model
diff --git a/deep_speech_2/examples/tiny/run_train.sh b/deep_speech_2/examples/tiny/run_train.sh
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-pushd ../.. > /dev/null
+cd ../.. > /dev/null
 
 # train model
 # if you wish to resume from an exists model, uncomment --init_model_path
diff --git a/deep_speech_2/examples/tiny/run_tune.sh b/deep_speech_2/examples/tiny/run_tune.sh
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-pushd ../.. > /dev/null
+cd ../.. > /dev/null
 
 # grid-search for hyper-parameters in language model
 CUDA_VISIBLE_DEVICES=0,1,2,3,4,5,6,7 \
diff --git a/deep_speech_2/models/aishell/download_model.sh b/deep_speech_2/models/aishell/download_model.sh
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-source ../../utils/utility.sh
+. ../../utils/utility.sh
 
 URL='http://cloud.dlnel.org/filepub/?uuid=6c83b9d8-3255-4adf-9726-0fe0be3d0274'
 MD5=28521a58552885a81cf92a1e9b133a71
diff --git a/deep_speech_2/models/librispeech/download_model.sh b/deep_speech_2/models/librispeech/download_model.sh
@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-source ../../utils/utility.sh
+. ../../utils/utility.sh
 
 URL='http://cloud.dlnel.org/filepub/?uuid=8e3cf742-2ff3-41ce-a49d-f6158cc06a23'
 MD5=2ef08f8b608a7c555592161fc14d81a6
diff --git a/deep_speech_2/models/lm/download_lm_ch.sh b/deep_speech_2/models/lm/download_lm_ch.sh
diff --git a/deep_speech_2/models/lm/download_lm_en.sh b/deep_speech_2/models/lm/download_lm_en.sh
