Commit Graph

9197 Commits

Author SHA1 Message Date
Kenneth Heafield
8f4305e12f Allocate less, switch to existing being continuation 2012-10-17 08:50:08 -04:00
Kenneth Heafield
4cf1ffb7d8 Simplify SetRuleCount 2012-10-17 11:48:30 +01:00
Barry Haddow
ed9d8c4992 Merge branch 'master' of github.com:moses-smt/mosesdecoder 2012-10-17 11:22:40 +01:00
Barry Haddow
a642705ed3 rule count for glue rule 2012-10-17 11:22:09 +01:00
Barry Haddow
befe18351f OnDisk phrase table is not thread-safe!
And declaring it to be so does not make it so.

Also, ensure that the phrase dictionary is loaded before
it is used.
2012-10-17 11:18:38 +01:00
Kenneth Heafield
9f232895f3 More loading optimization
Cleanup Phrase substr, optimistic single-threaded FactorCollection lookup

Before:
user    242.228
sys     4.890
VmPeak: 17294456 kB
VmRSS:  17235148 kB

After:
user    215.322
sys     5.029
VmPeak: 17294544 kB
VmRSS:  17235304 kB
2012-10-17 11:07:42 +01:00
Kenneth Heafield
8ebaf44ae8 tmpnam is evil 2012-10-17 10:06:38 +01:00
Kenneth Heafield
63dda2a79d Merge remote branch 'upstream/master' 2012-10-16 18:21:07 -04:00
Kenneth Heafield
0340026ca2 Got tired of loading time. Again.
After miramerge went in:
real    6m8.948s
user    5m57.609s
sys     0m10.823s

Now:
real    4m27.469s
user    4m16.311s
sys     0m10.605s
2012-10-16 18:18:57 -04:00
Hieu Hoang
13249c54e5 Merge branch 'master' of github.com:moses-smt/mosesdecoder 2012-10-16 19:01:10 +01:00
Hieu Hoang
bd9f4c282e explicit operator= . Required for gcc 4.6.3 but not 4.5.0 2012-10-16 19:00:41 +01:00
Kenneth Heafield
43fcd44a1d Merge remote branch 'upstream/master' 2012-10-16 12:59:18 -04:00
Kenneth Heafield
b9d228b281 Fix compiler errors for more strict compilers 2012-10-16 12:58:38 -04:00
Hieu Hoang
275dca4be1 explicit operator= . Required for gcc 4.6.3 but not 4.5.0 2012-10-16 17:50:00 +01:00
Kenneth Heafield
96bc9d05dc Move pool to util 2012-10-16 17:35:27 +01:00
Kenneth Heafield
f9f5b4eb0a Merge remote branch 'upstream/master' 2012-10-16 17:23:17 +01:00
Kenneth Heafield
3cc4d04959 Fix score should have been += 2012-10-16 17:18:56 +01:00
Hieu Hoang
f0714bb1bc minor compile error 2012-10-16 16:57:06 +01:00
Hieu Hoang
e208c997d9 same version number check when reading and writing 2012-10-16 16:29:33 +01:00
Hieu Hoang
a6f63af172 same version number check when reading and writing 2012-10-16 16:26:31 +01:00
Barry Haddow
84f616fe63 Increase version number to 5 2012-10-16 16:20:56 +01:00
Barry Haddow
ceb7de4036 Merge remote branch 'origin/miramerge' 2012-10-16 15:50:25 +01:00
Barry Haddow
b4a77c7654 Merge remote branch 'origin/miramerge' 2012-10-16 15:42:57 +01:00
Barry Haddow
42d74f2306 Fix regression test 2012-10-16 15:23:26 +01:00
Kenneth Heafield
0378a58a37 Start arbitrary arity. Currently incorrect. 2012-10-16 12:57:18 +01:00
Hieu Hoang
2f25e74ce0 don't use git submodules for regression test data 2012-10-15 21:41:55 +01:00
Barry Haddow
365e680115 Merge remote-tracking branch 'origin/master' into miramerge
NB Untested

Conflicts:
	Jamroot
	moses-chart-cmd/src/Main.cpp
	moses/src/ChartManager.cpp
	moses/src/RuleTable/LoaderStandard.cpp
	moses/src/RuleTable/PhraseDictionaryALSuffixArray.cpp
	moses/src/Word.cpp
2012-10-15 21:35:56 +01:00
Kenneth Heafield
0eb98df0fe Submodules are evil. Undo it. 2012-10-15 13:58:33 +01:00
Kenneth Heafield
ed00315c8c Remove Owner class 2012-10-15 06:43:43 -04:00
Kenneth Heafield
0265725c03 Merge 2012-10-14 16:02:04 -04:00
Kenneth Heafield
d8eae3f886 Hieu, stop reverting the tests pointer! 2012-10-14 20:54:11 +01:00
Kenneth Heafield
3817742b21 Merge branch 'master' of github.com:moses-smt/mosesdecoder 2012-10-14 20:52:41 +01:00
Kenneth Heafield
44eee4dcd2 FilePieceify LoaderStandard. 2012-10-14 20:52:12 +01:00
Hieu Hoang
f3ec76ac56 minor change to calling irst training 2012-10-14 19:51:46 +01:00
Kenneth Heafield
a0ce62e795 Got tired of waiting for loading. 2012-10-14 17:35:58 +01:00
Kenneth Heafield
0995fa52a8 Use non-terminal alignments 2012-10-14 16:05:29 +01:00
Barry Haddow
61ae24aa5d Merge remote-tracking branch 'origin/master' into miramerge
Conflicts:
	moses/src/PhraseDictionary.cpp
	moses/src/TargetPhrase.cpp
	moses/src/TargetPhrase.h
2012-10-14 14:18:03 +01:00
Kenneth Heafield
031995d897 Insert blanks properly 2012-10-13 20:49:49 +01:00
Kenneth Heafield
0be55e4773 Update tests 2012-10-13 20:36:03 +01:00
Kenneth Heafield
64f91af29d Refactor to streamline edge creation 2012-10-13 20:32:55 +01:00
Kenneth Heafield
8ed542cf29 Merge remote branch 'upstream/master'
Conflicts:
	moses/src/TargetPhrase.h
2012-10-13 19:39:59 +01:00
Kenneth Heafield
0d9095983d Remove tmodel from TargetPhrase 2012-10-13 19:30:39 +01:00
Kenneth Heafield
42f009d86d Hacky intermediate state 2012-10-13 18:42:42 +01:00
Kenneth Heafield
0fd784968f Merge branch 'master' of github.com:kpu/moses-lazy 2012-10-13 18:38:14 +01:00
Kenneth Heafield
1f77801c24 Use newfangled score given in phrase. Fix bug for OOVs. 2012-10-13 13:35:37 -04:00
Kenneth Heafield
c55671b38e Merge remote branch 'upstream/master' 2012-10-13 12:04:09 -04:00
Kenneth Heafield
0a08ed416f Merge remote branch 'upstream/master' 2012-10-13 16:50:47 +01:00
Kenneth Heafield
1b759c169a Rule score with left rest (default same) 2012-10-13 16:49:40 +01:00
Kenneth Heafield
a1d040be11 Update moses side for edges without scores. 2012-10-12 18:34:52 +01:00
Kenneth Heafield
a2758a1ea0 Fix the -100 score and save some memory 2012-10-12 17:04:36 +01:00