Added code-level support for the ',bg' option on sequential table rea…

…ders, causing them to read the data in a background thread. Helps speed up GPU-based nnet training, for instance.
kaldi-asr · Mar 16, 2016 · 99a39ff · 99a39ff
1 parent ae1634b
commit 99a39ff
Show file tree

Hide file tree

Showing 48 changed files with 518 additions and 202 deletions.
diff --git a/src/Makefile b/src/Makefile
@@ -152,8 +152,8 @@ bin fstbin gmmbin fgmmbin sgmmbin sgmm2bin featbin nnetbin nnet2bin nnet3bin cha
 #2)The libraries have inter-dependencies
 base:
 matrix : base
-util: base matrix
-thread: util matrix base
+thread : base
+util: base matrix thread
 feat: base matrix util gmm transform tree thread
 tree: base util matrix
 optimization: base matrix

diff --git a/src/chain/Makefile b/src/chain/Makefile
@@ -54,7 +54,7 @@ endif
 ADDLIBS = ../lat/kaldi-lat.a ../hmm/kaldi-hmm.a ../tree/kaldi-tree.a \
            ../fstext/kaldi-fstext.a \
            ../cudamatrix/kaldi-cudamatrix.a ../matrix/kaldi-matrix.a \
-          ../util/kaldi-util.a ../base/kaldi-base.a
+          ../util/kaldi-util.a ../thread/kaldi-thread.a ../base/kaldi-base.a
 
 
 include ../makefiles/default_rules.mk

diff --git a/src/chainbin/Makefile b/src/chainbin/Makefile
@@ -23,8 +23,8 @@ TESTFILES =
 ADDLIBS = ../nnet3/kaldi-nnet3.a ../chain/kaldi-chain.a ../gmm/kaldi-gmm.a \
          ../decoder/kaldi-decoder.a ../lat/kaldi-lat.a ../hmm/kaldi-hmm.a  \
          ../transform/kaldi-transform.a ../tree/kaldi-tree.a \
-         ../thread/kaldi-thread.a ../cudamatrix/kaldi-cudamatrix.a \
+         ../cudamatrix/kaldi-cudamatrix.a \
          ../matrix/kaldi-matrix.a ../fstext/kaldi-fstext.a \
-         ../util/kaldi-util.a ../base/kaldi-base.a
+         ../util/kaldi-util.a ../thread/kaldi-thread.a ../base/kaldi-base.a
 
 include ../makefiles/default_rules.mk
diff --git a/src/cudamatrix/Makefile b/src/cudamatrix/Makefile
@@ -62,7 +62,8 @@ endif
 	$(CUDATKDIR)/bin/nvcc -c $< -o $@ $(CUDA_INCLUDE) $(CUDA_FLAGS) $(CUDA_ARCH) -I../
 
 
-ADDLIBS = ../matrix/kaldi-matrix.a ../base/kaldi-base.a  ../util/kaldi-util.a
+ADDLIBS = ../matrix/kaldi-matrix.a ../util/kaldi-util.a ../thread/kaldi-thread.a \
+       ../base/kaldi-base.a
 
 include ../makefiles/default_rules.mk
 
diff --git a/src/decoder/Makefile b/src/decoder/Makefile
@@ -3,7 +3,7 @@ all:
 EXTRA_CXXFLAGS = -Wno-sign-compare
 include ../kaldi.mk
 
-TESTFILES = 
+TESTFILES =
 
 OBJFILES = training-graph-compiler.o lattice-simple-decoder.o lattice-faster-decoder.o \
    lattice-faster-online-decoder.o simple-decoder.o faster-decoder.o \
@@ -13,7 +13,7 @@ LIBNAME = kaldi-decoder
 
 ADDLIBS = ../transform/kaldi-transform.a ../tree/kaldi-tree.a ../lat/kaldi-lat.a \
      ../sgmm/kaldi-sgmm.a ../gmm/kaldi-gmm.a ../hmm/kaldi-hmm.a ../util/kaldi-util.a \
-     ../base/kaldi-base.a ../matrix/kaldi-matrix.a 
+     ../thread/kaldi-thread.a ../matrix/kaldi-matrix.a ../base/kaldi-base.a
 
 include ../makefiles/default_rules.mk
 
diff --git a/src/feat/Makefile b/src/feat/Makefile
@@ -17,7 +17,7 @@ OBJFILES = feature-functions.o feature-mfcc.o feature-plp.o feature-fbank.o \
 LIBNAME = kaldi-feat
 
 ADDLIBS = ../transform/kaldi-transform.a ../gmm/kaldi-gmm.a ../tree/kaldi-tree.a \
-	../util/kaldi-util.a ../matrix/kaldi-matrix.a ../base/kaldi-base.a ../thread/kaldi-thread.a
+	../util/kaldi-util.a ../thread/kaldi-thread.a ../matrix/kaldi-matrix.a ../base/kaldi-base.a
 
 include ../makefiles/default_rules.mk
 
