Hieu Hoang
4285a6c7df
move Uli's new pt into it's own folder. Comment out bjam compile. Doesn't work on MacOSX yet
2013-09-26 10:10:12 +01:00
Ulrich Germann
d511744f90
Changed int to size_t to avoid compiler signed/unsigned comparison warnings.
2013-09-25 22:34:55 +01:00
Ulrich Germann
050b089ea0
Merge branch 'master' of github.com:moses-smt/mosesdecoder
...
Conflicts:
moses/FF/ControlRecombination.cpp
moses/TranslationModel/SkeletonPT.cpp
2013-09-25 22:33:27 +01:00
Ulrich Germann
4fffe80c0c
Formatting.
2013-09-25 22:09:21 +01:00
Hieu Hoang
847f7c1ea2
skeleton PT
2013-09-25 20:59:13 +01:00
Hieu Hoang
1758381c98
skeleton PT
2013-09-25 19:24:50 +01:00
Hieu Hoang
deafd5922d
skeleton PT
2013-09-25 16:57:01 +01:00
Ulrich Germann
82274ffda7
Merge branch 'dynamic-phrase-tables'
...
Conflicts:
moses/FF/ControlRecombination.cpp
moses/Phrase.cpp
2013-09-25 13:52:05 +01:00
=
e3ba4a9890
Initial check-in.
2013-09-25 00:51:50 +01:00
=
61dacaa9bd
Moved duplicate struct CompareTargetPhrase to TargetPhraseCollection.{h|cpp}
2013-09-25 00:05:45 +01:00
=
d0a5921fbb
Fixed some code formatting.
2013-09-25 00:03:46 +01:00
=
c227cde790
Fixed code formatting.
2013-09-24 23:57:49 +01:00
=
515ee545b1
Fixed code formatting.
2013-09-24 23:57:32 +01:00
=
ae550d05f4
Fixed some code formatting issues.
2013-09-24 23:56:47 +01:00
=
42f9f81495
Fixed some code formatting issues.
2013-09-24 23:56:23 +01:00
Hieu Hoang
fc4cabce98
skeleton PT
2013-09-24 22:50:43 +01:00
Hieu Hoang
e6f53d83c2
get rid of some warnings
2013-09-22 18:24:32 +02:00
Hieu Hoang
9894941294
properties is on 7th column, not 6th
2013-09-03 15:02:53 +02:00
Hieu Hoang
fe36cbf737
move LexicalReordering to FF directory
2013-08-30 16:28:28 +01:00
Hieu Hoang
04783309ba
move DecodeFeature to FF directory
2013-08-30 16:03:06 +01:00
Hieu Hoang
f5fc57008f
save properties in target phrase object
2013-08-29 13:36:01 +01:00
Kenneth Heafield
1a9a964b68
presize vector
2013-08-26 23:37:37 +01:00
Hieu Hoang
f544d3aced
mark with LEGACY
2013-08-23 21:34:10 +01:00
Hieu Hoang
83df3629a9
mark GetTargetPhraseCollectionNonCache with LEGACY
2013-08-23 21:08:53 +01:00
Hieu Hoang
de9decc30d
mark GetTargetPhraseCollection with LEGACY
2013-08-23 21:02:03 +01:00
Hieu Hoang
4dfb625536
beautify
2013-08-23 13:53:30 +01:00
Hieu Hoang
fcf426a098
patch segfault for target phrase caching. Only occurs when multithreading.
2013-08-21 15:58:17 +01:00
Hieu Hoang
9e60195995
patch segfault for target phrase caching. Only occurs when multithreading.
2013-08-21 10:15:29 +01:00
Hieu Hoang
74aea53fd5
caching error for compact pt
2013-08-20 16:06:48 +01:00
Hieu Hoang
ae54494417
caching for Marcin's phrase table
2013-08-16 15:33:58 +01:00
Hieu Hoang
41d9386dcc
add method to reduce cache size
2013-08-16 15:05:36 +01:00
Hieu Hoang
3bfb0d7a5d
caching target phrase for OnDisk pt
2013-08-16 13:47:39 +01:00
Hieu Hoang
077142a2a1
caching target phrase for OnDisk pt
2013-08-16 13:26:21 +01:00
Hieu Hoang
31360e70ef
caching target phrase for OnDisk pt
2013-08-16 12:34:31 +01:00
Hieu Hoang
9f92642e59
beautify
2013-08-15 21:14:04 +01:00
Hieu Hoang
49e36cebc2
minor renaming
2013-08-15 20:57:04 +01:00
Hieu Hoang
aa8b8cdc07
move caching code to PhraseDictionary. Available to all phrase tables
2013-08-15 20:50:22 +01:00
Hieu Hoang
841ce108a5
add phrase table caching
2013-08-15 20:20:44 +01:00
Hieu Hoang
88f888f534
const TargetPhrase in TargetPhraseCollection
2013-08-08 14:38:41 +01:00
Hieu Hoang
441acf15e6
beautify
2013-08-07 14:18:12 +01:00
Hieu Hoang
5eef91c0ea
get ready to delete source phrase from TargetPhrase class
2013-08-07 14:10:42 +01:00
Hieu Hoang
71073868a8
PhraseDictionaryTreeAdaptor::GetTargetPhraseCollectionLegacy return tpColl and vector of source phrases
2013-08-07 12:55:10 +01:00
Hieu Hoang
89f39bf89d
mark a function as legacy
2013-08-07 11:48:18 +01:00
Hieu Hoang
a1f5167f85
get ready to delete source phrase from TargetPhrase class
2013-08-07 11:37:40 +01:00
Hieu Hoang
afcf65098f
parsing doesn't depend on input sentence anymore
2013-08-02 18:09:47 +01:00
Hieu Hoang
0596c3e9e4
Add NonTerminalSet variable to InputPath
2013-08-02 15:54:49 +01:00
Hieu Hoang
bb1f49e10c
Merge /home/hieu/workspace/github/mosesdecoder into hieu_opt_input
2013-07-31 14:29:18 +01:00
Rico Sennrich
b32366ab8c
fix future and total cost in multimodel(counts). (was broken since merge of branch weight-new in May)
2013-07-31 14:18:18 +02:00
Hieu Hoang
ba187294d5
begin cleanup of SCFG parsing. Get rid of Sentence variable in ChartRuleLookupManager, replace with ChartParser variable
2013-07-31 12:25:34 +01:00
Hieu Hoang
77872f7521
beautify
2013-07-30 15:04:37 +01:00
Rico Sennrich
7b6239b663
multimodelcounts: use Word objects instead of strings in map (avoid costly conversion and string comparison)
2013-07-30 15:03:25 +02:00
Rico Sennrich
ccdcecc86f
multimodel and mosesserver: instead of optimizing first model, select model by name.
2013-07-30 13:54:50 +02:00
Hieu Hoang
c449610aaf
Merge /Users/hieuhoang/unison/workspace/github/mosesdecoder into hieu_opt_input
2013-07-28 22:52:21 +01:00
Ulrich Germann
cb1c06d502
Merge branch 'master' of github.com:moses-smt/mosesdecoder
...
Conflicts:
moses/Jamfile
2013-07-28 16:51:13 +01:00
Ulrich Germann
b3ed0d56d7
Fixed missing #include.
2013-07-28 16:38:33 +01:00
Ulrich Germann
a47b6cfafa
Added call to tp->Evaluate(src) before adding a phrase table entry to the TargetPhraseCollection during lookup.
2013-07-28 16:37:20 +01:00
Ulrich Germann
a0c13837e0
Fixed computation of lexical scores.
2013-07-28 16:28:41 +01:00
Hieu Hoang
2aef439d8a
Merge /home/hieu/workspace/github/mosesdecoder into hieu_opt_input
2013-07-25 15:26:38 +01:00
Barry Haddow
7081f06413
Fixes to the shared build
2013-07-25 15:24:34 +01:00
Hieu Hoang
0b5776faf7
starting placeholder
2013-07-18 20:23:44 +01:00
Hieu Hoang
87c346654e
merge
2013-07-16 17:11:12 +01:00
Hieu Hoang
5cbfcacccc
Merge github.com:moses-smt/mosesdecoder into hieu_opt_input
2013-07-16 16:56:22 +01:00
Hieu Hoang
f3e0fd2dd4
finished converting TargetPhraseCollection* to TargetPhraseCollection
2013-07-16 16:55:56 +01:00
Hieu Hoang
e1a86bd9c9
sometimes target phrase collection can have 0 phrases
2013-07-16 16:30:54 +01:00
Hieu Hoang
56f4344ff2
merge
2013-07-13 23:26:21 +01:00
Kenneth Heafield
789039fa2e
In-line PhraseDictionaryNodeMemory with the hash table data structure
...
Before:
Name:moses_chart VmPeak:11988700 kB VmRSS:10112684 kB
real 2m58.393s
user 2m39.673s
sys 0m12.171s
After:
Name:moses_chart VmPeak:11952688 kB VmRSS:10077304 kB
real 2m42.329s
user 2m31.219s
sys 0m10.261s
2013-07-12 07:13:19 -07:00
Kenneth Heafield
1b3f769c5c
Always have a TargetPhraseCollection.
...
Before:
Name:moses_chart VmPeak:12027904 kB VmRSS:10151884 kB real:173.000
real 2m53.608s
user 2m44.003s
sys 0m8.401s
After:
Name:moses_chart VmPeak:11988700 kB VmRSS:10112684 kB real:177.500
real 2m58.393s
user 2m39.673s
sys 0m12.171s
2013-07-12 07:01:33 -07:00
Hieu Hoang
43507b61e3
Merge github.com:moses-smt/mosesdecoder into hieu_opt_input
2013-07-12 14:44:26 +01:00
Kenneth Heafield
23c2530617
PhraseDictionaryNodeMemory doesn't need to be virtual. Slight reduction in CPU/RAM.
2013-07-12 06:32:33 -07:00
Hieu Hoang
66e7720b91
rename SetTargetPhraseFromPtMatrix() to GetTargetPhraseCollectionBatch()
2013-07-11 20:18:06 +01:00
Hieu Hoang
c6d8259f68
delete as many override of GetTargetPhraseCollection() as possible
2013-07-11 20:05:08 +01:00
Hieu Hoang
5be6d8d755
call legacy code for confusion network input with binary pt
2013-07-11 17:24:19 +01:00
Hieu Hoang
e7f6c6906c
Merge github.com:moses-smt/mosesdecoder into hieu_opt_input
2013-07-11 15:42:13 +01:00
Hieu Hoang
958d7ca9b8
prefix subphrase optimization for confusion networks
2013-07-09 16:56:49 +01:00
Hieu Hoang
5f9d0a85f5
rename vector<InputPath> to InputPathList. Pass regression tests
2013-07-09 14:19:35 +01:00
Hieu Hoang
49ede97304
merge
2013-07-09 12:41:08 +01:00
Hieu Hoang
7eb5e41ea1
Merge pull request #41 from neubig/check-processphrasetable-width
...
Prevented segfault on print non-existant alignment string
2013-07-09 04:28:57 -07:00
Hieu Hoang
e07304bdd1
beautify
2013-07-08 20:56:51 +01:00
Hieu Hoang
310b26f989
beautify
2013-07-08 20:52:14 +01:00
Hieu Hoang
3eba5782c2
beautify
2013-07-08 20:25:47 +01:00
Hieu Hoang
e2dd5b2efa
beautify
2013-07-08 19:12:11 +01:00
Hieu Hoang
852242b804
beautify
2013-07-08 19:02:18 +01:00
Hieu Hoang
8d857fa26e
OnDisk pt passes regression
2013-07-08 19:01:28 +01:00
Hieu Hoang
b03ac10a2d
error processing OOV when using OnDisk pt
2013-07-08 17:58:22 +01:00
Marcin Junczys-Dowmunt
d3b4c11be2
Fixed queryPhraseTableMin, added warnings for compacting phrase tables qithout alignment
2013-07-08 09:58:02 +02:00
Hieu Hoang
29b895a97a
InputLatticeNode to InputPath
2013-07-07 02:14:51 +01:00
Hieu Hoang
ecef376aed
rename InputLatticeNode.h to InputPath.h
2013-07-06 22:42:52 +01:00
Hieu Hoang
6a060abe74
a little bit more towards using prefix subphrase to optimize translation rule lookup
2013-07-05 11:24:27 +01:00
Hieu Hoang
7114b164c7
cleanup of OnDiskPt methods
2013-07-05 11:10:10 +01:00
Hieu Hoang
ee0d29f56b
prefix subphrase optimization
2013-07-05 10:57:45 +01:00
Hieu Hoang
e073d22301
prefix subphrase optimization
2013-07-05 10:52:12 +01:00
Hieu Hoang
a60da7d4b7
prefix subphrase optimization
2013-07-05 09:59:50 +01:00
Graham Neubig
0cde047e6e
Merge branch 'master' of github.com:neubig/mosesdecoder into check-processphrasetable-width
2013-07-05 12:38:31 +09:00
Graham Neubig
6c25048d20
Prevented segfault on print non-existant alignment
...
In processPhraseTable, there is an option to print alignments.
When this is selected, processPhraseTable will print the 4th
column in the phrase table, but the check for the phrase table
width only currently goes to the 3rd column. This patch makes
sure that the phrase table must have 4 columns when alignments
are being printed, and 3 otherwise.
2013-07-05 12:21:01 +09:00
Hieu Hoang
574d186708
beautify
2013-07-04 23:38:18 +01:00
Hieu Hoang
0efcf64c28
Merge github.com:moses-smt/mosesdecoder into hieu_opt_input2
2013-07-04 23:37:21 +01:00
Hieu Hoang
f4d77aae38
start prefix subphrase optimization with OnDisk pt
2013-07-04 23:36:17 +01:00
Marcin Junczys-Dowmunt
bc904ff61f
Deleted stray "cerr << .."
2013-07-05 00:15:27 +02:00
Hieu Hoang
f0dc30f25a
prefix subphrase optimization done for in-memory pt. Need to delete objects also
2013-07-04 15:13:29 +01:00
Hieu Hoang
934e24718e
a little bit more towards using prefix subphrase to optimize translation rule lookup
2013-07-04 09:24:13 +01:00
Hieu Hoang
5e355c1595
move lookup of all subphrases into PhraseDictionary class
2013-07-03 19:07:36 +01:00
Hieu Hoang
ac8d10af38
move lookup of all subphrases into PhraseDictionary class
2013-07-03 16:57:23 +01:00
Hieu Hoang
d203f2bb6e
single threaded build compiles & passes regression
2013-07-01 17:37:24 +01:00
Ulrich Germann
c963338476
Feature values are now returned as log probabilities.
2013-06-27 17:55:16 +01:00
Hieu Hoang
efc2c6145e
beautify
2013-06-26 17:19:09 +01:00
Hieu Hoang
771e792bb4
Merge branch 'master' into dynamic-phrase-tables
2013-06-26 17:13:36 +01:00
Hieu Hoang
3833d67ec0
merge with master
2013-06-26 17:12:22 +01:00
Hieu Hoang
352e36334a
Merge branch 'master' of github.com:moses-smt/mosesdecoder
2013-06-26 11:54:12 +01:00
Ulrich Germann
2f6ca0c0b8
Merge branch 'master' into dynamic-phrase-tables
...
Conflicts:
moses/Hypothesis.cpp
moses/StaticData.cpp
moses/TargetPhrase.cpp
moses/TranslationModel/BilingualDynSuffixArray.cpp
moses/TranslationModel/BilingualDynSuffixArray.h
moses/TranslationModel/PhraseDictionary.h
moses/TranslationModel/PhraseDictionaryDynSuffixArray.cpp
moses/TranslationModel/PhraseDictionaryDynSuffixArray.h
2013-06-26 03:00:27 +01:00
Hieu Hoang
ea0c7b63e7
fix argument parsing in PhraseDictionaryALSuffixArray
2013-06-24 16:10:22 +01:00
Kenneth Heafield
718e90d006
Missing header
2013-06-21 09:38:45 -04:00
Hieu Hoang
a69ad79e9c
Merge branch 'master' of github.com:moses-smt/mosesdecoder
2013-06-21 14:38:14 +01:00
Kenneth Heafield
217c8ea38f
Missing header / Mehndi Bhargava
2013-06-21 09:37:05 -04:00
Hieu Hoang
3d790b7226
minor cleanup
2013-06-20 17:15:54 +01:00
Hieu Hoang
d68277d369
redo parsing of feature function parameters
2013-06-20 13:25:02 +01:00
Hieu Hoang
24d2edd790
redo parsing of feature function parameters
2013-06-20 13:06:03 +01:00
Hieu Hoang
dc33fa3d3d
redo parsing of feature function parameters
2013-06-20 12:50:41 +01:00
Hieu Hoang
c2f4c48758
clean up SetParameter()
2013-06-19 00:24:21 +01:00
Hieu Hoang
acb4baacaf
delete 2 unused legacy functions
2013-06-17 18:46:40 +01:00
Hieu Hoang
e51c4feb6b
push calling of OnlyTheseFactors() to individual PT implementations, as needed
2013-06-17 18:31:06 +01:00
Hieu Hoang
f7371cf53d
calculate m_featuresToApply in Load() for PhraseDictionary. Since every phrase dictionary now has to implement it, make Load() for PhraseDictionary abstract
2013-06-14 18:34:47 +01:00
Rico Sennrich
b1b70e802d
use read-write lock in multimodel
2013-06-12 15:25:53 +02:00
Rico Sennrich
9e9cbbc13b
refactoring multimodel code out of StaticData; locking.
2013-06-12 14:47:40 +02:00
Hieu Hoang
5becd868a9
delete misc unused variables from PhraseDictionary
2013-06-11 16:31:43 +01:00
Hieu Hoang
61e2b7a24f
refactor parsing of feature functiona args
2013-06-11 01:46:04 +01:00
Hieu Hoang
b4ad093334
refactor parsing of feature functiona args
2013-06-11 00:05:12 +01:00
Hieu Hoang
efa42b451c
refactor parsing of feature functiona args
2013-06-10 21:24:31 +01:00
Hieu Hoang
abe6bb7c22
refactor parsing of feature functiona args
2013-06-10 18:11:55 +01:00
Hieu Hoang
96d116dba0
refactor parsing of feature functiona args
2013-06-10 16:29:07 +01:00
Hieu Hoang
e291c5f4a4
implement feature override as a run-time override of specific argument of a feature function. Only implemented table-limit for far
2013-06-07 17:32:01 +01:00
Hieu Hoang
23fba08ded
minor
2013-06-06 21:49:38 +01:00
Hieu Hoang
df4b8e5828
m_numInputScores deleted from PhraseDictionary.
2013-06-06 18:54:44 +01:00
Ulrich Germann
7ecfb88a29
Alpha version of phrase tables based on dynamic suffix arrays.
2013-06-05 10:46:42 +01:00
Hieu Hoang
21ff6d4831
beautify
2013-06-03 12:33:18 +01:00
Ulrich Germann
570b7c6aa5
Fixed bug in ComparePosition::operator()(...).
2013-06-03 12:22:05 +01:00
Hieu Hoang
3b76143072
refactor loading in class PhraseDictionaryFuzzyMatch
2013-05-31 23:39:19 +01:00
Hieu Hoang
eaf53769ad
consistent Load() for all feature functions. Can be used not to load if doing --show-weights
2013-05-31 20:21:02 +01:00
Hieu Hoang
173cfffaac
Reapply Abby Levenberg's log change @4b4aba3
2013-05-31 15:06:36 +01:00
Hieu Hoang
0db5504629
port PhraseDictionaryDynSuffixArray to new ini format. Scores aren't the same. Probably something to do with Abby Levenberg's log change
2013-05-31 15:02:34 +01:00
Hieu Hoang
65d2d68bc5
beautify
2013-05-31 00:00:21 +01:00
Hieu Hoang
117eb76b0a
figure out which feature function to apply at which decode step. Book-keeping
2013-05-30 18:34:10 +01:00
Hieu Hoang
6249432407
beautify
2013-05-29 18:16:15 +01:00
Hieu Hoang
66afd6611b
parse scores correctly. Assume dense features, always in the same order
2013-05-28 15:54:11 +01:00
Hieu Hoang
ed220e91a9
debug PhraseDictionaryALSuffixArray for Wilker. Sparse feature score to do
2013-05-28 15:38:36 +01:00
Hieu Hoang
0580e2bd11
delete create-ini
2013-05-28 13:11:37 +01:00
Hieu Hoang
036ea4ee29
delete sourcePhrase variable in TargetPhrase class
2013-05-28 11:38:18 +01:00
Hieu Hoang
ae82d02a05
delete sourcePhrase variable in TargetPhrase class
2013-05-28 00:41:25 +01:00
Hieu Hoang
e8dadb58ce
split classes in DummyScoreProducers into separate files
2013-05-25 00:57:37 +01:00
Hieu Hoang
a80d838b0f
move feature functions into moses/FF
2013-05-24 18:02:49 +01:00
Hieu Hoang
6c322ba05e
move and rename PhraseDictionarySCFG -> PhraseDictionaryMemory
2013-05-24 16:33:30 +01:00