sandbox/akirkedal: merging changes from trunk.

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

diff --cc egs/wsj/s5/steps/make_mfcc.sh
index c2871818a69998f9d87369b9789debd15cadfc88,e241613f219e0e5f8ff0b788371acea0141e4be0..e83f94c5a1e4bee6d98655e7286c7895958c369c
--- 1/egs/wsj/s5/steps/make_mfcc.sh
--- 2/egs/wsj/s5/steps/make_mfcc.sh
+++ b/egs/wsj/s5/steps/make_mfcc.sh
@@@ -87,9 -96,14 +96,13 @@@ els
    done
  
    utils/split_scp.pl $scp $split_scps || exit 1;
 -
+ 
+   # add ,p to the input rspecifier so that we can just skip over
+   # utterances that have bad wave data.
+ 
    $cmd JOB=1:$nj $logdir/make_mfcc_${name}.JOB.log \
      compute-mfcc-feats  $vtln_opts --verbose=2 --config=$mfcc_config \
-      scp:$logdir/wav_${name}.JOB.scp ark:- \| \
+      scp,p:$logdir/wav_${name}.JOB.scp ark:- \| \
        copy-feats --compress=$compress ark:- \
        ark,scp:$mfccdir/raw_mfcc_$name.JOB.ark,$mfccdir/raw_mfcc_$name.JOB.scp \
        || exit 1;

diff --cc src/cudamatrix/cu-vector.cc
Simple merge

diff --cc src/cudamatrix/cu-vector.h
Simple merge