trunk: some cosmetic changes; ran maintenance scripts in misc/mainten…

…ance/ to fix some broken include guards and update svn:ignore and gitignore properties.

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

.gitignore

@@ -865,3 +865,9 @@
 /egs/librispeech/s5/data
 /egs/librispeech/s5/mfcc
 /egs/librispeech/s5/exp
+/src/bin/align-text
+/src/latbin/nbest-to-prons
+/src/matrix/matrix-lib-speed-test
+/src/nnet2bin/nnet-am-reinitialize
+/src/nnet2bin/nnet-train-perturbed
+/src/nnetbin/feat-to-post

egs/swbd/README.txt

@@ -19,8 +19,9 @@ About the Fisher corpus for language modeling
 Each subdirectory of this directory contains the
 scripts for a sequence of experiments.
 
-  s5: This is slightly out of date, please see s5b which
-    has been improved in various ways.
+  s5: This is slightly out of date, please see s5c
+
+  s5b: This is (somewhat less) out of date, please see s5c
+
+  s5c: This is the current recipe.
 
-  s5b: This is a cleaned-up version of s5, based on Arnab's
-    "edinburgh" recipe, but still somewhat under construction.

egs/swbd/s5/run.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Warning-- this recipe is deprecated.  See ../s5b/ for the latest recipe.
+# Warning-- this recipe is now out of date.  See ../s5c/ for the latest recipe.
 
 . cmd.sh
 

egs/swbd/s5b/run.sh

@@ -1,11 +1,11 @@
 #!/bin/bash
 
-# This recipe is based on the run_edin.sh recipe, by Arnab Ghoshal,
-# in the s5/ directory.
-# This is supposed to be the "new" version of the switchboard recipe,
-# after the s5/ one became a bit messy.  It is not 100% checked-through yet.
+# Warning: this recipe is now out of date.  See ../s5c/
+
+exit 1;
+
+
 
-#exit 1;
 # This is a shell script, but it's recommended that you run the commands one by
 # one by copying and pasting into the shell.
 # Caution: some of the graph creation steps use quite a bit of memory, so you

misc/maintenance/README.txt

@@ -15,4 +15,3 @@
 
 # also ../src/doc/cpplint.py is useful as a style checker.
 
-

misc/maintenance/gitignore.sh

@@ -1,6 +1,8 @@
 #!/bin/bash
 
-# This is really just some notes on how I updated .gitignore (at top level)
+# this script updates the .gitignore properties with the names of newly added binaries.
+
+# First, here is some notes on how I updated .gitignore (at top level)
 # using the previously listed things in the svn:ignore properties.
 
 # # we'll first get a list of all directories in svn.

src/INSTALL

@@ -12,8 +12,9 @@ make depend
 make
 
 Note that "make" takes a long time; you can speed it up by running make
-in parallel, for instance "make -j 4"
-
+in parallel if you have multiple CPUs, for instance 
+ make depend -j 8
+ make -j 8
 For more information, see documentation at http://kaldi.sf.net/
 and click on "The build process (how Kaldi is compiled)".
 

src/cudamatrix/cublas-wrappers.h

@@ -16,8 +16,8 @@
 // MERCHANTABLITY OR NON-INFRINGEMENT.
 // See the Apache 2 License for the specific language governing permissions and
 // limitations under the License.
-#ifndef KALDI_MATRIX_CUBLAS_WRAPPERS_H_
-#define KALDI_MATRIX_CUBLAS_WRAPPERS_H_ 1
+#ifndef KALDI_CUDAMATRIX_CUBLAS_WRAPPERS_H_
+#define KALDI_CUDAMATRIX_CUBLAS_WRAPPERS_H_ 1
 
 // Do not include this file directly.  It is to be included
 // by .cc files in this directory.

src/feat/online-feature.h

@@ -20,8 +20,8 @@
 // limitations under the License.
 
 
-#ifndef KALDI_ONLINE2_ONLINE_FEATURE_H_
-#define KALDI_ONLINE2_ONLINE_FEATURE_H_
+#ifndef KALDI_FEAT_ONLINE_FEATURE_H_
+#define KALDI_FEAT_ONLINE_FEATURE_H_
 
 #include <string>
 #include <vector>
@@ -540,4 +540,4 @@ class OnlineAppendFeature: public OnlineFeatureInterface {
 /// @} End of "addtogroup onlinefeat"
 }  // namespace kaldi
 
