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

src/nnet/nnet-convolutional-2d-component.h

@@ -20,8 +20,8 @@
 // limitations under the License.
 
 
-#ifndef KALDI_NNET_NNET_CONVOLUTIONAL2D_COMPONENT_H_
-#define KALDI_NNET_NNET_CONVOLUTIONAL2D_COMPONENT_H_
+#ifndef KALDI_NNET_NNET_CONVOLUTIONAL_2D_COMPONENT_H_
+#define KALDI_NNET_NNET_CONVOLUTIONAL_2D_COMPONENT_H_
 
 
 #include "nnet/nnet-component.h"

src/nnet/nnet-kl-hmm.h

@@ -4,6 +4,8 @@
 //                 Karlsruhe Institute of Technology (Author: Ngoc Thang Vu)
 //                 Brno University of Technology (Author: Karel Vesely)
 
+// 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/nnet/nnet-lstm-projected-streams.h

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

src/nnet2bin/nnet2-boost-silence.cc

@@ -37,8 +37,7 @@ int main(int argc, char *argv[]) {
        "It is implemented by dividing the corresponding priors by that\n"
        "factor (since we divide by the prior when we evaluate likelihoods).\n"
        "\n"
-       "Usage:\n" 
-       " nnet2-boost-silence [options] <silence-phones-list> <model-in> <model-out>\n"
+       "Usage: nnet2-boost-silence [options] <silence-phones-list> <model-in> <model-out>\n"
        "e.g.:   nnet2-boost-silence --boost=0.2 1:2:3 final.mdl final_boost.mdl\n"
        "See also: gmm-boost-silence\n";
    

src/nnetbin/nnet-kl-hmm-acc.cc

@@ -4,6 +4,8 @@
 //                 Karlsruhe Institute of Technology (Author: Ngoc Thang Vu)
 //                 Brno University of Technology (Author: Karel Vesely)
 
+// 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/nnetbin/nnet-kl-hmm-mat-to-component.cc

@@ -4,6 +4,8 @@
 //                 Karlsruhe Institute of Technology (Author: Ngoc Thang Vu)
 //                 Brno University of Technology (Author: Karel Vesely)
 
+// 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/nnetbin/nnet-kl-hmm-sum-accs.cc

@@ -4,6 +4,8 @@
 //                 Karlsruhe Institute of Technology (Author: Ngoc Thang Vu)
 //                 Brno University of Technology (Author: Karel Vesely)
 
+// 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/nnetbin/nnet-train-frmshuff.cc

@@ -2,6 +2,8 @@
 
 // Copyright 2013  Brno University of Technology (Author: Karel Vesely)
 
+// 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/nnetbin/nnet-train-lstm-streams.cc

@@ -40,9 +40,9 @@ int main(int argc, char *argv[]) {
         "This version use pdf-posterior as targets, prepared typically by ali-to-post.\n"
         "The updates are done per-utterance, shuffling options are dummy for compatibility reason.\n"
         "\n"
-        "Usage:  bd-nnet-train-lstm-streams [options] <feature-rspecifier> <targets-rspecifier> <model-in> [<model-out>]\n"
+        "Usage: nnet-train-lstm-streams [options] <feature-rspecifier> <targets-rspecifier> <model-in> [<model-out>]\n"
         "e.g.: \n"
-        " bd-nnet-train-lstm-streams scp:feature.scp ark:posterior.ark nnet.init nnet.iter1\n";
+        " nnet-train-lstm-streams scp:feature.scp ark:posterior.ark nnet.init nnet.iter1\n";
 
     ParseOptions po(usage);
 

src/nnetbin/nnet-train-perutt.cc

@@ -2,6 +2,8 @@
 
 // Copyright 2011-2014  Brno University of Technology (Author: Karel Vesely)
 
+// 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/onlinebin/online-audio-server-decode-faster.cc

@@ -81,7 +81,7 @@ int32 main(int argc, char *argv[]) {
     const char *usage =
         "Starts a TCP server that receives RAW audio and outputs aligned words.\n"
             "A sample client can be found in: onlinebin/online-audio-client\n\n"
-            "Usage: ./online-audio-server-decode-faster [options] model-in "
+            "Usage: online-audio-server-decode-faster [options] model-in "
             "fst-in word-symbol-table silence-phones word_boundary_file tcp-port [lda-matrix-in]\n\n"
             "example: online-audio-server-decode-faster --verbose=1 --rt-min=0.5 --rt-max=3.0 --max-active=6000\n"
             "--beam=72.0 --acoustic-scale=0.0769 final.mdl graph/HCLG.fst graph/words.txt '1:2:3:4:5'\n"