Fixing various minor cosmetic issues; adding some scripts for this in misc/maintenance/.

src/featbin/compute-and-process-kaldi-pitch-feats.cc

@@ -3,6 +3,8 @@
 // Copyright 2013        Pegah Ghahremani
 //           2013-2014   Johns Hopkins University (author: Daniel Povey)
 //
+// See ../../COPYING for clarification regarding multiple authors
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

src/featbin/compute-kaldi-pitch-feats.cc

@@ -3,6 +3,8 @@
 // Copyright 2013        Pegah Ghahremani
 //           2013-2014   Johns Hopkins University (author: Daniel Povey)
 //
+// See ../../COPYING for clarification regarding multiple authors
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

src/featbin/copy-feats-to-sphinx.cc

@@ -2,6 +2,8 @@
 
 // Copyright 2013   Petr Motlicek
 
+// See ../../COPYING for clarification regarding multiple authors
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

src/featbin/process-kaldi-pitch-feats.cc

@@ -4,6 +4,8 @@
 //                  Johns Hopkins University (author: Daniel Povey)
 //           2014   IMSL, PKU-HKUST (author: Wei Shi)
 //
+// See ../../COPYING for clarification regarding multiple authors
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

src/fgmmbin/fgmm-global-info.cc

@@ -30,9 +30,9 @@ int main(int argc, char *argv[]) {
     const char *usage =
         "Write to standard output various properties of full-covariance GMM model\n"
         "This is for a single mixture of Gaussians, e.g. as used for a UBM.\n"
-        "Usage:  gmm-info [options] <gmm>\n"
+        "Usage:  fgmm-global-info [options] <gmm>\n"
         "e.g.:\n"
-        " fgmm-info 1.ubm\n";
+        " fgmm-global-info 1.ubm\n";
     
     ParseOptions po(usage);
     

src/fgmmbin/fgmm-gselect.cc

@@ -34,8 +34,7 @@ int main(int argc, char *argv[]) {
         " For each frame, gives a list of the n best Gaussian indices,\n"
         " sorted from best to worst.\n"
         "See also: gmm-gselect, copy-gselect, fgmm-gselect-to-post\n"
-        "Usage: \n"
-        " fgmm-gselect [options] <model-in> <feature-rspecifier> <gselect-wspecifier>\n"
+        "Usage: fgmm-gselect [options] <model-in> <feature-rspecifier> <gselect-wspecifier>\n"
         "The --gselect option (which takes an rspecifier) limits selection to a subset\n"
         "of indices:\n"
         "e.g.: fgmm-gselect \"--gselect=ark:gunzip -c bigger.gselect.gz|\" --n=20 1.gmm \"ark:feature-command |\" \"ark,t:|gzip -c >1.gselect.gz\"\n";

src/gmmbin/gmm-decode-nbest.cc

@@ -74,8 +74,7 @@ int main(int argc, char *argv[]) {
       "Note: this program was mainly intended to validate the lattice generation\n"
       "algorithm and is not very useful; in general, processing the\n"
       "lattices into n-best lists will be more efficient.\n"
-      "Usage:\n"
-      " gmm-decode-nbest [options] <model-in> <fst-in> <features-rspecifier> "
+      "Usage: gmm-decode-nbest [options] <model-in> <fst-in> <features-rspecifier> "
         "<nbest-lattice-wspecifier> <words-wspecifier> [<alignments-wspecifier>]\n";
     ParseOptions po(usage);
     bool allow_partial = true;

src/gmmbin/gmm-global-get-post.cc

@@ -36,8 +36,7 @@ int main(int argc, char *argv[]) {
         " (e.g. in training UBMs, SGMMs, tied-mixture systems)\n"
         " For each frame, gives a list of the n best Gaussian indices,\n"
         " sorted from best to worst.\n"
-        "Usage: \n"
-        " gmm-global-get-post [options] <model-in> <feature-rspecifier> <post-wspecifier>\n"
+        "Usage: gmm-global-get-post [options] <model-in> <feature-rspecifier> <post-wspecifier>\n"
         "e.g.: gmm-global-get-post --n=20 1.gmm \"ark:feature-command |\" \"ark,t:|gzip -c >post.1.gz\"\n";
     
     ParseOptions po(usage);

src/gmmbin/gmm-global-init-from-feats.cc

@@ -92,8 +92,8 @@ int main(int argc, char *argv[]) {
     const char *usage =
         "This program initializes a single diagonal GMM and does multiple iterations of\n"
         "training from features stored in memory.\n"
-        "Usage:  gmm-global-init-feats [options] <feature-rspecifier> <model-out>\n"
-        "e.g.: gmm-global-init-feats scp:train.scp 1.mdl\n";
+        "Usage:  gmm-global-init-from-feats [options] <feature-rspecifier> <model-out>\n"
+        "e.g.: gmm-global-init-from-feats scp:train.scp 1.mdl\n";
 
     ParseOptions po(usage);
     MleDiagGmmOptions gmm_opts;

src/gmmbin/gmm-gselect.cc

@@ -36,8 +36,7 @@ int main(int argc, char *argv[]) {
         " sorted from best to worst.\n"
         "See also: gmm-global-get-post, fgmm-global-gselect-to-post,\n"
         "copy-gselect, fgmm-gselect\n"
-        "Usage: \n"
-        " gmm-gselect [options] <model-in> <feature-rspecifier> <gselect-wspecifier>\n"
+        "Usage: gmm-gselect [options] <model-in> <feature-rspecifier> <gselect-wspecifier>\n"
         "The --gselect option (which takes an rspecifier) limits selection to a subset\n"
         "of indices:\n"
         "e.g.: gmm-gselect \"--gselect=ark:gunzip -c bigger.gselect.gz|\" --n=20 1.gmm \"ark:feature-command |\" \"ark,t:|gzip -c >gselect.1.gz\"\n";

src/gmmbin/gmm-latgen-faster-regtree-fmllr.cc

@@ -4,6 +4,8 @@
 //           2012-2013  Johns Hopkins University (author: Daniel Povey)
 //                2014  Alpha Cephei Inc.
 
+// See ../../COPYING for clarification regarding multiple authors
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

src/ivector/ivector-extractor-test.cc

@@ -2,6 +2,8 @@
 
 // Copyright 2013  Daniel Povey
 
+// See ../../COPYING for clarification regarding multiple authors
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

src/ivector/ivector-extractor.cc

@@ -2,6 +2,8 @@
 
 // Copyright 2013     Daniel Povey
 
+// See ../../COPYING for clarification regarding multiple authors
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

src/ivector/ivector-extractor.h

@@ -3,6 +3,8 @@
 // Copyright 2013-2014    Daniel Povey
 
 
+// See ../../COPYING for clarification regarding multiple authors
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

src/ivector/plda-test.cc

@@ -2,6 +2,8 @@
 
 // Copyright 2013  Daniel Povey
 
+// See ../../COPYING for clarification regarding multiple authors
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

src/ivector/plda.cc

@@ -3,6 +3,8 @@
 // Copyright 2013     Daniel Povey
 //           2015     David Snyder
 
+// See ../../COPYING for clarification regarding multiple authors
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

src/ivector/plda.h

@@ -4,6 +4,8 @@
 //           2015    David Snyder
 
 
+// See ../../COPYING for clarification regarding multiple authors
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at

src/kws/kaldi-kws.h

@@ -18,8 +18,8 @@
 // limitations under the License.
 
 
-#ifndef KALDI_LAT_KALDI_KWS_H_
-#define KALDI_LAT_KALDI_KWS_H_
+#ifndef KALDI_KWS_KALDI_KWS_H_
+#define KALDI_KWS_KALDI_KWS_H_
 
 #include "fst/fstlib.h"
 #include "lat/arctic-weight.h"
@@ -50,4 +50,4 @@ typedef fst::VectorFst<KwsProductArc> KwsProductFst;
 
 
 }  // namespace kaldi
-#endif  // KALDI_LAT_KALDI_KWS_H_
+#endif  // KALDI_KWS_KALDI_KWS_H_

src/kws/kws-functions.h

@@ -18,8 +18,8 @@
 // limitations under the License.
 
 
-#ifndef KALDI_LAT_KWS_FUNCTIONS_H_
-#define KALDI_LAT_KWS_FUNCTIONS_H_
+#ifndef KALDI_KWS_KWS_FUNCTIONS_H_
+#define KALDI_KWS_KWS_FUNCTIONS_H_
 
 #include "lat/kaldi-lattice.h"
 #include "kws/kaldi-kws.h"
@@ -112,4 +112,4 @@ void MaybeDoSanityCheck(const KwsLexicographicFst &index_transducer);
 } // namespace kaldi
 
 
-#endif  // KALDI_LAT_KWS_FUNCTIONS_H_
+#endif  // KALDI_KWS_KWS_FUNCTIONS_H_

src/nnet/nnet-blstm-projected-streams.h

@@ -19,8 +19,8 @@
 
 
 
-#ifndef KALDI_NNET_BLSTM_PROJECTED_STREAMS_H_
-#define KALDI_NNET_BLSTM_PROJECTED_STREAMS_H_
+#ifndef KALDI_NNET_NNET_BLSTM_PROJECTED_STREAMS_H_
+#define KALDI_NNET_NNET_BLSTM_PROJECTED_STREAMS_H_
 
 #include "nnet/nnet-component.h"
 #include "nnet/nnet-utils.h"