Several unrelated small fixes, mostly cosmetic.

danpovey · danpovey · commit 475df25ea025 · 2016-08-07T14:26:36.000-07:00
diff --git a/egs/wsj/s5/local/run_sgmm2.sh b/egs/wsj/s5/local/run_sgmm2.sh
@@ -36,6 +36,8 @@
   steps/train_mmi_sgmm2.sh --cmd "$decode_cmd" --transform-dir exp/tri4b_ali_si84 --boost 0.1 \
     data/train_si84 data/lang exp/sgmm2_5a_ali_si84 exp/sgmm2_5a_denlats_si84 exp/sgmm2_5a_mmi_b0.1
 
+  wait
+
   for iter in 1 2 3 4; do
     steps/decode_sgmm2_rescore.sh --cmd "$decode_cmd" --iter $iter \
       --transform-dir exp/tri4b/decode_tgpr_dev93 data/lang_test_tgpr data/test_dev93 exp/sgmm2_5a/decode_tgpr_dev93 \
@@ -88,14 +90,14 @@
      exp/ubm5b/final.ubm exp/sgmm2_5c || exit 1;
    # Decode from lattices in exp/sgmm2_5b
     steps/decode_sgmm2_fromlats.sh --cmd "$decode_cmd"  --transform-dir exp/tri4b/decode_tgpr_dev93 \
-       data/test_dev93 data/lang_test_tgpr exp/sgmm2_5b/decode_tgpr_dev93 exp/sgmm2_5c/decode_tgpr_dev93 
+       data/test_dev93 data/lang_test_tgpr exp/sgmm2_5b/decode_tgpr_dev93 exp/sgmm2_5c/decode_tgpr_dev93
     steps/decode_sgmm2_fromlats.sh --cmd "$decode_cmd"  --transform-dir exp/tri4b/decode_tgpr_eval92 \
-       data/test_eval92 data/lang_test_tgpr exp/sgmm2_5b/decode_tgpr_eval92 exp/sgmm2_5c/decode_tgpr_eval92 
+       data/test_eval92 data/lang_test_tgpr exp/sgmm2_5b/decode_tgpr_eval92 exp/sgmm2_5c/decode_tgpr_eval92
   ) &
 
 
   steps/align_sgmm2.sh --nj 30 --cmd "$train_cmd" --transform-dir exp/tri4b_ali_si284 \
-    --use-graphs true --use-gselect true data/train_si284 data/lang exp/sgmm2_5b exp/sgmm2_5b_ali_si284 
+    --use-graphs true --use-gselect true data/train_si284 data/lang exp/sgmm2_5b exp/sgmm2_5b_ali_si284
 
   steps/make_denlats_sgmm2.sh --nj 30 --sub-split 30 --cmd "$decode_cmd" --transform-dir exp/tri4b_ali_si284 \
     data/train_si284 data/lang exp/sgmm2_5b_ali_si284 exp/sgmm2_5b_denlats_si284
@@ -128,7 +130,7 @@ wait
 
 # Examples of combining some of the best decodings: SGMM+MMI with
 # MMI+fMMI on a conventional system.
- 
+
 local/score_combine.sh data/test_eval92 \
    data/lang_test_bd_tgpr \
    exp/tri4b_fmmi_a/decode_tgpr_eval92_it8 \
diff --git a/egs/wsj/s5/steps/cleanup/combine_short_segments.py b/egs/wsj/s5/steps/cleanup/combine_short_segments.py
@@ -225,7 +225,7 @@ def WriteCombinedDirFiles(output_dir, utt2spk, spk2utt, text, feat, utt2dur, utt
             # of data however if perturbation changes the length of the utterance
             # (e.g. speed perturbation) the utterance combinations in each
             # perturbation of the original recording can be very different. So there
-            # is no good way to find the utt2uniq mappinng so that we can avoid
+            # is no good way to find the utt2uniq mapping so that we can avoid
             # overlap.
             utt2uniq[new_utt_name] = combined_uniqs[0]
 
diff --git a/egs/wsj/s5/utils/combine_data.sh b/egs/wsj/s5/utils/combine_data.sh
@@ -2,9 +2,11 @@
 # Copyright 2012  Johns Hopkins University (Author: Daniel Povey).  Apache 2.0.
 #           2014  David Snyder
 
-# This script operates on a data directory, such as in data/train/.
-# See http://kaldi-asr.org/doc/data_prep.html#data_prep_data
-# for what these directories contain.
+# This script combines the data from multiple source directories into
+# a single destination directory.
+
+# See http://kaldi-asr.org/doc/data_prep.html#data_prep_data for information
+# about what these directories contain.
 
 # Begin configuration section.
 extra_files= # specify addtional files in 'src-data-dir' to merge, ex. "file1 file2 ..."
diff --git a/src/nnet3/nnet-training.h b/src/nnet3/nnet-training.h
@@ -47,8 +47,8 @@ struct NnetTrainerOptions {
       store_component_stats(true),
       print_interval(100),
       debug_computation(false),
-      binary_write_cache(true),
       momentum(0.0),
+      binary_write_cache(true),
       max_param_change(2.0) { }
   void Register(OptionsItf *opts) {
     opts->Register("store-component-stats", &store_component_stats,
diff --git a/tools/Makefile b/tools/Makefile
@@ -114,7 +114,8 @@ sctk/.configured: sctk
 
 .PHONY: sctk
 sctk: sctk-2.4.10-20151007-1312Z.tar.bz2
-	tar xojf sctk-2.4.10-20151007-1312Z.tar.bz2
+	tar xojf sctk-2.4.10-20151007-1312Z.tar.bz2 || \
+      tar --exclude '*NONE*html' -xvojf sctk-2.4.10-20151007-1312Z.tar.bz2
 	rm -rf sctk && ln -s sctk-2.4.10 sctk
 
 sctk-2.4.10-20151007-1312Z.tar.bz2:
