Commit Graph

5240 Commits

Author SHA1 Message Date
michaelhutt
cf5d093c4f fixes parameter mismatch in LM::Load 2015-12-23 13:31:49 -05:00
Hieu Hoang
f3cdad40da correct phrase-table column description and number 2015-12-22 10:55:02 +00:00
Michael Denkowski
5de46d6ae9 Utility to look up phrase table entries for a corpus
(specifically for dynamic phrase tables like Mmsapt and PhraseDictionaryGroup)
2015-12-18 15:08:40 -05:00
Matthias Huck
0a39efb6c8 Hiero phrase orientation: modify some parameters 2015-12-18 17:24:42 +00:00
Hieu Hoang
b27310d367 always compile with probing pt 2015-12-18 00:26:25 +00:00
Ulrich Germann
e84afbfc1c Merge branch 'master' of https://github.com/moses-smt/mosesdecoder 2015-12-17 00:22:19 +00:00
Ulrich Germann
1cd6478415 Updated minor Mmsapt-related utilities to catch up with refactoring of Moses. 2015-12-17 00:21:25 +00:00
Hieu Hoang
8b00dbec2e scoring now done in the state class 2015-12-15 13:12:24 -05:00
MosesAdmin
dfcdb43c28 daily automatic beautifier 2015-12-13 23:07:15 +00:00
Ulrich Germann
8b2f1ba529 Merge branch 'master' of https://github.com/moses-smt/mosesdecoder 2015-12-13 22:31:58 +00:00
Ulrich Germann
bb6e0157aa Code cleanup and refactoring. 2015-12-13 22:31:43 +00:00
Hieu Hoang
18337d2a22 Merge branch 'master' of github.com:moses-smt/mosesdecoder 2015-12-13 21:36:29 +00:00
Hieu Hoang
4858875289 compile error with compact pt reported by Shaimaa Marzouk 2015-12-13 21:36:18 +00:00
MosesAdmin
b0d8c397bb daily automatic beautifier 2015-12-12 18:04:13 +00:00
Hieu Hoang
d21f62b8a8 SRI minor compile error 2015-12-12 18:02:52 +00:00
Ulrich Germann
b899ab8175 Merge branch 'master' of https://github.com/moses-smt/mosesdecoder 2015-12-12 15:31:42 +00:00
Ulrich Germann
9196cd1461 Changes to PhraseDictionaryCompact and LexicalReorderingtableCompact:
- minphr-memory and minlexr-memory are now static members of the respective classes,
  not global variables; they are interpreted by class-specific option interpretation
  functions that are called from StaticData.cpp.
- m_weight has been removed from PhraseDictionaryCompact and PhraseDecoder,
  as it was never used.
2015-12-12 15:28:22 +00:00
MosesAdmin
10531d5f02 daily automatic beautifier 2015-12-12 00:00:41 +00:00
Hieu Hoang
4604cc96ba eclipse 2015-12-11 22:29:24 +00:00
Hieu Hoang
d17fa2ea80 change DALM::Load() - minor compile error. Update eclipse project 2015-12-11 20:39:03 +00:00
Ulrich Germann
65f4f1f92a Code cleanup and refactoring. 2015-12-11 13:52:48 +00:00
Ulrich Germann
40ed3df9cb Merge branch 'master' of https://github.com/moses-smt/mosesdecoder
Conflicts:
	moses/ChartParser.cpp
	moses/ChartParser.h
	moses/ConfusionNet.h
	moses/FF/CountNonTerms.cpp
	moses/FF/CountNonTerms.h
	moses/FF/SoftSourceSyntacticConstraintsFeature.cpp
	moses/FF/SoftSourceSyntacticConstraintsFeature.h
	moses/FF/SourceGHKMTreeInputMatchFeature.cpp
	moses/FF/SourceGHKMTreeInputMatchFeature.h
	moses/ForestInput.cpp
	moses/InputType.h
	moses/MockHypothesis.cpp
	moses/Sentence.cpp
	moses/Sentence.h
	moses/StaticData.cpp
	moses/StaticData.h
	moses/Syntax/F2S/GlueRuleSynthesizer.h
	moses/Syntax/T2S/GlueRuleSynthesizer.cpp
	moses/Syntax/T2S/GlueRuleSynthesizer.h
	moses/TreeInput.cpp
	moses/XmlOption.cpp
	moses/XmlOption.h
