Merging upstream/master into ctc branch

wonkyuml · Oct 3, 2015 · 0ef38f9 · 0ef38f9
2 parents 530f7ff + 66ef6fb
commit 0ef38f9
Show file tree

Hide file tree

Showing 60 changed files with 127 additions and 88 deletions.
diff --git a/misc/maintenance/fix_apache_headers.sh b/misc/maintenance/fix_apache_headers.sh
@@ -4,24 +4,43 @@
 # authors appears in the apache headers in the source, and that source files
 # have their Apache headers.  Including this mainly for documentation, as I
 # doubt the issue will occur much in future.
+#
+# Also makes sure that where the filename appears in a comment at the top of the
+# file, e.g. as in
+# // somedir/some-file.cc
+# the filename is accurate.
 
 # run this from the top level of the repo, as
 # misc/maintenance/fix_apache_headers.sh
 
 set -e
 cd src
 rm -rf tmp
-for x in */*.{h,cc,dox}; do 
+for x in */*.{h,cc,dox}; do
   if [ $x != "util/basic-filebuf.h" ]; then
     if ! grep 'COPYING for clarification' $x >/dev/null; then
       echo Fixing $x;
       if ! grep "Apache License" $x >/dev/null; then
         echo "$0: warning: file $x may not have an Apache license header"
       else
-        cp $x tmp; cat tmp | perl -ape ' if (m/Licensed under the Apache License/) { 
-        print "// See ../../COPYING for clarification regarding multiple authors\n"; 
+        cp $x tmp; cat tmp | perl -ape ' if (m/Licensed under the Apache License/) {
+        print "// See ../../COPYING for clarification regarding multiple authors\n";
         print "//\n";} ' > $x;
       fi
     fi
   fi
 done