diff --git a/src/feat/wave-reader.h b/src/feat/wave-reader.h
@@ -92,6 +92,10 @@ class WaveData {
     samp_freq_ = 0.0;
   }
 
+  void Swap(WaveData *other) {
+    data_.Swap(&(other->data_));
+    std::swap(samp_freq_, other->samp_freq_);
+  }
  private:
   static const uint32 kBlockSize = 1024 * 1024;  // Use 1M bytes.
   Matrix<BaseFloat> data_;
@@ -106,8 +110,11 @@ class WaveData {
 };
 
 
-// Holder class for .wav files that enables us to read (but not write)
-// .wav files. c.f. util/kaldi-holder.h
+// Holder class for .wav files that enables us to read (but not write) .wav
+// files. c.f. util/kaldi-holder.h we don't use the KaldiObjectHolder template
+// because we don't want to check for the \0B binary header. We could have faked
+// it by pretending to read in the wave data in text mode after failing to find
+// the \0B header, but that would have been a little ugly.
 class WaveHolder {
  public:
   typedef WaveData T;
@@ -153,11 +160,14 @@ class WaveHolder {
     }
   }
 
+  void Swap(WaveHolder *other) {
+    t_.Swap(&(other->t_));
+  }
+
  private:
   T t_;
 };
 
-
 }  // namespace kaldi
 
 #endif  // KALDI_FEAT_WAVE_READER_H_
diff --git a/src/featbin/Makefile b/src/featbin/Makefile
@@ -22,8 +22,8 @@ OBJFILES =
 TESTFILES =
 
 ADDLIBS = ../feat/kaldi-feat.a ../transform/kaldi-transform.a ../gmm/kaldi-gmm.a \
-         ../thread/kaldi-thread.a ../tree/kaldi-tree.a ../matrix/kaldi-matrix.a \
-         ../util/kaldi-util.a ../base/kaldi-base.a
+          ../tree/kaldi-tree.a ../matrix/kaldi-matrix.a \
+         ../util/kaldi-util.a ../thread/kaldi-thread.a ../base/kaldi-base.a
 
 include ../makefiles/default_rules.mk
 
diff --git a/src/fgmmbin/Makefile b/src/fgmmbin/Makefile
@@ -7,7 +7,7 @@ BINFILES = fgmm-global-acc-stats fgmm-global-sum-accs fgmm-global-est \
            fgmm-global-merge fgmm-global-to-gmm fgmm-gselect fgmm-global-get-frame-likes \
            fgmm-global-acc-stats-twofeats fgmm-global-copy fgmm-global-mixdown \
            fgmm-global-gselect-to-post fgmm-global-info \
-           fgmm-global-acc-stats-post fgmm-global-init-from-accs  
+           fgmm-global-acc-stats-post fgmm-global-init-from-accs
 
 
 OBJFILES =
@@ -17,8 +17,8 @@ OBJFILES =
 TESTFILES =
 
 ADDLIBS = ../decoder/kaldi-decoder.a ../lat/kaldi-lat.a ../feat/kaldi-feat.a \
-          ../transform/kaldi-transform.a ../gmm/kaldi-gmm.a ../thread/kaldi-thread.a \
+          ../transform/kaldi-transform.a ../gmm/kaldi-gmm.a \
 		  ../hmm/kaldi-hmm.a ../tree/kaldi-tree.a ../matrix/kaldi-matrix.a  \
-		  ../util/kaldi-util.a ../base/kaldi-base.a 
+		  ../util/kaldi-util.a  ../thread/kaldi-thread.a ../base/kaldi-base.a
 
 include ../makefiles/default_rules.mk
diff --git a/src/fstbin/Makefile b/src/fstbin/Makefile
@@ -17,14 +17,14 @@ BINFILES = fstdeterminizestar  \
            fstdeterminizelog fstphicompose fstrhocompose fstpropfinal fstcopy \
 	       fstpushspecial fsts-to-transcripts
 
-OBJFILES = 
+OBJFILES =
 
-TESTFILES = 
+TESTFILES =
 
 # actually, this library is currently empty.  Everything is a header.
-LIBFILE = 
+LIBFILE =
 
-ADDLIBS = ../fstext/kaldi-fstext.a ../matrix/kaldi-matrix.a ../base/kaldi-base.a \
-          ../util/kaldi-util.a 
+ADDLIBS = ../fstext/kaldi-fstext.a ../util/kaldi-util.a ../thread/kaldi-thread.a \
+          ../matrix/kaldi-matrix.a ../base/kaldi-base.a
 
 include ../makefiles/default_rules.mk
