Skip to content

Only include tokens with <eps> arc in queue #2641

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danpovey merged 13 commits into from
Aug 30, 2018
Merged

Only include tokens with <eps> arc in queue #2641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
1cff4f9
in ProcessNonemitting, check the number of input epsilons
desh2608 Aug 23, 2018
8889540
only include tokens with <eps> arc in queue
desh2608 Aug 24, 2018
25391a8
Merge branch 'master' of https://github.com/kaldi-asr/kaldi
desh2608 Aug 24, 2018
2f484c4
fixed loop
desh2608 Aug 25, 2018
6125650
minor fix
desh2608 Aug 25, 2018
f46d934
minor fix
desh2608 Aug 25, 2018
aaa799a
changed fst to object
desh2608 Aug 25, 2018
098c2e6
changed fst to object
desh2608 Aug 25, 2018
1f91b7e
changed fst to object
desh2608 Aug 26, 2018
e274fad
minor fix
desh2608 Aug 26, 2018
145b514
added check in other loop
desh2608 Aug 26, 2018
3e89d3c
best_cost outside if
desh2608 Aug 26, 2018
b42e5e1
changed 'key' to 'state'
desh2608 Aug 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/decoder/lattice-faster-decoder.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -809,8 +809,11 @@ void LatticeFasterDecoder::ProcessNonemitting(BaseFloat cutoff) {
// problem did not improve overall speed.

KALDI_ASSERT(queue_.empty());
for (const Elem *e = toks_.GetList(); e != NULL; e = e->tail)
queue_.push_back(e->key);
for (const Elem *e = toks_.GetList(); e != NULL; e = e->tail) {
StateId state = e->key;
if (fst_.NumInputEpsilons(state) != 0)
queue_.push_back(state);
}
if (queue_.empty()) {
if (!warned_) {
KALDI_WARN << "Error, no surviving tokens: frame is " << frame;
Expand Down Expand Up @@ -850,7 +853,8 @@ void LatticeFasterDecoder::ProcessNonemitting(BaseFloat cutoff) {

// "changed" tells us whether the new token has a different
// cost from before, or is new [if so, add into queue].
if (changed) queue_.push_back(arc.nextstate);
if (changed && fst_.NumInputEpsilons(arc.nextstate) != 0)
queue_.push_back(arc.nextstate);
}
}
} // for all arcs
Expand Down
10 changes: 7 additions & 3 deletions src/decoder/lattice-faster-online-decoder.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -989,8 +989,11 @@ void LatticeFasterOnlineDecoder::ProcessNonemitting(BaseFloat cutoff) {
// problem did not improve overall speed.

KALDI_ASSERT(queue_.empty());
for (const Elem *e = toks_.GetList(); e != NULL; e = e->tail)
queue_.push_back(e->key);
for (const Elem *e = toks_.GetList(); e != NULL; e = e->tail) {
StateId state = e->key;
if (fst_.NumInputEpsilons(state) != 0)
queue_.push_back(state);
}
if (queue_.empty()) {
if (!warned_) {
KALDI_WARN << "Error, no surviving tokens: frame is " << frame;
Expand Down Expand Up @@ -1030,7 +1033,8 @@ void LatticeFasterOnlineDecoder::ProcessNonemitting(BaseFloat cutoff) {

// "changed" tells us whether the new token has a different
// cost from before, or is new [if so, add into queue].
if (changed) queue_.push_back(arc.nextstate);
if (changed && fst_.NumInputEpsilons(arc.nextstate) != 0)
queue_.push_back(arc.nextstate);
}
}
} // for all arcs
Expand Down
6 changes: 4 additions & 2 deletions src/decoder/lattice-simple-decoder.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,9 @@ void LatticeSimpleDecoder::ProcessNonemitting() {
for (unordered_map<StateId, Token*>::iterator iter = cur_toks_.begin();
iter != cur_toks_.end();
++iter) {
queue.push_back(iter->first);
StateId state = iter->first;
if (fst_.NumInputEpsilons(state) != 0)
queue.push_back(state);
best_cost = std::min(best_cost, iter->second->tot_cost);
}
if (queue.empty()) {
Expand Down Expand Up @@ -604,7 +606,7 @@ void LatticeSimpleDecoder::ProcessNonemitting() {

// "changed" tells us whether the new token has a different
// cost from before, or is new [if so, add into queue].
if (changed)
if (changed && fst_.NumInputEpsilons(arc.nextstate) != 0)
queue.push_back(arc.nextstate);
}
}
Expand Down