Merge remote-tracking branch 'upstream/master' into kaldi_52

danpovey · danpovey · commit 868c044316f7 · 2017-05-01T13:55:10.000-04:00
diff --git a/egs/ami/s5/run_ihm.sh b/egs/ami/s5/run_ihm.sh
@@ -30,7 +30,7 @@ LM=$final_lm.pr1-7
 # Avoiding re-download, using 'wget --continue ...',
 if [ $stage -le 0 ]; then
   [ -e data/local/downloads/wget_${mic}.sh ] && \
-    echo "$data/local/downloads/wget_${mic}.sh already exists, better quit than re-download... (use --stage N)" && \
+    echo "data/local/downloads/wget_${mic}.sh already exists, better quit than re-download... (use --stage N)" && \
     exit 1
   local/ami_download.sh $mic $AMI_DIR
 fi
diff --git a/egs/mini_librispeech/s5/local/nnet3/run_tdnn_lstm.sh b/egs/mini_librispeech/s5/local/nnet3/run_tdnn_lstm.sh
@@ -0,0 +1 @@
+tuning/run_tdnn_lstm_1b.sh
diff --git a/egs/wsj/s5/run.sh b/egs/wsj/s5/run.sh
@@ -130,7 +130,7 @@ if [ $stage -le 2 ]; then
       # This is just confirming they're equivalent.
       for mode in 1 2 3 4; do
         steps/lmrescore.sh --mode $mode --cmd "$decode_cmd" \
-          data/lang_nosp_test_{tgpr,tg} data/test_dev93 \
+          data/lang_nosp_test_{tgpr,tg} data/test_${data} \
           exp/tri1/decode_nosp_tgpr_${data} \
           exp/tri1/decode_nosp_tgpr_${data}_tg$mode  || exit 1;
       done
diff --git a/src/bin/compute-wer-bootci.cc b/src/bin/compute-wer-bootci.cc
@@ -116,10 +116,10 @@ void GetBootstrapWERInterval(
       BaseFloat *mean, BaseFloat *interval) {
     BaseFloat wer_accum = 0.0, wer_mult_accum = 0.0;
 
-    for (int32 i = 0; i <= replications; ++i) {
+    for (int32 i = 0; i < replications; ++i) {
       int32 num_words = 0, word_errs = 0;
-      for (int32 j = 0; j <= edit_word_per_hyp.size(); ++j) {
-        int32 random_pos = kaldi::RandInt(0, edit_word_per_hyp.size());
+      for (int32 j = 0; j < edit_word_per_hyp.size(); ++j) {
+        int32 random_pos = kaldi::RandInt(0, edit_word_per_hyp.size() - 1);
         word_errs += edit_word_per_hyp[random_pos].first;
         num_words += edit_word_per_hyp[random_pos].second;
         }
@@ -140,10 +140,10 @@ void GetBootstrapWERTwoSystemComparison(
       int32 replications, BaseFloat *p_improv) {
     int32 improv_accum = 0.0;
 
-    for (int32 i = 0; i <= replications; ++i) {
+    for (int32 i = 0; i < replications; ++i) {
       int32 word_errs = 0;
-      for (int32 j = 0; j <= edit_word_per_hyp.size(); ++j) {
-        int32 random_pos = kaldi::RandInt(0, edit_word_per_hyp.size());
+      for (int32 j = 0; j < edit_word_per_hyp.size(); ++j) {
+        int32 random_pos = kaldi::RandInt(0, edit_word_per_hyp.size() - 1);
         word_errs += edit_word_per_hyp[random_pos].first -
                         edit_word_per_hyp2[random_pos].first;
         }
diff --git a/tools/extras/check_dependencies.sh b/tools/extras/check_dependencies.sh
@@ -122,14 +122,6 @@ if which apt-get >&/dev/null && ! which zypper >/dev/null; then
     echo " sudo apt-get install libatlas3-base"
     printed=true
   fi
-  # Debian systems generally link /bin/sh to dash, which doesn't work
-  # with some scripts as it doesn't expand x.{1,2}.y to x.1.y x.2.y
-  if [ "$(readlink /bin/sh)" == "dash" ]; then
-    echo "/bin/sh is linked to dash, and currently some of the scripts will not run"
-    echo "properly.  We recommend to run:"
-    echo " sudo ln -s -f bash /bin/sh"
-    printed=true
-  fi
 fi
 
 if which yum >&/dev/null; then