2015-12-11 01:59:26 +00:00
Ulrich Germann
29694af6e4 Code cleanup and refactoring. 2015-12-11 01:09:22 +00:00
MosesAdmin
739165c2b0 daily automatic beautifier 2015-12-11 00:00:33 +00:00
Matthias Huck
bd3f573452 Hiero phrase orientation 2015-12-10 12:56:37 +00:00
Ulrich Germann
831dc83778 Code cleanup and refactoring. 2015-12-10 03:17:36 +00:00
Ulrich Germann
240b88c683 Passing around AllOptions or references thereto everywhere,
strong them locally where appropriate, so that compontents can
become independent of StaticData once instantiated.
2015-12-09 23:05:00 +00:00
Ulrich Germann
ad5e27ae56 Implemented more options in AllOptions and option groups therein. 2015-12-09 17:59:14 +00:00
Ales Tamchyna
c71aca8311 reflect recent changes in VW code 2015-12-09 17:34:08 +01:00
MosesAdmin
59365f2bd3 daily automatic beautifier 2015-12-09 00:00:35 +00:00
Ulrich Germann
fdb5d9b282 Code refactoring: All FF now get access to AllOptions at load time, so they don't have to rely on StaticData. 2015-12-08 12:56:55 +00:00
Ulrich Germann
9528b56242 Set defaults in option group constructors. 2015-12-08 12:43:20 +00:00
Ulrich Germann
c1a008bf6d Reduce dependence on StaticData. 2015-12-07 23:50:56 +00:00
Ulrich Germann
c4e45fb128 Code cleanup. 2015-12-07 16:07:11 +00:00
Ulrich Germann
2be2481feb Added switch --daemon: fork and run moses server in background. The parent won't exit until the child is ready to serve. 2015-12-07 16:01:12 +00:00
Ulrich Germann
d56d900d6a Code cleanup. 2015-12-06 01:43:17 +00:00
Ulrich Germann
69e5a1cc15 Code cleanup. 2015-12-06 00:12:01 +00:00
Ulrich Germann
889a33dcd6 XmlOptions are now const within Sentence. 2015-12-04 19:43:37 +00:00
Ulrich Germann
4983aa0980 Cleanup. 2015-12-04 19:32:37 +00:00
Ulrich Germann
9e1503bf63 Added variant lrfunc (in addition to lr-func) as a Mmsapt parameter to accommodate a typo in my 2015 PBML paper. 2015-12-03 16:21:11 +00:00
MosesAdmin
157be7cc51 daily automatic beautifier 2015-12-03 00:01:07 +00:00
Ulrich Germann
97d6ccec98 Merge branch 'master' of https://github.com/modernmt/mosesdecoder 2015-12-02 20:51:45 +00:00
Ulrich Germann
5a63286447 Code cleanup and bug fix in (Base)Manager::OutputSurface:
Mark-up of unkown words in output.
2015-12-02 20:43:56 +00:00
Ulrich Germann
0f9cca4ae4 Merge branch 'master' of https://github.com/moses-smt/mosesdecoder 2015-11-30 01:29:28 +00:00
Ulrich Germann
11262b0a62 Added switch --version to have Moses print out the code versions it was compiled with. 2015-11-30 01:29:13 +00:00
Ulrich Germann
9a321a0ce4 Bug fix: typo prevented compilation. 2015-11-30 01:12:04 +00:00
Ulrich Germann
c165e80e48 Changes to Mmsapt.
- added phrase table features: pfwd / pbwd weighted by each sample's
  weight (when used with biased sampling)
