Modifications to decoders (change defaults; new debug statements.)

danpovey · danpovey · commit 70e55a157b38 · 2011-07-27T18:47:27.000Z
git-svn-id: https://svn.code.sf.net/p/kaldi/code/trunk@196 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
diff --git a/src/decoder/faster-decoder.h b/src/decoder/faster-decoder.h
@@ -91,7 +91,7 @@ class FasterDecoder {
     for (int32 frame = 0; !decodable->IsLastFrame(frame-1); frame++) {
       DEBUG_OUT1("==== FRAME " << frame << " =====")
       if ((frame%50) == 0)
-        KALDI_LOG << "==== FRAME " << frame << " =====";
+        KALDI_VLOG(2) << "==== FRAME " << frame << " =====";
       BaseFloat adaptive_beam = ProcessEmitting(decodable, frame);
       ProcessNonemitting(adaptive_beam);
     }
diff --git a/src/decoder/kaldi-decoder-left-inl.h b/src/decoder/kaldi-decoder-left-inl.h
@@ -58,7 +58,7 @@ namespace kaldi {
     do {  // go over all feature frames and decode
       frame_index_++;
       DEBUG_OUT1("==== FRAME " << frame_index_)
-      if ((frame_index_%50) == 0) KALDI_LOG << "==== FRAME " << frame_index_;
+      if ((frame_index_%50) == 0) KALDI_VLOG(2) << "==== FRAME " << frame_index_;
 
       ProcessToDoList();
       // all active tokens from last frame are by now processed
diff --git a/src/decoder/kaldi-decoder-left.h b/src/decoder/kaldi-decoder-left.h
@@ -73,7 +73,7 @@ struct KaldiDecoderOptions {
   BaseFloat beamwidth2;
 
   KaldiDecoderOptions(): lm_scale(1.0), word_penalty(0.0),
-                         max_active_tokens(std::numeric_limits<int32>::max()),
+                         max_active_tokens(10000),
                          beamwidth(16.0), beamwidth2(16.0) { }
   void Register(ParseOptions *po, bool full) {  // "full":use obscure options too
 	// depends on program

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ class FasterDecoder {`
`91`	`91`	`for (int32 frame = 0; !decodable->IsLastFrame(frame-1); frame++) {`
`92`	`92`	`DEBUG_OUT1("==== FRAME " << frame << " =====")`
`93`	`93`	`if ((frame%50) == 0)`
`94`		`- KALDI_LOG << "==== FRAME " << frame << " =====";`
	`94`	`+ KALDI_VLOG(2) << "==== FRAME " << frame << " =====";`
`95`	`95`	`BaseFloat adaptive_beam = ProcessEmitting(decodable, frame);`
`96`	`96`	`ProcessNonemitting(adaptive_beam);`
`97`	`97`	`}`