diff --git a/src/fstext/Makefile b/src/fstext/Makefile
@@ -25,6 +25,6 @@ LIBNAME = kaldi-fstext
 # tree and matrix archives needed for test-context-fst
 # matrix archive needed for push-special.
 ADDLIBS =  ../tree/kaldi-tree.a ../matrix/kaldi-matrix.a \
-           ../util/kaldi-util.a ../base/kaldi-base.a 
+           ../util/kaldi-util.a ../thread/kaldi-thread.a ../base/kaldi-base.a
 
 include ../makefiles/default_rules.mk
diff --git a/src/fstext/kaldi-fst-io.h b/src/fstext/kaldi-fst-io.h
@@ -110,6 +110,10 @@ class VectorFstTplHolder {
     }
   }
 
+  void Swap(VectorFstTplHolder<Arc> *other) {
+    std::swap(t_, other->t_);
+  }
+
   ~VectorFstTplHolder() { Clear(); }
   // No destructor.  Assignment and
   // copy constructor take their default implementations.

diff --git a/src/gmm/Makefile b/src/gmm/Makefile
@@ -1,7 +1,7 @@
 all:
 
-OPENFST_CXXFLAGS = 
-OPENFST_LDLIBS = 
+OPENFST_CXXFLAGS =
+OPENFST_LDLIBS =
 include ../kaldi.mk
 
 TESTFILES = diag-gmm-test mle-diag-gmm-test full-gmm-test mle-full-gmm-test \
@@ -14,8 +14,8 @@ OBJFILES = diag-gmm.o diag-gmm-normal.o mle-diag-gmm.o am-diag-gmm.o \
 
 LIBNAME = kaldi-gmm
 
-ADDLIBS = ../tree/kaldi-tree.a ../thread/kaldi-thread.a ../util/kaldi-util.a \
-        ../matrix/kaldi-matrix.a ../base/kaldi-base.a 
+ADDLIBS = ../tree/kaldi-tree.a ../util/kaldi-util.a ../thread/kaldi-thread.a \
+        ../matrix/kaldi-matrix.a ../base/kaldi-base.a
 
 
 

diff --git a/src/gmmbin/Makefile b/src/gmmbin/Makefile
@@ -39,8 +39,8 @@ TESTFILES =
 ADDLIBS = ../decoder/kaldi-decoder.a ../lat/kaldi-lat.a ../feat/kaldi-feat.a \
 	../transform/kaldi-transform.a ../gmm/kaldi-gmm.a \
 	../hmm/kaldi-hmm.a ../tree/kaldi-tree.a ../matrix/kaldi-matrix.a  \
-	../thread/kaldi-thread.a ../fstext/kaldi-fstext.a \
-    ../util/kaldi-util.a ../base/kaldi-base.a 
+	../fstext/kaldi-fstext.a ../util/kaldi-util.a ../thread/kaldi-thread.a \
+    ../base/kaldi-base.a
 
 
 include ../makefiles/default_rules.mk
diff --git a/src/hmm/Makefile b/src/hmm/Makefile
@@ -10,7 +10,7 @@ OBJFILES = hmm-topology.o transition-model.o hmm-utils.o tree-accu.o \
 
 LIBNAME = kaldi-hmm
 ADDLIBS = ../tree/kaldi-tree.a ../matrix/kaldi-matrix.a ../util/kaldi-util.a \
-          ../base/kaldi-base.a
+          ../thread/kaldi-thread.a ../base/kaldi-base.a
 
 include ../makefiles/default_rules.mk
 