- a few minor internal changes ({p|j}stats.add(...) reports back
  current joint count (intended for early stopping of sampling when
  evidence is sufficient; yet to be explored experimentally).
2015-11-29 18:39:38 +00:00
Ulrich Germann
93df2b2f19 Initialization order of members. 2015-11-29 17:57:04 +00:00
Ulrich Germann
48999749ec Unused variable. 2015-11-29 17:56:27 +00:00
Ulrich Germann
37ea003f02 Avoid compiler warning. 2015-11-28 14:54:48 +00:00
Phil Williams
7375d81e16 Fix a few compiler warnings (clang) 2015-11-27 12:20:38 +00:00
Ulrich Germann
c11c4cbeed Bug fix related to commit 220d82041a,
which replaced boost::intrusive_ptr<bitext>  with shared_ptr<bitext>.
2015-11-25 19:51:54 +00:00
Ulrich Germann
ee5edc421c Merge branch 'master' of https://github.com/moses-smt/mosesdecoder 2015-11-25 02:18:00 +00:00
MosesAdmin
57a291421a daily automatic beautifier 2015-11-25 00:00:39 +00:00
Ulrich Germann
bb135f6a64 Cosmetic fix for having the server reporting word alignments left-to-right. 2015-11-24 20:42:53 +00:00
Ulrich Germann
ca038c5e4c Fix suggested by Martin Baumgärtner to keep server from crashing when packing word alignments. 2015-11-24 19:24:09 +00:00
Ulrich Germann
c8b859de67 Merge remote-tracking branch 'legacy/master'
Conflicts:
	moses/server/TranslationRequest.cpp
2015-11-24 19:22:37 +00:00
Ulrich Germann
bcb0212b5b FF registration is now in FeatureFactory::DefaultSetup, ...
... not in the FF constructor any more.

This is related to a bug fix in Base.cpp, related to moving the
LM OOV feature specification from the global space into the setup
of individual LMs (to eliminate the dependence on StaticData in the
LM constructors).
2015-11-24 18:28:38 +00:00
Ulrich Germann
a074efc7cc Change parameters only when specified during parameter updates in server mode. 2015-11-23 16:59:39 +00:00
Ulrich Germann
6f1e39d64e Adaptation to renamed functions in Bitext class. 2015-11-23 16:57:44 +00:00
Ulrich Germann
9a7356bbed Adaptation to renamed functions in Bitext class. 2015-11-23 16:57:35 +00:00
Barry Haddow
87ec9f56c7 bugfix: options refactor broke (l)mbr 2015-11-23 12:37:11 +00:00
Barry Haddow
10df006eed Merge branch 'master' of github.com:moses-smt/mosesdecoder 2015-11-23 12:16:46 +00:00
Ulrich Germann
894644d615 Merge ../master into sync-with-mmt 2015-11-20 17:43:05 +00:00
Ulrich Germann
3f09aa40aa Additional functions for determining doc ids and document names from mapped bitexts. 2015-11-20 17:10:47 +00:00
Ulrich Germann
a767608804 Bug fix in keeping track of doc ids with uniform random sampling. 2015-11-20 17:09:18 +00:00
Ulrich Germann
1fa81806c1 Work in progress. 2015-11-20 17:07:17 +00:00
Ulrich Germann
752ac68d08 Merge branch 'moses-server-placeholder-patch' of https://github.com/ebay-hlt/mosesdecoder into ebay-hlt-moses-server-placeholder-patch
Conflicts:
	regression-testing/Jamfile
	run-regtests.sh
2015-11-20 14:47:59 +00:00
MosesAdmin
bf209a35a3 daily automatic beautifier 2015-11-20 00:00:42 +00:00
Evgeny Matusov
42c57d077b Merge branch 'master' of https://github.com/moses-smt/mosesdecoder into moses-server-placeholder-patch
Conflict in TranslationRequest solved.

Conflicts:
	moses/server/TranslationRequest.cpp
	moses/server/TranslationRequest.h
2015-11-19 09:59:15 -07:00
Ulrich Germann
c610d0a6e7 Code decluttering.
The class StatefuleFeatureFunction now provides an empty dummy implementation
of various (virtual) Evaluate... functions. The corresponding empty
implementations on derived classes have been removed.
2015-11-19 13:54:24 +00:00
Evgeny Matusov
f346dcd37f another fix to debug output for moses server 2015-11-19 12:42:07 +01:00
Evgeny Matusov
aa7ef1738b another update in Debug output for Moses server 2015-11-19 12:20:48 +01:00
Evgeny Matusov
d3fb16d39f changed debug output for moses server 2015-11-19 12:03:19 +01:00
Ulrich Germann
edacfbb9fd Bug fix in server: Moses server now handles the placeholder mechanism for translations provided with the input. 2015-11-18 17:09:52 +00:00
Evgeny Matusov
4e8396744c added first version of regression testing for moses server 2015-11-18 16:21:50 +01:00
Ulrich Germann
220d82041a gcc-4.4.7 was struggling with boost::intrusive_ptr. Switched to shared_ptr. 2015-11-18 10:35:17 +00:00
Barry Haddow
21d8111287 Merge branch 'master' of github.com:moses-smt/mosesdecoder 2015-11-18 09:50:29 +00:00
David Madl
060a5f1b47 forward declare SHyperedge in StatefulFeatureFunction, StatelessFeatureFunction 2015-11-17 16:17:09 +00:00
David Madl
8729a2d47d Measure TimeOtherScore in Search instead of in Hypothesis 2015-11-17 16:15:13 +00:00
David Madl
5fea16a9a6 move options out of Hypothesis 2015-11-17 16:15:13 +00:00
David Madl
73ab44c126 Hypothesis: get rid of calls into Manager from constructor 2015-11-17 16:15:13 +00:00
David Madl
b1ea3d624b Dump two ugly, old overrides of Hypothesis::EvaluateWhenApplied()
A Brief History of Time:

65ddbf3 7/2/12 Wilson, "Implement batched LM requests."
776da79 8/6/15 Hoang, "delete old unused code"
2015-11-17 16:15:13 +00:00
David Madl
e5a8438149 document @param lhs in Phrase::CreateFromString() 2015-11-17 16:15:13 +00:00
David Madl
e36fb96557 LanguageModel, KenLM: avoid StaticData usage
* drop global lmodel-oov-feature option, and add it to LM FF config line instead
	use oov-feature=1 (bool) option instead
* drop LanguageModel::GetWeight()
* KenLM: use m_verbosity of FF instead of IFVERBOSE macro which uses StaticData

* train-model.perl: move language model OOV feature onto LM feature spec line
2015-11-17 16:15:13 +00:00
David Madl
3b63930943 move global Timer to Timer.h
Move ResetUserTime(), PrintUserTime(), GetUserTime() to Timer.h

Do not reset timer in StaticData.
2015-11-17 16:15:13 +00:00
David Madl
0dd6c31f63 FeatureFunction: enable construction without registering 2015-11-17 16:15:13 +00:00
David Madl
3288eb5f50 remove IOWrapper.cpp unused includes such as Incremental.h (and others) 2015-11-17 16:15:13 +00:00
Evgeny Matusov
5e1340cf63 fixed moses server placehoders ; correctly implemented the boolean parameter check function for mosesserver request parameters 2015-11-17 15:16:39 +01:00
Evgeny Matusov
66928f682f second commit of moses server placeholder fix 2015-11-17 15:06:48 +01:00
Evgeny Matusov
7c088c9a95 first commit of placeholder changes to moses server 2015-11-17 14:19:36 +01:00
MosesAdmin
fef50536d6 daily automatic beautifier 2015-11-17 00:00:49 +00:00
Phil Williams
d317fdc373 Store SHyperedge feature scores as deltas instead of totals
This mirrors the change made for the chart decoder in commit 465b4756...
2015-11-16 19:23:27 +00:00
Michael Denkowski
07001f7645 Model support bitmap features in PhraseDictionaryGroup 2015-11-16 11:23:18 -05:00
Michael Denkowski
9df2336d45 Per-model phrase and word counts in PhraseDictionaryGroup 2015-11-13 17:22:27 -05:00
Michael Denkowski
e3cca68ed7 mmsapt-lr-func option for PhraseDictionaryGroup
Support also filling in gaps via averaging for LR functions of member
Mmsapt models
2015-11-13 13:56:26 -05:00
Michael Denkowski
49f4eeca47 default-average-others option for PhraseDictionaryGroup
Average scores of other models to fill in gaps for unseen phrases
2015-11-12 16:33:52 -05:00
Ulrich Germann
7b8a875efb Merge branch 'master' of http://github.com/moses-smt/mosesdecoder 2015-11-12 14:02:16 +00:00
MosesAdmin
dad1bd6127 daily automatic beautifier 2015-11-12 00:00:40 +00:00
Ulrich Germann
b01eb7cbd0 Bug fix: m_reportAllFactors was never initialized or set.
Removed altogether, now using m_options.output.ReportAllFactors.
2015-11-11 19:56:43 +00:00