-#endif  // KALDI_ONLINE2_ONLINE_FEATURE_H_
+#endif  // KALDI_FEAT_ONLINE_FEATURE_H_

src/ivector/logistic-regression.h

@@ -17,6 +17,9 @@
 // See the Apache 2 License for the specific language governing permissions and
 // limitations under the License.
 
+#ifndef KALDI_IVECTOR_LOGISTIC_REGRESSION_H_
+#define KALDI_IVECTOR_LOGISTIC_REGRESSION_H_
+
 #include "base/kaldi-common.h"
 #include "util/common-utils.h"
 #include "matrix/matrix-lib.h"
@@ -119,3 +122,5 @@ class LogisticRegression {
 };
 
 }
+
+#endif

src/nnet/nnet-average-pooling-2d-component.h

@@ -19,8 +19,8 @@
 // limitations under the License.
 
 
-#ifndef KALDI_NNET_NNET_AVERAGE_POOLING2D_COMPONENT_H_
-#define KALDI_NNET_NNET_AVERAGE_POOLING2D_COMPONENT_H_
+#ifndef KALDI_NNET_NNET_AVERAGE_POOLING_2D_COMPONENT_H_
+#define KALDI_NNET_NNET_AVERAGE_POOLING_2D_COMPONENT_H_
 
 
 #include "nnet/nnet-component.h"

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

@@ -19,8 +19,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-max-pooling-2d-component.h

@@ -19,8 +19,8 @@
 // limitations under the License.
 
 
-#ifndef KALDI_NNET_NNET_MAX_POOLING2D_COMPONENT_H_
-#define KALDI_NNET_NNET_MAX_POOLING2D_COMPONENT_H_
+#ifndef KALDI_NNET_NNET_MAX_POOLING_2D_COMPONENT_H_
+#define KALDI_NNET_NNET_MAX_POOLING_2D_COMPONENT_H_
 
 
 #include "nnet/nnet-component.h"

src/online2/online-speex-wrapper.h

@@ -18,8 +18,8 @@
 // limitations under the License.
 
 
-#ifndef KALDI_ONLINE2_SPEEX_WRAPPER_H_
-#define KALDI_ONLINE2_SPEEX_WRAPPER_H_
+#ifndef KALDI_ONLINE2_ONLINE_SPEEX_WRAPPER_H_
+#define KALDI_ONLINE2_ONLINE_SPEEX_WRAPPER_H_
 
 #ifdef HAVE_SPEEX
   #include <speex/speex.h>
@@ -137,4 +137,4 @@ class OnlineSpeexDecoder {
 
 }  // namespace kaldi
 
-#endif  // KALDI_ONLINE2_SPEEX_WRAPPER_H_
+#endif  // KALDI_ONLINE2_ONLINE_SPEEX_WRAPPER_H_

src/online2/onlinebin-util.h

@@ -20,8 +20,8 @@
 // See the Apache 2 License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef KALDI_ONLINE_ONLINEBIN_UTIL_H_
-#define KALDI_ONLINE_ONLINEBIN_UTIL_H_
+#ifndef KALDI_ONLINE2_ONLINEBIN_UTIL_H_
+#define KALDI_ONLINE2_ONLINEBIN_UTIL_H_
 
 #include "base/kaldi-common.h"
 #include "fstext/fstext-lib.h"
@@ -44,4 +44,4 @@ void PrintPartialResult(const std::vector<int32>& words,
 
 } // namespace kaldi
 
-#endif // KALDI_ONLINE_ONLINEBIN_UTIL_H_
+#endif // KALDI_ONLINE2_ONLINEBIN_UTIL_H_

src/util/basic-filebuf.h

@@ -8,8 +8,8 @@
 // Source License licenses. See LICENSE.TXT for details (included at the
 // bottom).
 ///////////////////////////////////////////////////////////////////////////////
-#ifndef BASIC_FILEBUF_H
-#define BASIC_FILEBUF_H
+#ifndef KALDI_UTIL_BASIC_FILEBUF_H_
+#define KALDI_UTIL_BASIC_FILEBUF_H_
 
 ///////////////////////////////////////////////////////////////////////////////
 #include <fstream>
@@ -855,7 +855,7 @@ basic_filebuf<CharT, Traits>::_M_write_mode()
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-#endif // BASIC_FILEBUF_H
+#endif // KALDI_UTIL_BASIC_FILEBUF_H_
 
 ///////////////////////////////////////////////////////////////////////////////