trunk: some minor fixes and extensions to librispeech scripts.

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

egs/librispeech/s5/local/nnet2/run_5a_clean_100.sh

@@ -59,15 +59,15 @@ fi
 for test in test_clean test_other dev_clean dev_other; do
   steps/nnet2/decode.sh --nj 20 --cmd "$decode_cmd" \
     --transform-dir exp/tri4b/decode_tgsmall_$test \
-    exp/tri4b/graph_pp_tgsmall data/$test $dir/decode_pp_tgsmall_$test || exit 1;
-  steps/lmrescore.sh --cmd "$decode_cmd" data/lang_pp_test_{tgsmall,tgmed} \
-    data/$test $dir/decode_pp_{tgsmall,tgmed}_$test  || exit 1;
+    exp/tri4b/graph_tgsmall data/$test $dir/decode_tgsmall_$test || exit 1;
+  steps/lmrescore.sh --cmd "$decode_cmd" data/lang_test_{tgsmall,tgmed} \
+    data/$test $dir/decode_{tgsmall,tgmed}_$test  || exit 1;
   steps/lmrescore_const_arpa.sh \
-    --cmd "$decode_cmd" data/lang_pp_test_{tgsmall,tglarge} \
-    data/$test $dir/decode_pp_{tgsmall,tglarge}_$test || exit 1;
+    --cmd "$decode_cmd" data/lang_test_{tgsmall,tglarge} \
+    data/$test $dir/decode_{tgsmall,tglarge}_$test || exit 1;
   steps/lmrescore_const_arpa.sh \
-    --cmd "$decode_cmd" data/lang_pp_test_{tgsmall,fglarge} \
-    data/$test $dir/decode_pp_{tgsmall,fglarge}_$test || exit 1;
+    --cmd "$decode_cmd" data/lang_test_{tgsmall,fglarge} \
+    data/$test $dir/decode_{tgsmall,fglarge}_$test || exit 1;
 done
 
 exit 0;

egs/librispeech/s5/local/online/run_nnet2.sh

@@ -147,12 +147,11 @@ if [ $stage -le 13 ]; then
   done
 fi
 
-#exit 0;
+exit 0;
 ###### Comment out the "exit 0" above to run the multi-threaded decoding. #####
 
 if [ $stage -le 14 ]; then
   # Demonstrate the multi-threaded decoding.
-  # put back the pp
   test=dev_clean
   steps/online/nnet2/decode.sh --threaded true \
     --config conf/decode.config --cmd "$decode_cmd" --nj 30 \
@@ -162,12 +161,11 @@ fi
 
 if [ $stage -le 15 ]; then
   # Demonstrate the multi-threaded decoding with endpointing.
-  # put back the pp
   test=dev_clean
   steps/online/nnet2/decode.sh --threaded true --do-endpointing true \
     --config conf/decode.config --cmd "$decode_cmd" --nj 30 \
-    --per-utt true exp/tri6b/graph_tgsmall data/$test \
-    ${dir}_online/decode_${test}_tgsmall_utt_threaded_ep || exit 1;
+    --per-utt true exp/tri6b/graph_pp_tgsmall data/$test \
+    ${dir}_online/decode_pp_${test}_tgsmall_utt_threaded_ep || exit 1;
 fi
 
 exit 0;

egs/librispeech/s5/local/online/run_nnet2_ms.sh

@@ -168,4 +168,25 @@ if [ $stage -le 13 ]; then
   done
 fi
 
+#exit 0;
+###### Comment out the "exit 0" above to run the multi-threaded decoding. #####
+
+if [ $stage -le 14 ]; then
+  # Demonstrate the multi-threaded decoding.
+  test=dev_clean
+  steps/online/nnet2/decode.sh --threaded true \
+    --config conf/decode.config --cmd "$decode_cmd" --nj 30 \
+    --per-utt true exp/tri6b/graph_pp_tgsmall data/$test \
+    ${dir}_online/decode_pp_${test}_tgsmall_utt_threaded || exit 1;
+fi
+
+if [ $stage -le 15 ]; then
+  # Demonstrate the multi-threaded decoding with endpointing.
+  test=dev_clean
+  steps/online/nnet2/decode.sh --threaded true --do-endpointing true \
+    --config conf/decode.config --cmd "$decode_cmd" --nj 30 \
+    --per-utt true exp/tri6b/graph_pp_tgsmall data/$test \
+    ${dir}_online/decode_pp_${test}_tgsmall_utt_threaded_ep || exit 1;
+fi
+
 exit 0;