trunk: minor fixes to librispeech recipe; various cosmetic changes to usage messages etc.

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

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

@@ -68,6 +68,9 @@ for test in dev_clean dev_other; do
     exp/tri6b/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_test_{tgsmall,tglarge} \
+    data/$test exp/tri6b/decode_{tgsmall,tglarge}_$test || exit 1;
 done
 
 exit 0;

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

@@ -188,7 +188,7 @@ if [ $stage -le 11 ]; then
       data/$test ${dir}_online/decode_${test}_{tgsmall,tgmed}  || exit 1;
     steps/lmrescore_const_arpa.sh \
       --cmd "$decode_cmd" data/lang_test_{tgsmall,tglarge} \
-      data/$test $dir_online/decode_${test}_{tgsmall,tglarge} || exit 1;
+      data/$test ${dir}_online/decode_${test}_{tgsmall,tglarge} || exit 1;
   done
 fi
 
@@ -218,7 +218,7 @@ if [ $stage -le 13 ]; then
       data/$test ${dir}_online/decode_${test}_{tgsmall,tgmed}_utt_offline  || exit 1;
     steps/lmrescore_const_arpa.sh \
       --cmd "$decode_cmd" data/lang_test_{tgsmall,tglarge} \
-      data/$test $dir_online/decode_${test}_{tgsmall,tglarge}_utt_offline || exit 1;
+      data/$test ${dir}_online/decode_${test}_{tgsmall,tglarge}_utt_offline || exit 1;
   done
 fi
 

egs/librispeech/s5/run.sh

@@ -264,3 +264,5 @@ local/nnet2/run_7a_960.sh || exit 1
 ## train models on cleaned-up data
 ## we've found that this isn't helpful-- see the comments in local/run_data_cleaning.sh
 #local/run_data_cleaning.sh
+
+# local/online/run_nnet2.sh

src/latbin/lattice-align-phones.cc

@@ -35,8 +35,7 @@ int main(int argc, char *argv[]) {
         "phones.  The output symbols are still words, unless you specify --replace-output-symbols=true\n"
         "Usage: lattice-align-phones [options] <model> <lattice-rspecifier> <lattice-wspecifier>\n"
         " e.g.: lattice-align-phones final.mdl ark:1.lats ark:phone_aligned.lats\n"
-        "Note: word-boundary file has format (on each line):\n"
-        "<integer-phone-id> [begin|end|singleton|internal|nonword]\n";
+        "See also: lattice-to-phone-lattice, lattice-align-words, lattice-align-words-lexicon\n";
     
     ParseOptions po(usage);
     bool output_if_error = true;

src/latbin/lattice-to-phone-lattice.cc

@@ -38,9 +38,14 @@ int main(int argc, char *argv[]) {
         "Convert the words or transition-ids into phones, which are worked out\n"
         "from the transition-ids.  If --replace-words=true (true by default),\n"
         "replaces the words with phones, otherwise replaces the transition-ids.\n"
+        "If --replace-words=false, it will preserve the alignment of transition-ids/phones\n"
+        "to words, so that if you do \n"
+        "lattice-align-words | lattice-to-phone-lattice --replace-words=false,\n"
+        "you can get the phones corresponding to each word in the lattice.\n"
         "\n"
         "Usage: lattice-to-phone-lattice [options] model lattice-rspecifier lattice-wspecifier\n"
-        " e.g.: lattice-to-phone-lattice 1.mdl ark:1.lats ark:phones.lats\n";
+        " e.g.: lattice-to-phone-lattice 1.mdl ark:1.lats ark:phones.lats\n"
+        "See also: lattice-align-words, lattice-align-phones\n";
       
     ParseOptions po(usage);
     bool replace_words = true;

src/matrix/kaldi-matrix.cc

@@ -1610,7 +1610,6 @@ void MatrixBase<Real>::TestUninitialized() const {
 template<typename Real>
 bool MatrixBase<Real>::IsUnit(Real cutoff) const {
   MatrixIndexT R = num_rows_, C = num_cols_;
-  // if (R != C) return false;
   Real bad_max = 0.0;
   for (MatrixIndexT i = 0; i < R;i++)
     for (MatrixIndexT j = 0; j < C;j++)

src/matrix/kaldi-matrix.h

@@ -381,8 +381,10 @@ class MatrixBase {
   /// Returns true if matrix is Diagonal.
   bool IsDiagonal(Real cutoff = 1.0e-05) const;  // replace magic number
 
-  /// returns true if matrix is all zeros, but ones on diagonal
-  /// (not necessarily square).
+  /// Returns true if the matrix is all zeros, except for ones on diagonal.  (it
+  /// does not have to be square).  More specifically, this function returns
+  /// false if for any i, j, (*this)(i, j) differs by more than cutoff from the
+  /// expression (i == j ? 1 : 0).
   bool IsUnit(Real cutoff = 1.0e-05) const;     // replace magic number
 
   /// Returns true if matrix is all zeros.

src/nnet2/nnet-nnet.cc

@@ -658,7 +658,9 @@ void Nnet::Collapse(bool match_updatableness) {
   }
   this->SetIndexes();
   this->Check();
-  KALDI_LOG << "Collapsed " << num_collapsed << " components.";
+  KALDI_LOG << "Collapsed " << num_collapsed << " components."
+            << (num_collapsed == 0 && match_updatableness == true ?
+                "  Try --match-updatableness=false." : "");
 }
 
 Nnet *GenRandomNnet(int32 input_dim,