added namespace nnet1 for nnetbin.

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

diff --git a/src/nnetbin/cmvn-to-nnet.cc b/src/nnetbin/cmvn-to-nnet.cc
index 82f1ee4fbbb6d9613621d55c0b5ff175a4f0f194..b9bce0c0375b7791f968c51935fdef8067db2e35 100644 (file)
--- a/src/nnetbin/cmvn-to-nnet.cc
+++ b/src/nnetbin/cmvn-to-nnet.cc
@@ -23,6 +23,7 @@
 int main(int argc, char *argv[]) {
   try {
     using namespace kaldi;
+    using namespace kaldi::nnet1;
     typedef kaldi::int32 int32;
 
     const char *usage =

diff --git a/src/nnetbin/nnet-concat.cc b/src/nnetbin/nnet-concat.cc
index b2ea5e99f820a6a5c4d9e30cfb0ce1d6a04e9754..040fd1130cab18eca84985a1f5d1545959fe9e38 100644 (file)
--- a/src/nnetbin/nnet-concat.cc
+++ b/src/nnetbin/nnet-concat.cc
@@ -22,6 +22,7 @@
 int main(int argc, char *argv[]) {
   try {
     using namespace kaldi;
+    using namespace kaldi::nnet1;
     typedef kaldi::int32 int32;
 
     const char *usage =

diff --git a/src/nnetbin/nnet-copy.cc b/src/nnetbin/nnet-copy.cc
index 8f825aca47f5bc098ac857362521f6339e1a6427..cba71c589d1a9387f6973f1740a711db3b5298d4 100644 (file)
--- a/src/nnetbin/nnet-copy.cc
+++ b/src/nnetbin/nnet-copy.cc
@@ -22,6 +22,7 @@
 int main(int argc, char *argv[]) {
   try {
     using namespace kaldi;
+    using namespace kaldi::nnet1;
     typedef kaldi::int32 int32;
 
     const char *usage =

diff --git a/src/nnetbin/nnet-forward.cc b/src/nnetbin/nnet-forward.cc
index 91f61212e487513fda7131385ed12474e4188f05..f9979457d47b51cdda658d74e05290e4926861f0 100644 (file)
--- a/src/nnetbin/nnet-forward.cc
+++ b/src/nnetbin/nnet-forward.cc
@@ -27,6 +27,7 @@
 
 int main(int argc, char *argv[]) {
   using namespace kaldi;
+  using namespace kaldi::nnet1;
   try {
     const char *usage =
         "Perform forward pass through Neural Network.\n"
@@ -68,6 +69,7 @@ int main(int argc, char *argv[]) {
         feature_wspecifier = po.GetArg(3);
         
     using namespace kaldi;
+    using namespace kaldi::nnet1;
     typedef kaldi::int32 int32;
 
     //Select the GPU

diff --git a/src/nnetbin/nnet-mpe.cc b/src/nnetbin/nnet-mpe.cc
new file mode 100644 (file)
index 0000000..20f8d59
--- /dev/null
+++ b/src/nnetbin/nnet-mpe.cc
@@ -0,0 +1,391 @@
+// nnetbin/nnet-mpe.cc
+
+// Copyright 2011-2013  Karel Vesely;  Arnab Ghoshal
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+// THIS CODE IS PROVIDED *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+// WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
+// MERCHANTABLITY OR NON-INFRINGEMENT.
+// See the Apache 2 License for the specific language governing permissions and
+// limitations under the License.
+
+
+#include "base/kaldi-common.h"
+#include "util/common-utils.h"
+#include "tree/context-dep.h"
+#include "hmm/transition-model.h"
+#include "fstext/fstext-lib.h"
+#include "decoder/faster-decoder.h"
+#include "decoder/decodable-matrix.h"
+#include "lat/kaldi-lattice.h"
+#include "lat/lattice-functions.h"
+
+#include "nnet/nnet-component.h"
+#include "nnet/nnet-activation.h"
+#include "nnet/nnet-nnet.h"
+#include "util/timer.h"
+#include "cudamatrix/cu-device.h"
+
+
+namespace kaldi {
+namespace nnet1 {
+
+void LatticeAcousticRescore(const Matrix<BaseFloat> &log_like,
+                            const TransitionModel &trans_model,
+                            const std::vector<int32> state_times,
+                            Lattice *lat) {
+  kaldi::uint64 props = lat->Properties(fst::kFstProperties, false);
+  if (!(props & fst::kTopSorted))
+    KALDI_ERR << "Input lattice must be topologically sorted.";
+
+  KALDI_ASSERT(!state_times.empty());
+  std::vector<std::vector<int32> > time_to_state(log_like.NumRows());
+  for (size_t i = 0; i < state_times.size(); i++) {
+    KALDI_ASSERT(state_times[i] >= 0);
+    if (state_times[i] < log_like.NumRows())  // end state may be past this..
+      time_to_state[state_times[i]].push_back(i);
+    else
+      KALDI_ASSERT(state_times[i] == log_like.NumRows()
+                   && "There appears to be lattice/feature mismatch.");
+  }
+
+  for (int32 t = 0; t < log_like.NumRows(); t++) {
+    for (size_t i = 0; i < time_to_state[t].size(); i++) {
+      int32 state = time_to_state[t][i];
+      for (fst::MutableArcIterator<Lattice> aiter(lat, state); !aiter.Done();
+           aiter.Next()) {
+        LatticeArc arc = aiter.Value();
+        int32 trans_id = arc.ilabel;
+        if (trans_id != 0) {  // Non-epsilon input label on arc
+          int32 pdf_id = trans_model.TransitionIdToPdf(trans_id);
+          arc.weight.SetValue2(-log_like(t, pdf_id) + arc.weight.Value2());
+          aiter.SetValue(arc);
+        }
+      }
+    }
+  }
+}
+
+}  // namespace nnet1
+}  // namespace kaldi
+
+
+int main(int argc, char *argv[]) {
+  using namespace kaldi;
+  using namespace kaldi::nnet1;
+  typedef kaldi::int32 int32;
+  try {
+    const char *usage =
+        "Perform iteration of Neural Network MPE/sMBR training by stochastic "
+        "gradient descent.\n"
+        "Usage:  nnet-mpe [options] <model-in> <transition-model-in> "
+        "<feature-rspecifier> <den-lat-rspecifier> <ali-rspecifier> [<model-out>]\n"
+        "e.g.: \n"
+        " nnet-mpe nnet.init trans.mdl scp:train.scp scp:denlats.scp ark:train.ali "
+        "nnet.iter1\n";
+
+    ParseOptions po(usage);
+    bool binary = false,
+        crossvalidate = false;
+    po.Register("binary", &binary, "Write output in binary mode");
+    po.Register("cross-validate", &crossvalidate,
+                "Perform cross-validation (don't backpropagate)");
+
+    BaseFloat learn_rate = 0.00001,
+        momentum = 0.0,
+        l2_penalty = 0.0,
+        l1_penalty = 0.0;
+
+    po.Register("learn-rate", &learn_rate, "Learning rate");
+    po.Register("momentum", &momentum, "Momentum");
+    po.Register("l2-penalty", &l2_penalty, "L2 penalty (weight decay)");
+    po.Register("l1-penalty", &l1_penalty, "L1 penalty (promote sparsity)");
+
+    std::string feature_transform, class_frame_counts, silence_phones_str;
+    po.Register("feature-transform", &feature_transform,
+                "Feature transform Neural Network");
+    po.Register("class-frame-counts", &class_frame_counts,
+                "Class frame counts to compute the class priors");
+    po.Register("silence-phones", &silence_phones_str, "Colon-separated list "
+                "of integer id's of silence phones, e.g. 46:47");
+
+    BaseFloat acoustic_scale = 1.0,
+        lm_scale = 1.0,
+        old_acoustic_scale = 0.0;
+    po.Register("acoustic-scale", &acoustic_scale,
+                "Scaling factor for acoustic likelihoods");
+    po.Register("lm-scale", &lm_scale,
+                "Scaling factor for \"graph costs\" (including LM costs)");
+    po.Register("old-acoustic-scale", &old_acoustic_scale,
+                "Add in the scores in the input lattices with this scale, rather "
+                "than discarding them.");
+
+    bool do_smbr = false;
+    po.Register("do-smbr", &do_smbr, "Use state-level accuracies instead of "
+                "phone accuracies.");
+
+#if HAVE_CUDA == 1
+    kaldi::int32 use_gpu_id=-2;
+    po.Register("use-gpu-id", &use_gpu_id, "Manually select GPU by its ID "
+                "(-2 automatic selection, -1 disable GPU, 0..N select GPU)");
+#endif
+
+    po.Read(argc, argv);
+
+    if (po.NumArgs() != 6-(crossvalidate?1:0)) {
+      po.PrintUsage();
+      exit(1);
+    }
+
+    std::string model_filename = po.GetArg(1),
+        transition_model_filename = po.GetArg(2),
+        feature_rspecifier = po.GetArg(3),
+        den_lat_rspecifier = po.GetArg(4),
+        ref_ali_rspecifier = po.GetArg(5);
+
+    std::string target_model_filename;
+    if (!crossvalidate) {
+      target_model_filename = po.GetArg(6);
+    }
+
+    std::vector<int32> silence_phones;
+    if (!kaldi::SplitStringToIntegers(silence_phones_str, ":", false,
+                                      &silence_phones))
+      KALDI_ERR << "Invalid silence-phones string " << silence_phones_str;
+    kaldi::SortAndUniq(&silence_phones);
+    if (silence_phones.empty())
+      KALDI_LOG << "No silence phones specified.";
+
+    // Select the GPU
+#if HAVE_CUDA == 1
+    if (use_gpu_id > -2)
+      CuDevice::Instantiate().SelectGpuId(use_gpu_id);
+#endif
+
+    Nnet nnet_transf;
+    if (feature_transform != "") {
+      nnet_transf.Read(feature_transform);
+    }
+
+    Nnet nnet;
+    nnet.Read(model_filename);
+    // using activations directly: remove softmax, if present
+    if (nnet.Layer(nnet.LayerCount()-1)->GetType() == Component::kSoftmax) {
+      KALDI_LOG << "Removing softmax from the nnet " << model_filename;
+      nnet.RemoveLayer(nnet.LayerCount()-1);
+    } else {
+      KALDI_LOG << "The nnet was without softmax " << model_filename;
+    }
+
+    nnet.SetLearnRate(learn_rate, NULL);
+    nnet.SetMomentum(momentum);
+    nnet.SetL2Penalty(l2_penalty);
+    nnet.SetL1Penalty(l1_penalty);
+
+    TransitionModel trans_model;
+    ReadKaldiObject(transition_model_filename, &trans_model);
+
+    SequentialBaseFloatMatrixReader feature_reader(feature_rspecifier);
+    RandomAccessLatticeReader den_lat_reader(den_lat_rspecifier);
+    RandomAccessInt32VectorReader ref_ali_reader(ref_ali_rspecifier);
+
+    CuMatrix<BaseFloat> feats, feats_transf, nnet_out, nnet_diff;
+    Matrix<BaseFloat> nnet_out_h, nnet_diff_h;
+
+    // Read the class-counts, compute priors
+    CuVector<BaseFloat> log_priors;
+    if (class_frame_counts != "") {
+      Vector<BaseFloat> tmp_priors;
+      Input in;
+      in.OpenTextMode(class_frame_counts);
+      tmp_priors.Read(in.Stream(), false);
+      in.Close();
+
+      // create inv. priors, or log inv priors
+      BaseFloat sum = tmp_priors.Sum();
+      tmp_priors.Scale(1.0 / sum);
+      tmp_priors.ApplyLog();
+
+      // push priors to GPU
+      log_priors.Resize(tmp_priors.Dim());
+      log_priors.CopyFromVec(tmp_priors);
+    }
+
+
+    Timer time;
+    double time_now = 0;
+    KALDI_LOG << (crossvalidate?"CROSSVALIDATE":"TRAINING") << " STARTED";
+
+    int32 num_done = 0, num_no_ref_ali = 0, num_no_den_lat = 0,
+        num_other_error = 0;
+
+    kaldi::int64 total_frames = 0;
+    double total_frame_acc = 0.0, utt_frame_acc;
+
+    // do per-utterance processing
+    for (; !feature_reader.Done(); feature_reader.Next()) {
+      std::string utt = feature_reader.Key();
+      if (!den_lat_reader.HasKey(utt)) {
+        KALDI_WARN << "Utterance " << utt << ": found no lattice.";
+        num_no_den_lat++;
+        continue;
+      }
+      if (!ref_ali_reader.HasKey(utt)) {
+        KALDI_WARN << "Utterance " << utt << ": found no reference alignment.";
+        num_no_ref_ali++;
+        continue;
+      }
+
+      // 1) get the features, numerator alignment
+      const Matrix<BaseFloat> &mat = feature_reader.Value();
+      const std::vector<int32> &ref_ali = ref_ali_reader.Value(utt);
+      // check for temporal length of numerator alignments
+      if (static_cast<MatrixIndexT>(ref_ali.size()) != mat.NumRows()) {
+        KALDI_WARN << "Numerator alignment has wrong length "
+                   << ref_ali.size() << " vs. "<< mat.NumRows();
+        num_other_error++;
+        continue;
+      }
+
+      // 2) get the denominator lattice, preprocess
+      Lattice den_lat = den_lat_reader.Value(utt);
+      if (old_acoustic_scale != 1.0) {
+        fst::ScaleLattice(fst::AcousticLatticeScale(old_acoustic_scale),
+                          &den_lat);
+      }
+      // sort it topologically if not already so
+      kaldi::uint64 props = den_lat.Properties(fst::kFstProperties, false);
+      if (!(props & fst::kTopSorted)) {
+        if (fst::TopSort(&den_lat) == false)
+          KALDI_ERR << "Cycles detected in lattice.";
+      }
+      // get the lattice length and times of states
+      vector<int32> state_times;
+      int32 max_time = kaldi::LatticeStateTimes(den_lat, &state_times);
+      // check for temporal length of denominator lattices
+      if (max_time != mat.NumRows()) {
+        KALDI_WARN << "Denominator lattice has wrong length " << max_time
+                   << " vs. " << mat.NumRows();
+        num_other_error++;
+        continue;
+      }
+
+      // 3) propagate the feature to get the log-posteriors (nnet w/o sofrmax)
+      // push features to GPU
+      feats = mat;
+      // possibly apply transform
+      nnet_transf.Feedforward(feats, &feats_transf);
+      // propagate through the nnet (assuming w/o softmax)
+      nnet.Propagate(feats_transf, &nnet_out);
+      // subtract the log_priors
+      if (log_priors.Dim() > 0) {
+        nnet_out.AddVecToRows(-1.0, log_priors);
+      }
+      // transfer it back to the host
+      int32 num_frames = nnet_out.NumRows(),
+          num_pdfs = nnet_out.NumCols();
+      nnet_out_h.Resize(num_frames, num_pdfs, kUndefined);
+      nnet_out.CopyToMat(&nnet_out_h);
+
+      // 4) rescore the latice
+      LatticeAcousticRescore(nnet_out_h, trans_model, state_times, &den_lat);
+      if (acoustic_scale != 1.0 || lm_scale != 1.0)
+        fst::ScaleLattice(fst::LatticeScale(lm_scale, acoustic_scale), &den_lat);
+
+      // 5) get the posteriors
+      vector< std::map<int32, char> > arc_accs;
+      arc_accs.resize(ref_ali.size());
+      kaldi::Posterior post;
+
+      if (do_smbr) {  // use state-level accuracies, i.e. sMBR estimation
+        for (size_t i = 0; i < ref_ali.size(); i++) {
+          int32 pdf = trans_model.TransitionIdToPdf(ref_ali[i]);
+          arc_accs[i][pdf] = 1;
+        }
+        utt_frame_acc = LatticeForwardBackwardSmbr(den_lat, trans_model,
+                                                   arc_accs, silence_phones,
+                                                   &post);
+      } else {  // use phone-level accuracies, i.e. regular MPE
+        for (size_t i = 0; i < ref_ali.size(); i++) {
+          int32 phone = trans_model.TransitionIdToPhone(ref_ali[i]);
+          arc_accs[i][phone] = 1;
+        }
+        utt_frame_acc = kaldi::LatticeForwardBackwardMpe(den_lat, trans_model,
+                                                         arc_accs, &post,
+                                                         silence_phones);
+      }
+
+      // 6) convert the Posterior to a matrix
+      nnet_diff_h.Resize(num_frames, num_pdfs, kSetZero);
+      for (int32 t = 0; t < post.size(); t++) {
+        for (int32 arc = 0; arc < post[t].size(); arc++) {
+          int32 pdf = trans_model.TransitionIdToPdf(post[t][arc].first);
+          nnet_diff_h(t, pdf) -= post[t][arc].second;
+        }
+      }
+
+      KALDI_VLOG(1) << "Processed lattice for utterance " << num_done + 1
+                    << " (" << utt << "): found " << den_lat.NumStates()
+                    << " states and " << fst::NumArcs(den_lat) << " arcs.";
+
+      KALDI_VLOG(1) << "Utterance " << utt << ": Average frame accuracy = "
+                    << (utt_frame_acc/num_frames) << " over " << num_frames
+                    << " frames.";
+
+      // 9) backpropagate through the nnet
+      if (!crossvalidate) {
+        nnet_diff = nnet_diff_h;
+        nnet.Backpropagate(nnet_diff, NULL);
+      }
+
+      // increase time counter
+      total_frame_acc += utt_frame_acc;
+      total_frames += num_frames;
+      num_done++;
+
+      if (num_done % 100 == 0) {
+        time_now = time.Elapsed();
+        KALDI_VLOG(1) << "After " << num_done << "utterances: time elapsed = "
+                      << time_now/60 << " min; processed " << total_frames/time_now
+                      << " frames per second.";
+      }
+    }
+
+    if (!crossvalidate) {
+      // add the softmax layer back before writing
+      KALDI_LOG << "Appending the softmax " << target_model_filename;
+      nnet.AppendLayer(new Softmax(nnet.OutputDim(),nnet.OutputDim(),&nnet));
+      //store the nnet
+      nnet.Write(target_model_filename, binary);
+    }
+
+    time_now = time.Elapsed();
+    KALDI_LOG << (crossvalidate?"CROSSVALIDATE":"TRAINING") << " FINISHED; "
+              << "Time taken = " << time_now/60 << " min; processed "
+              << (total_frames/time_now) << " frames per second.";
+
+    KALDI_LOG << "Done " << num_done << " files, "
+              << num_no_ref_ali << " with no reference alignments, "
+              << num_no_den_lat << " with no lattices, "
+              << num_other_error << " with other errors.";
+
+    KALDI_LOG << "Overall average frame-accuracy is "
+              << (total_frame_acc/total_frames) << " over " << total_frames
+              << " frames.";
+
+#if HAVE_CUDA == 1
+    CuDevice::Instantiate().PrintProfile();
+#endif
+
+    return 0;
+  } catch(const std::exception &e) {
+    std::cerr << e.what();
+    return -1;
+  }
+}

diff --git a/src/nnetbin/nnet-train-mmi-sequential.cc b/src/nnetbin/nnet-train-mmi-sequential.cc
index 4f92b28353c604b1d090164a24ecceed1bdfca6d..d5157154e6db460b5dfb67a3128f69956e1fa056 100644 (file)
--- a/src/nnetbin/nnet-train-mmi-sequential.cc
+++ b/src/nnetbin/nnet-train-mmi-sequential.cc
@@ -38,6 +38,7 @@
 
 
 namespace kaldi {
+namespace nnet1 {
 
 void LatticeAcousticRescore(const Matrix<BaseFloat> &log_like,
                             const TransitionModel &trans_model,
@@ -75,11 +76,13 @@ void LatticeAcousticRescore(const Matrix<BaseFloat> &log_like,
   }
 }
 
+}  // namespace nnet1
 }  // namespace kaldi
 
 
 int main(int argc, char *argv[]) {
   using namespace kaldi;
+  using namespace kaldi::nnet1;
   typedef kaldi::int32 int32;
   try {
     const char *usage =
@@ -147,6 +150,7 @@ int main(int argc, char *argv[]) {
 
      
     using namespace kaldi;
+    using namespace kaldi::nnet1;
     typedef kaldi::int32 int32;
 
     // Select the GPU

diff --git a/src/nnetbin/nnet-train-mpe-sequential.cc b/src/nnetbin/nnet-train-mpe-sequential.cc
index 25ec79cd497f6be0acedc5ffe11703131cc24d9a..2cf089eae893c27d5593522c2de5668bafd6ad0a 100644 (file)
--- a/src/nnetbin/nnet-train-mpe-sequential.cc
+++ b/src/nnetbin/nnet-train-mpe-sequential.cc
@@ -36,6 +36,7 @@
 
 
 namespace kaldi {
+namespace nnet1 {
 
 void LatticeAcousticRescore(const Matrix<BaseFloat> &log_like,
                             const TransitionModel &trans_model,
@@ -73,11 +74,13 @@ void LatticeAcousticRescore(const Matrix<BaseFloat> &log_like,
   }
 }
 
+}  // namespace nnet1
 }  // namespace kaldi
 
 
 int main(int argc, char *argv[]) {
   using namespace kaldi;
+  using namespace kaldi::nnet1;
   typedef kaldi::int32 int32;
   try {
     const char *usage =

diff --git a/src/nnetbin/nnet-train-mse-tgtmat-frmshuff.cc b/src/nnetbin/nnet-train-mse-tgtmat-frmshuff.cc
index 818a29972dd9fdb54bc72fe82486fc676ceecce5..2721c3f776836f9978ef6fdff96024a831a85b0a 100644 (file)
--- a/src/nnetbin/nnet-train-mse-tgtmat-frmshuff.cc
+++ b/src/nnetbin/nnet-train-mse-tgtmat-frmshuff.cc
@@ -31,6 +31,7 @@
 
 int main(int argc, char *argv[]) {
   using namespace kaldi;
+  using namespace kaldi::nnet1;
   try {
     const char *usage =
         "Perform one iteration of Neural Network training by stochastic gradient descent.\n"
@@ -83,6 +84,7 @@ int main(int argc, char *argv[]) {
     srand(seed);
      
     using namespace kaldi;
+    using namespace kaldi::nnet1;
     typedef kaldi::int32 int32;
 
     //Select the GPU

diff --git a/src/nnetbin/nnet-train-xent-hardlab-frmshuff-prior.cc b/src/nnetbin/nnet-train-xent-hardlab-frmshuff-prior.cc
index deab0680c1228d882e22bc575538f611c522777a..070bd05727a00e66da9efc2093f9a430ace49ee7 100644 (file)
--- a/src/nnetbin/nnet-train-xent-hardlab-frmshuff-prior.cc
+++ b/src/nnetbin/nnet-train-xent-hardlab-frmshuff-prior.cc
@@ -27,6 +27,7 @@
 
 int main(int argc, char *argv[]) {
   using namespace kaldi;
+  using namespace kaldi::nnet1;
   try {
     const char *usage =
         "Perform one iteration of Neural Network training by stochastic gradient descent.\n"
@@ -87,6 +88,7 @@ int main(int argc, char *argv[]) {
     srand(seed);
      
     using namespace kaldi;
+    using namespace kaldi::nnet1;
     typedef kaldi::int32 int32;
 
     //Select the GPU

diff --git a/src/nnetbin/nnet-train-xent-hardlab-frmshuff.cc b/src/nnetbin/nnet-train-xent-hardlab-frmshuff.cc
index efbe4cffb769493864a88785be0ca2e74ed471a2..8e395ed6cdea796f5eea6a8417cedac143b4d55f 100644 (file)
--- a/src/nnetbin/nnet-train-xent-hardlab-frmshuff.cc
+++ b/src/nnetbin/nnet-train-xent-hardlab-frmshuff.cc
@@ -27,6 +27,7 @@
 
 int main(int argc, char *argv[]) {
   using namespace kaldi;
+  using namespace kaldi::nnet1;
   try {
     const char *usage =
         "Perform one iteration of Neural Network training by stochastic gradient descent.\n"
@@ -79,6 +80,7 @@ int main(int argc, char *argv[]) {
     srand(seed);
      
     using namespace kaldi;
+    using namespace kaldi::nnet1;
     typedef kaldi::int32 int32;
 
     //Select the GPU

diff --git a/src/nnetbin/nnet-train-xent-hardlab-perutt.cc b/src/nnetbin/nnet-train-xent-hardlab-perutt.cc
index 8173eb9e7b4b8a863aed15aabb7cc198b1a0970a..4daf8956ed2fcdae42091081ceceab2c1fc37c5a 100644 (file)
--- a/src/nnetbin/nnet-train-xent-hardlab-perutt.cc
+++ b/src/nnetbin/nnet-train-xent-hardlab-perutt.cc
@@ -26,6 +26,7 @@
 
 int main(int argc, char *argv[]) {
   using namespace kaldi;
+  using namespace kaldi::nnet1;
   try {
     const char *usage =
         "Perform one iteration of Neural Network training by stochastic gradient descent.\n"
@@ -69,6 +70,7 @@ int main(int argc, char *argv[]) {
 
      
     using namespace kaldi;
+    using namespace kaldi::nnet1;
     typedef kaldi::int32 int32;
 
     //Select the GPU

diff --git a/src/nnetbin/nnet-trim-n-last-transforms.cc b/src/nnetbin/nnet-trim-n-last-transforms.cc
new file mode 100644 (file)
index 0000000..40296a6
--- /dev/null
+++ b/src/nnetbin/nnet-trim-n-last-transforms.cc
@@ -0,0 +1,74 @@
+// nnetbin/nnet-trim-last-n-layers.cc
+
+// Copyright 2012  Karel Vesely
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+// THIS CODE IS PROVIDED *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+// WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
+// MERCHANTABLITY OR NON-INFRINGEMENT.
+// See the Apache 2 License for the specific language governing permissions and
+// limitations under the License.
+
+#include "base/kaldi-common.h"
+#include "util/common-utils.h"
+#include "nnet/nnet-nnet.h"
+
+int main(int argc, char *argv[]) {
+  try {
+    using namespace kaldi;
+    using namespace kaldi::nnet1;
+    typedef kaldi::int32 int32;
+
+    const char *usage =
+        "Trim ending part of the MLP\n"
+        "Usage:  nnet-trim-last-n-layers [options] <model-in> <model-out>\n"
+        "e.g.:\n"
+        " nnet-trim-last-n-layers --binary=false nnet.mdl nnet_txt.mdl\n";
+
+
+    bool binary_write = false;
+    
+    ParseOptions po(usage);
+    po.Register("binary", &binary_write, "Write output in binary mode");
+
+    int32 trim_num = 0;
+    po.Register("n", &trim_num, "Number of transforms to be trimmed (include simgoid/softmax)");
+
+    po.Read(argc, argv);
+
+    if (po.NumArgs() != 2) {
+      po.PrintUsage();
+      exit(1);
+    }
+
+    std::string model_in_filename = po.GetArg(1),
+        model_out_filename = po.GetArg(2);
+
+    Nnet nnet; 
+    {
+      bool binary_read;
+      Input ki(model_in_filename, &binary_read);
+      nnet.Read(ki.Stream(), binary_read);
+    }
+
+    {
+      Output ko(model_out_filename, binary_write);
+      int32 write_num_layers = nnet.LayerCount() - trim_num;
+      nnet.WriteFrontLayers(ko.Stream(), binary_write, write_num_layers);
+    }
+
+    KALDI_LOG << "Written model to " << model_out_filename;
+    return 0;
+  } catch(const std::exception& e) {
+    std::cerr << e.what() << '\n';
+    return -1;
+  }
+}
+
+

diff --git a/src/nnetbin/rbm-convert-to-nnet.cc b/src/nnetbin/rbm-convert-to-nnet.cc
index eb12997d3c803566236e07d26c61b6deb12b56e4..2f7e504dbd1da4cc71ec1cb78792728252559fa0 100644 (file)
--- a/src/nnetbin/rbm-convert-to-nnet.cc
+++ b/src/nnetbin/rbm-convert-to-nnet.cc
@@ -23,6 +23,7 @@
 int main(int argc, char *argv[]) {
   try {
     using namespace kaldi;
+    using namespace kaldi::nnet1;
     typedef kaldi::int32 int32;
 
     const char *usage =

diff --git a/src/nnetbin/rbm-train-cd1-frmshuff.cc b/src/nnetbin/rbm-train-cd1-frmshuff.cc
index d1b9ff27c03b3f1ac6808927bf038225377c30ea..3f20cf812b89c8b05ff33602f7413c30f4baa428 100644 (file)
--- a/src/nnetbin/rbm-train-cd1-frmshuff.cc
+++ b/src/nnetbin/rbm-train-cd1-frmshuff.cc
@@ -29,6 +29,7 @@
 
 int main(int argc, char *argv[]) {
   using namespace kaldi;
+  using namespace kaldi::nnet1;
   try {
     const char *usage =
         "Train RBM by Contrastive Divergence alg. with 1 step of "
@@ -82,6 +83,7 @@ int main(int argc, char *argv[]) {
 
      
     using namespace kaldi;
+    using namespace kaldi::nnet1;
     typedef kaldi::int32 int32;
 
     //Select the GPU

diff --git a/src/nnetbin/transf-to-nnet.cc b/src/nnetbin/transf-to-nnet.cc
index 69408d48e5012ed7f70f456acd2579c496a46540..dca288bb6a917480d33b7e21a5d545847414b0d7 100644 (file)
--- a/src/nnetbin/transf-to-nnet.cc
+++ b/src/nnetbin/transf-to-nnet.cc
@@ -23,6 +23,7 @@
 int main(int argc, char *argv[]) {
   try {
     using namespace kaldi;
+    using namespace kaldi::nnet1;
     typedef kaldi::int32 int32;
 
     const char *usage =