+
+for x in */*.{h,cc,dox}; do
+  if [ $x != "util/basic-filebuf.h" ]; then
+    echo "// $x" | cat - <(tail -n +2 $x)  >tmp
+    if ! diff tmp $x; then
+      if head -n 1 $x | grep -E '// [-a-z0-9_]+/[-a-z0-9_.]+$'; then
+        echo "Fixing $x automatically"
+        cp tmp $x
+      else
+        echo "**Please fix $x manually"
+      fi
+    fi
+  fi
+done
diff --git a/src/bin/am-info.cc b/src/bin/am-info.cc
@@ -1,4 +1,4 @@
-// gmmbin/am-info.cc
+// bin/am-info.cc
 
 // Copyright 2012-2013  Johns Hopkins University (Author: Daniel Povey)
 

diff --git a/src/bin/sum-lda-accs.cc b/src/bin/sum-lda-accs.cc
@@ -1,4 +1,4 @@
-// bin/sum-lda.cc
+// bin/sum-lda-accs.cc
 
 // Copyright 2014 LINSE/UFSC; Augusto Henrique Hentz
 

diff --git a/src/bin/sum-mllt-accs.cc b/src/bin/sum-mllt-accs.cc
@@ -1,4 +1,4 @@
-// bin/sum-mllt.cc
+// bin/sum-mllt-accs.cc
 
 // Copyright 2014 LINSE/UFSC; Augusto Henrique Hentz
 

diff --git a/src/bin/transform-vec.cc b/src/bin/transform-vec.cc
@@ -1,4 +1,4 @@
-// featbin/transform-vec.cc
+// bin/transform-vec.cc
 
 // Copyright 2009-2012  Microsoft Corporation
 //           2012-2014  Johns Hopkins University (author: Daniel Povey)

diff --git a/src/cudamatrix/cu-math-test.cc b/src/cudamatrix/cu-math-test.cc
@@ -1,4 +1,4 @@
-// cudamatrix/cuda-math-test.cc
+// cudamatrix/cu-math-test.cc
 
 // Copyright 2013 Johns Hopkins University (Author: David Snyder)
 

diff --git a/src/cudamatrix/cu-matrix-test.cc b/src/cudamatrix/cu-matrix-test.cc
@@ -1,4 +1,4 @@
-// cudamatrix/cuda-matrix-test.cc
+// cudamatrix/cu-matrix-test.cc
 
 // Copyright 2010  Karel Vesely
 //           2013  Lucas Ondel

diff --git a/src/cudamatrix/cu-packed-matrix-test.cc b/src/cudamatrix/cu-packed-matrix-test.cc
@@ -1,4 +1,4 @@
-// cudamatrix/cu-sp-matrix-test.cc
+// cudamatrix/cu-packed-matrix-test.cc
 //
 // Copyright 2013  Ehsan Variani
 //                 Lucas Ondel

diff --git a/src/cudamatrix/cu-sp-matrix-speed-test.cc b/src/cudamatrix/cu-sp-matrix-speed-test.cc
@@ -1,4 +1,4 @@
-// cudamatrix/cu-matrix-speed-test.cc
+// cudamatrix/cu-sp-matrix-speed-test.cc
 
 // Copyright 2013  Johns Hopkins University (author: Daniel Povey)
 

diff --git a/src/cudamatrix/cu-tp-matrix-test.cc b/src/cudamatrix/cu-tp-matrix-test.cc
@@ -1,4 +1,4 @@
-// cudamatrix/cu-sp-matrix-test.cc
+// cudamatrix/cu-tp-matrix-test.cc
 //
 // Copyright 2013  Ehsan Variani
 //                 Lucas Ondel

diff --git a/src/cudamatrix/cu-vector-test.cc b/src/cudamatrix/cu-vector-test.cc
@@ -1,4 +1,4 @@
-// cudamatrix/cuda-vector-test.cc
+// cudamatrix/cu-vector-test.cc
 
 // Copyright 2013 Lucas Ondel
 //           2013 Johns Hopkins University (author: Daniel Povey)

diff --git a/src/fstext/epsilon-property-inl.h b/src/fstext/epsilon-property-inl.h
@@ -1,4 +1,4 @@
-// fstext/fstext-utils-inl.h
+// fstext/epsilon-property-inl.h
 
 // Copyright 2014    Johns Hopkins University (Author: Daniel Povey)
 

diff --git a/src/gmmbin/gmm-est-fmllr-global.cc b/src/gmmbin/gmm-est-fmllr-global.cc
@@ -1,4 +1,4 @@
-// gmmbin/gmm-est-fmllr.cc
+// gmmbin/gmm-est-fmllr-global.cc
 
 // Copyright 2009-2011  Microsoft Corporation;  Saarland University
 //           2013-2014  Johns Hopkins University (author: Daniel Povey)

diff --git a/src/gmmbin/gmm-latgen-faster-regtree-fmllr.cc b/src/gmmbin/gmm-latgen-faster-regtree-fmllr.cc
@@ -1,4 +1,4 @@
-// gmmbin/gmm-latgen-faster.cc
+// gmmbin/gmm-latgen-faster-regtree-fmllr.cc
 
 // Copyright 2009-2012  Microsoft Corporation
 //           2012-2013  Johns Hopkins University (author: Daniel Povey)

diff --git a/src/gst-plugin/gst-online-gmm-decode-faster.cc b/src/gst-plugin/gst-online-gmm-decode-faster.cc
@@ -1,4 +1,4 @@
-// gst-plugin/gst-online-decode-faster.cc
+// gst-plugin/gst-online-gmm-decode-faster.cc
 
 // Copyright 2013  Tanel Alumae, Tallinn University of Technology
 // Copyright 2012 Cisco Systems (author: Matthias Paulik)

diff --git a/src/gst-plugin/gst-online-gmm-decode-faster.h b/src/gst-plugin/gst-online-gmm-decode-faster.h
@@ -1,4 +1,4 @@
-// gst-plugin/gst-online-decode-faster.h
+// gst-plugin/gst-online-gmm-decode-faster.h
 
 // Copyright 2013  Tanel Alumae, Tallinn University of Technology
 

diff --git a/src/kws/kaldi-kws.h b/src/kws/kaldi-kws.h
@@ -1,4 +1,4 @@
-// lat/kaldi-kws.h
+// kws/kaldi-kws.h
 
 // Copyright 2012  Johns Hopkins University (Author: Guoguo Chen)
 

diff --git a/src/kws/kws-functions.cc b/src/kws/kws-functions.cc
@@ -1,4 +1,4 @@
-// lat/kws-functions.cc
+// kws/kws-functions.cc
 
 // Copyright 2012  Johns Hopkins University (Author: Guoguo Chen)
 

diff --git a/src/kws/kws-functions.h b/src/kws/kws-functions.h
@@ -1,4 +1,4 @@
-// lat/kws-functions.h
+// kws/kws-functions.h
 
 // Copyright 2012  Johns Hopkins University (Author: Guoguo Chen)
 

diff --git a/src/kwsbin/compute-atwv.cc b/src/kwsbin/compute-atwv.cc
@@ -1,4 +1,4 @@
-// bin/compute-atwv.cc
+// kwsbin/compute-atwv.cc
 
 // Copyright (c) 2015, Johns Hopkins University (Yenda Trmal<jtrmal@gmail.com>)
 

diff --git a/src/lat/determinize-lattice-pruned.cc b/src/lat/determinize-lattice-pruned.cc
@@ -1,4 +1,4 @@
-// lat/determinize-lattice-pruned-inl.h
+// lat/determinize-lattice-pruned.cc
 
 // Copyright 2009-2012  Microsoft Corporation
 //           2012-2013  Johns Hopkins University (Author: Daniel Povey)

diff --git a/src/matrix/matrix-lib-speed-test.cc b/src/matrix/matrix-lib-speed-test.cc
@@ -1,4 +1,4 @@
-// matrix/matrix-lib-test.cc
+// matrix/matrix-lib-speed-test.cc
 
 // Copyright 2009-2014   Microsoft Corporation;  Mohit Agarwal;  Lukas Burget;
 //                       Ondrej Glembek;  Saarland University (Author: Arnab Ghoshal);

diff --git a/src/nnet/nnet-average-pooling-2d-component.h b/src/nnet/nnet-average-pooling-2d-component.h
@@ -1,4 +1,4 @@
-// nnet/nnet-average-pooling-component.h
+// nnet/nnet-average-pooling-2d-component.h
 
 // Copyright 2014  Brno University of Technology (author: Karel Vesely)
 //                 Johns Hopkins University (author: Sri Harish Mallidi)

diff --git a/src/nnet/nnet-convolutional-2d-component.h b/src/nnet/nnet-convolutional-2d-component.h
@@ -1,4 +1,4 @@
-// nnet/nnet-convolutional-component.h
+// nnet/nnet-convolutional-2d-component.h
 
 // Copyright 2014-2015  Johns Hopkins University (author: Sri Harish Mallidi)
 //                      Brno University of Technology (author: Karel Vesely),

diff --git a/src/nnet/nnet-linear-transform.h b/src/nnet/nnet-linear-transform.h
@@ -1,4 +1,4 @@
-// nnet/nnet-affine-transform.h
+// nnet/nnet-linear-transform.h
 
 // Copyright 2011-2014  Brno University of Technology (author: Karel Vesely)
 

diff --git a/src/nnet/nnet-max-pooling-2d-component.h b/src/nnet/nnet-max-pooling-2d-component.h
@@ -1,4 +1,4 @@
-// nnet/nnet-average-pooling-component.h
+// nnet/nnet-max-pooling-2d-component.h
 
 // Copyright 2014  Brno University of Technology (author: Karel Vesely),
 //                 Johns Hopkins University (author: Sri Harish Mallidi)

diff --git a/src/nnet/nnet-sentence-averaging-component.h b/src/nnet/nnet-sentence-averaging-component.h
@@ -1,4 +1,4 @@
-// nnet/nnet-affine-transform.h
+// nnet/nnet-sentence-averaging-component.h
 
 // Copyright 2013  Brno University of Technology (Author: Karel Vesely)
 

diff --git a/src/nnet2/nnet-example-functions.cc b/src/nnet2/nnet-example-functions.cc
@@ -1,4 +1,4 @@
-// nnet/nnet-example-functions.cc
+// nnet2/nnet-example-functions.cc
 
 // Copyright 2012-2013  Johns Hopkins University (author: Daniel Povey)
 

diff --git a/src/nnet2/online-nnet2-decodable-test.cc b/src/nnet2/online-nnet2-decodable-test.cc
@@ -1,4 +1,4 @@
-// online2/online-nnet2-decodable-test.cc
+// nnet2/online-nnet2-decodable-test.cc
 
 // Copyright 2014  Johns Hopkins University (author:  Daniel Povey)
 

diff --git a/src/nnet2bin/nnet-get-weighted-egs.cc b/src/nnet2bin/nnet-get-weighted-egs.cc
@@ -1,4 +1,4 @@
-// nnet2bin/nnet-weighted-get-egs.cc
+// nnet2bin/nnet-get-weighted-egs.cc
 
 // Copyright 2013-2014  (Author: Vimal Manohar)
 

diff --git a/src/nnet2bin/nnet-limit-degradation.cc b/src/nnet2bin/nnet-limit-degradation.cc
@@ -1,4 +1,4 @@
-// nnet2bin/nnet-linit-degradation.cc
+// nnet2bin/nnet-limit-degradation.cc
 
 // Copyright 2012-2013  Johns Hopkins University (author:  Daniel Povey)
 

diff --git a/src/nnet2bin/nnet-train-ensemble.cc b/src/nnet2bin/nnet-train-ensemble.cc
@@ -1,4 +1,4 @@
-// nnet2bin/nnet-train-simple.cc
+// nnet2bin/nnet-train-ensemble.cc
 
 // Copyright 2012  Johns Hopkins University (author: Daniel Povey)
 //           2014  Xiaohui Zhang

diff --git a/src/nnet2bin/nnet2-boost-silence.cc b/src/nnet2bin/nnet2-boost-silence.cc
@@ -1,4 +1,4 @@
-// nnet2bin/nnet-boost-silence.cc
+// nnet2bin/nnet2-boost-silence.cc
 
 // Copyright 2012  Johns Hopkins University (author:  Daniel Povey)