moses-smt/mosesdecoder
1
1
Fork 0
mirror of https://github.com/moses-smt/mosesdecoder.git synced 2025-01-02 17:09:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Revert "start using State pointer"

Browse Source 
This reverts commit 37a3c125e0.
This commit is contained in:
Hieu Hoang 2016-02-18 10:46:13 -05:00
parent 2cb5271541
commit 69dbbf5430
2 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
contrib/other-builds/moses2/LM/KENLM.cpp
View File

@ -207,19 +207,13 @@ void KENLM::EvaluateWhenApplied(const Manager &mgr,
std::size_t position = begin;
typename Model::State aux_state;
const Model::State *state0 = &stateCast.state;
const Model::State *state1 = &aux_state;
typename Model::State *state0 = &stateCast.state, *state1 = &aux_state;
const LMCacheValue &val0 = ScoreAndCache(mgr, in_state, TranslateID(hypo.GetWord(position)));
float score = val0.first;
state0 = val0.second;
float score = ScoreAndCache(mgr, in_state, TranslateID(hypo.GetWord(position)), *state0);
++position;
for (; position < adjust_end; ++position) {
const LMCacheValue &val1 = ScoreAndCache(mgr, *state0, TranslateID(hypo.GetWord(position)));
score += val1.first;
state1 = val1.second;
score += ScoreAndCache(mgr, *state0, TranslateID(hypo.GetWord(position)), *state1);
std::swap(state0, state1);
}
@ -307,11 +301,11 @@ lm::WordIndex *KENLM::LastIDs(const Hypothesis &hypo, lm::WordIndex *indices) co
}
}
const KENLM::LMCacheValue &KENLM::ScoreAndCache(const Manager &mgr, const lm::ngram::State &in_state, const lm::WordIndex new_word) const
float KENLM::ScoreAndCache(const Manager &mgr, const lm::ngram::State &in_state, const lm::WordIndex new_word, lm::ngram::State &out_state) const
{
MemPool &pool = mgr.GetPool();
//cerr << "score=";
LMCacheValue *val;
float score;
CacheColl &lmCache = *((CacheColl*)mgr.lmCache);
LMCacheKey key(in_state, new_word);
@ -319,18 +313,23 @@ const KENLM::LMCacheValue &KENLM::ScoreAndCache(const Manager &mgr, const lm::ng
iter = lmCache.find(key);
if (iter == lmCache.end()) {
lm::ngram::State *newState = new (pool.Allocate<lm::ngram::State>()) lm::ngram::State();
float score = m_ngram->Score(in_state, new_word, *newState);
score = m_ngram->Score(in_state, new_word, *newState);
val = &lmCache[key];
val->first = score;
val->second = newState;
LMCacheValue &val = lmCache[key];
val.first = score;
val.second = newState;
out_state = *newState;
}
else {
val = &iter->second;
const LMCacheValue &val = iter->second;
score = val.first;
out_state = *val.second;
}
//score = m_ngram->Score(in_state, new_word, out_state);
//cerr << score << " " << (int) out_state.length << endl;
return *val;
return score;
}
KENLM::CacheColl &KENLM::GetCache() const

4
contrib/other-builds/moses2/LM/KENLM.h
View File

@ -81,7 +81,7 @@ protected:
std::vector<lm::WordIndex> m_lmIdLookup;
typedef std::pair<lm::ngram::State, lm::WordIndex> LMCacheKey;
typedef std::pair<float, const lm::ngram::State*> LMCacheValue;
typedef std::pair<float, lm::ngram::State*> LMCacheValue;
typedef boost::unordered_map<LMCacheKey, LMCacheValue> CacheColl;
mutable boost::thread_specific_ptr<CacheColl> m_cache;
@ -95,7 +95,7 @@ protected:
// Convert last words of hypothesis into vocab ids, returning an end pointer.
lm::WordIndex *LastIDs(const Hypothesis &hypo, lm::WordIndex *indices) const;
const LMCacheValue &ScoreAndCache(const Manager &mgr, const lm::ngram::State &in_state, const lm::WordIndex new_word) const;
float ScoreAndCache(const Manager &mgr, const lm::ngram::State &in_state, const lm::WordIndex new_word, lm::ngram::State &out_state) const;
CacheColl &GetCache() const;