diff --git a/src/hmm/posterior.h b/src/hmm/posterior.h
@@ -62,18 +62,21 @@ class PosteriorHolder {
   PosteriorHolder() { }
 
   static bool Write(std::ostream &os, bool binary, const T &t);
-  
+
   void Clear() { Posterior tmp; std::swap(tmp, t_); }
 
   // Reads into the holder.
   bool Read(std::istream &is);
-  
+
   // Kaldi objects always have the stream open in binary mode for
   // reading.
   static bool IsReadInBinary() { return true; }
 
   const T &Value() const { return t_; }
-
+
+  void Swap(PosteriorHolder *other) {
+    t_.swap(other->t_);
+  }
  private:
   KALDI_DISALLOW_COPY_AND_ASSIGN(PosteriorHolder);
   T t_;
@@ -97,19 +100,22 @@ class GaussPostHolder {
 
   GaussPostHolder() { }
 
-  static bool Write(std::ostream &os, bool binary, const T &t);  
+  static bool Write(std::ostream &os, bool binary, const T &t);
 
   void Clear() {  GaussPost tmp;  std::swap(tmp, t_); }
 
   // Reads into the holder.
   bool Read(std::istream &is);
-  
+
   // Kaldi objects always have the stream open in binary mode for
   // reading.
   static bool IsReadInBinary() { return true; }
 
   const T &Value() const { return t_; }
-
+
+  void Swap(GaussPostHolder *other) {
+    t_.swap(other->t_);
+  }
  private:
   KALDI_DISALLOW_COPY_AND_ASSIGN(GaussPostHolder);
   T t_;

diff --git a/src/ivector/Makefile b/src/ivector/Makefile
@@ -1,8 +1,8 @@
 
 all:
 
-OPENFST_CXXFLAGS = 
-OPENFST_LDLIBS = 
+OPENFST_CXXFLAGS =
+OPENFST_LDLIBS =
 include ../kaldi.mk
 
 TESTFILES = ivector-extractor-test plda-test logistic-regression-test
@@ -12,7 +12,8 @@ OBJFILES = ivector-extractor.o voice-activity-detection.o plda.o logistic-regres
 LIBNAME = kaldi-ivector
 
 ADDLIBS = ../gmm/kaldi-gmm.a ../tree/kaldi-tree.a ../transform/kaldi-transform.a \
-		../thread/kaldi-thread.a ../matrix/kaldi-matrix.a ../base/kaldi-base.a \
-        ../util/kaldi-util.a 
+		../util/kaldi-util.a ../thread/kaldi-thread.a ../matrix/kaldi-matrix.a \
+        ../base/kaldi-base.a
+
 
 include ../makefiles/default_rules.mk
diff --git a/src/ivectorbin/Makefile b/src/ivectorbin/Makefile
@@ -25,7 +25,7 @@ TESTFILES =
 
 
 ADDLIBS = ../ivector/kaldi-ivector.a ../hmm/kaldi-hmm.a ../gmm/kaldi-gmm.a \
-    ../tree/kaldi-tree.a ../thread/kaldi-thread.a ../matrix/kaldi-matrix.a \
-    ../util/kaldi-util.a ../base/kaldi-base.a 
+    ../tree/kaldi-tree.a ../matrix/kaldi-matrix.a ../util/kaldi-util.a \
+    ../thread/kaldi-thread.a ../base/kaldi-base.a
 
 include ../makefiles/default_rules.mk
diff --git a/src/kws/Makefile b/src/kws/Makefile
@@ -10,7 +10,8 @@ OBJFILES = kws-functions.o kws-scoring.o
 LIBNAME = kaldi-kws
 
 ADDLIBS = ../hmm/kaldi-hmm.a ../lat/kaldi-lat.a ../tree/kaldi-tree.a \
-					../matrix/kaldi-matrix.a ../util/kaldi-util.a ../base/kaldi-base.a
+          ../matrix/kaldi-matrix.a ../util/kaldi-util.a ../thread/kaldi-thread.a \
+          ../base/kaldi-base.a
 
 
 include ../makefiles/default_rules.mk
diff --git a/src/kwsbin/Makefile b/src/kwsbin/Makefile
@@ -16,6 +16,6 @@ TESTFILES =
 
 ADDLIBS = ../kws/kaldi-kws.a ../lat/kaldi-lat.a ../fstext/kaldi-fstext.a \
         ../hmm/kaldi-hmm.a ../tree/kaldi-tree.a ../matrix/kaldi-matrix.a \
-        ../util/kaldi-util.a ../base/kaldi-base.a
+        ../util/kaldi-util.a ../thread/kaldi-thread.a ../base/kaldi-base.a
 
 include ../makefiles/default_rules.mk
diff --git a/src/lat/Makefile b/src/lat/Makefile
@@ -16,7 +16,7 @@ OBJFILES = kaldi-lattice.o lattice-functions.o word-align-lattice.o \
 LIBNAME = kaldi-lat
 
 ADDLIBS = ../hmm/kaldi-hmm.a ../tree/kaldi-tree.a ../matrix/kaldi-matrix.a \
-          ../util/kaldi-util.a ../base/kaldi-base.a
+          ../util/kaldi-util.a ../thread/kaldi-thread.a ../base/kaldi-base.a
 
 
 include ../makefiles/default_rules.mk

diff --git a/src/lat/kaldi-lattice.h b/src/lat/kaldi-lattice.h
@@ -90,8 +90,11 @@ class CompactLatticeHolder {
 
   void Clear() { delete t_; t_ = NULL; }
 
-  ~CompactLatticeHolder() { Clear(); }
+  void Swap(CompactLatticeHolder *other) {
+    std::swap(t_, other->t_);
+  }
 
+  ~CompactLatticeHolder() { Clear(); }
  private:
   T *t_;
 };
@@ -120,8 +123,11 @@ class LatticeHolder {
 
   void Clear() {  delete t_; t_ = NULL; }
 
-  ~LatticeHolder() { Clear(); }
+  void Swap(LatticeHolder *other) {
+    std::swap(t_, other->t_);
+  }
 
+  ~LatticeHolder() { Clear(); }
  private:
   T *t_;
 };