trunk: some cosmetic fixes; enable raw feature-type in dump_bottleneck_features.sh

danpovey · danpovey · commit 011808dcaee7 · 2014-09-30T18:44:56.000Z
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@4492 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
diff --git a/egs/wsj/s5/steps/nnet2/dump_bottleneck_features.sh b/egs/wsj/s5/steps/nnet2/dump_bottleneck_features.sh
@@ -4,7 +4,8 @@
 # Apache 2.0
 
 
-# Begin configuration section.  
+# Begin configuration section.
+feat_type=
 stage=1
 nj=4
 cmd=run.pl
@@ -59,10 +60,13 @@ splice_opts=`cat $nnetdir/splice_opts 2>/dev/null`
 [[ -d $sdata && $data/feats.scp -ot $sdata ]] || split_data.sh $data $nj || exit 1;
 
 ## Set up input features of nnet
-if [ -f $nnetdir/final.mat ]; then feat_type=lda; else feat_type=delta; fi
+if [ -z "$feat_type" ]; then
+  if [ -f $nnetdir/final.mat ]; then feat_type=lda; else feat_type=delta; fi
+fi
 echo "$0: feature type is $feat_type"
 
 case $feat_type in
+  raw) feats="ark,s,cs:apply-cmvn --norm-vars=false --utt2spk=ark:$sdata/JOB/utt2spk scp:$sdata/JOB/cmvn.scp scp:$sdata/JOB/feats.scp ark:- |";;
   delta) feats="ark,s,cs:apply-cmvn --norm-vars=false --utt2spk=ark:$sdata/JOB/utt2spk scp:$sdata/JOB/cmvn.scp scp:$sdata/JOB/feats.scp ark:- | add-deltas ark:- ark:- |";;
   lda) feats="ark,s,cs:apply-cmvn --norm-vars=false --utt2spk=ark:$sdata/JOB/utt2spk scp:$sdata/JOB/cmvn.scp scp:$sdata/JOB/feats.scp ark:- | splice-feats $splice_opts ark:- ark:- | transform-feats $nnetdir/final.mat ark:- ark:- |"
    ;;
diff --git a/src/decoder/faster-decoder.h b/src/decoder/faster-decoder.h
@@ -102,7 +102,7 @@ class FasterDecoder {
   /// object, but if max_num_frames is >= 0 it will decode no more than
   /// that many frames.
   void AdvanceDecoding(DecodableInterface *decodable,
-                         int32 max_num_frames = -1);
+                       int32 max_num_frames = -1);
 
   /// Returns the number of frames already decoded.  
   int32 NumFramesDecoded() const { return num_frames_decoded_; }
diff --git a/src/nnet2/nnet-compute.cc b/src/nnet2/nnet-compute.cc
@@ -65,8 +65,10 @@ NnetComputer::NnetComputer(const Nnet &nnet,
                            Nnet *nnet_to_update):
     nnet_(nnet), nnet_to_update_(nnet_to_update) {
   int32 dim = input_feats.NumCols();
-  KALDI_ASSERT(dim == nnet.InputDim());
-
+  if (dim != nnet.InputDim()) {
+    KALDI_ERR << "Feature dimension is " << dim << " but network expects "
+              << nnet.InputDim();
+  }
   forward_data_.resize(nnet.NumComponents() + 1);
 
   int32 left_context = (pad ? nnet_.LeftContext() : 0),
diff --git a/src/tree/cluster-utils.cc b/src/tree/cluster-utils.cc
@@ -776,7 +776,6 @@ class RefineClusterer {
   void Iterate() {
     int32 iter, num_iters = cfg_.num_iters;
     for (iter = 0;iter < num_iters;iter++) {
-      // do not do more than 100 iterations-- this is not an exact algorithm anyway.
       int32 cur_t = t_;
       for (int32 point = 0;point < num_points_;point++) {
         if (t_+1 == 0) {
