trunk: BABEL scripts: minor fixes to kaldi-bottleneck feature scripts

git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@3457 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8

egs/babel/s5b/local/kws_search.sh

@@ -41,7 +41,7 @@ set -o pipefail
 
 
 if [[ "$#" -ne "3" ]] ; then
-    echo -e "FATAL: wrong number of script parameters!\n\n"
+    echo -e "$0: FATAL: wrong number of script parameters!\n\n"
     printf "$help_message\n\n"
     exit 1;
 fi
@@ -73,20 +73,14 @@ if [ -z $indices_dir ]; then
   indices_dir=$kwsoutdir
 fi
 
-if [ ! -d "$datadir"  ] || [ ! -d "$kwsdatadir" ] ; then
-    echo "FATAL: the data directory does not exist"
-    exit 1;
-fi
-if [[ ! -d "$langdir"  ]] ; then
-    echo "FATAL: the lang directory does not exist"
-    exit 1;
-fi
-if [[ ! -d "$decodedir"  ]] ; then
-    echo "FATAL: the directory with decoded files does not exist"
+for d in "$datadir" "$kwsdatadir" "$langdir" "$decodedir"; do
+  if [ ! -d "$d" ]; then
+    echo "$0: FATAL: expected directory $d to exist"
     exit 1;
   fi
+done
 if [[ ! -f "$kwsdatadir/ecf.xml"  ]] ; then
-    echo "FATAL: the $kwsdatadir does not contain the ecf.xml file"
+    echo "$0: FATAL: the $kwsdatadir does not contain the ecf.xml file"
     exit 1;
 fi
 

egs/babel/s5b/run-8c-kaldi-bnf-dnn.sh

@@ -28,7 +28,7 @@ if [ ! exp_bnf/tri6_ali_50/.done -nt exp_bnf/tri6/.done ]; then
   echo ---------------------------------------------------------------------
   steps/align_fmllr.sh \
     --boost-silence $boost_sil --nj 50 --cmd "$train_cmd" \
-    data_bnf/train_app data/lang exp_bnf/tri5 exp_bnf/tri6_ali_50
+    data_bnf/train_app data/lang exp_bnf/tri6 exp_bnf/tri6_ali_50
   touch exp_bnf/tri6_ali_50/.done
 fi
 

egs/babel/s5b/run-8d-test-kaldi-bnf-sgmm.sh

@@ -55,6 +55,7 @@ if [ ! data_bnf/${dirid}_app/.done -nt data_bnf/${dirid}_bnf/.done ]; then
     exp_bnf/append_feats/log mfcc/ 
   steps/compute_cmvn_stats.sh --fake data_bnf/${dirid}_app exp_bnf/make_fmllr_feats mfcc
   rm -r data_bnf/${dirid}_sat
+  cp -r data/${dirid}/kws* data_bnf/${dirid}_app/
   touch data_bnf/${dirid}_app/.done
 fi
 
@@ -68,7 +69,7 @@ fi
 decode=exp_bnf/tri6/decode_${dirid}
 if [ ! -f ${decode}/.done ]; then
   echo ---------------------------------------------------------------------
-  echo "Spawning decoding with SAT models on top of bottleneck features on" `date`
+  echo "Decoding with SAT models on top of bottleneck features on" `date`
   echo ---------------------------------------------------------------------
   utils/mkgraph.sh \
     data/lang exp_bnf/tri6 exp_bnf/tri6/graph |tee exp_bnf/tri6/mkgraph.log

egs/babel/s5b/run-8e-test-kaldi-bnf-dnn.sh

@@ -55,6 +55,7 @@ if [ ! data_bnf/${dirid}_app/.done -nt data_bnf/${dirid}_bnf/.done ]; then
     exp_bnf/append_feats/log mfcc/ 
   steps/compute_cmvn_stats.sh --fake data_bnf/${dirid}_app exp_bnf/make_fmllr_feats mfcc
   rm -r data_bnf/${dirid}_sat
+  cp -r data/${dirid}/kws* data_bnf/${dirid}_app/
   touch data_bnf/${dirid}_app/.done
 fi