Commit Graph

212 Commits

Author SHA1 Message Date
phikoehn
b5d08745a5 extensions to modified moore-lewis filtering, bug fixes 2012-11-24 20:13:14 +00:00
phikoehn
ea610a0558 added modified-moore-lewis from Barry Haddow into EMS 2012-11-24 12:43:13 +00:00
phikoehn
d4cebb008a added ems support for sigtest-filter 2012-11-23 17:35:13 +00:00
phikoehn
c2a96fcc33 adjust to irstlm changes 2012-11-20 17:19:17 +00:00
phikoehn
5cd614ecd8 adjust to irstlm changes 2012-11-20 17:18:57 +00:00
Barry Haddow
a90e1861c0 Alignments on by default for phrase-based 2012-11-15 12:35:43 +00:00
Barry Haddow
5e3726eb90 Remove -use-alignment-info 2012-11-15 09:42:58 +00:00
Barry Haddow
095b307cfc Make sure alignment info is not on for hiero 2012-11-08 18:16:53 +00:00
Barry Haddow
12786dd58f Alignments on by default.
Use TRAINING:include-word-alignment-in-rules = no
to turn them off.
2012-11-08 17:52:10 +00:00
Barry Haddow
01c4de24b7 don't delete moses ini specified in config 2012-11-06 10:59:15 +00:00
Barry Haddow
f9d0721145 correct format for word trans features 2012-10-19 09:07:18 +01:00
phikoehn
0dda804c46 sparse feature fixes 2012-10-18 03:09:49 +01:00
phikoehn
7d66a4f8d5 superminortiny fix 2012-10-18 02:52:30 +01:00
phikoehn
98dafc0301 Merge branch 'master' of git://github.com/moses-smt/mosesdecoder 2012-10-18 02:20:45 +01:00
phikoehn
f19d53dac9 minor fixes 2012-10-18 02:20:38 +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
Lane Schwartz
c541c77b2f Merge branch 'master' of www:/repos/git/Decoders/mosesdecoder 2012-10-11 10:15:00 -04:00
Lane Schwartz
11679849db In verbose mode, experiment.perl should print the full qsub command
prior to actually running it.
2012-10-10 13:25:58 -04:00
Lane Schwartz
0904531749 Make experiment.perl use qsub-settings from GENERAL section
if no qsub-settings are defined for the specific section being run.
2012-10-10 13:25:09 -04:00
Barry Haddow
848aafb644 Merge remote branch 'github/master' into miramerge
Conflicts:
	moses/src/AlignmentInfo.cpp
	moses/src/AlignmentInfo.h
	moses/src/ChartHypothesis.cpp
	moses/src/ChartTrellisNode.cpp
	moses/src/LM/Implementation.cpp
	moses/src/LM/Ken.cpp
	moses/src/TargetPhrase.cpp
	moses/src/TargetPhrase.h
2012-10-08 17:54:59 +01:00
Phil Williams
289a9ea54f experiment.meta: update pcfg-extract and pcfg-score
EMS now looks for binaries in $moses-bin-dir instead of their old
location in $moses-script-dir.
2012-10-03 19:57:51 +01:00
Eva Hasler
e7e4dbd405 merge remaining changes to mira, word pair features, phrase pair features 2012-10-03 18:53:55 +01:00
Lane Schwartz
82ab7c1507 Force ems to pass -S /bin/bash to qsub.
For reasons that defy comprehension, when qsub runs scripts,
it blatantly ignores the shebang line that specifies a shell to use.

Instead, SGE has its own config variable that defines
what shell to use when running scripts via qsub.

The -S /bin/bash option to qsub forces SGE
to launch your script using bash.

The scripts created by experiment.perl
all assume they will be run with bash,
so it is incumbent upon experiment.perl
to ensure that SGE uses bash to run them.
2012-10-02 09:24:20 -04:00
Eva Hasler
ebbf0d028c changes to mira, adding jackknife to experiment.perl 2012-10-01 20:36:52 +01:00
phikoehn
8bb49c9053 chart decoder search graph viz and other fixes to web interface of ems 2012-09-26 22:57:15 +01:00
Barry Haddow
0a950ee9f4 Merge remote branch 'github/master' into miramerge
Compiles, but not tested. Had to disable relent filter. Strangely, it seems to contain the
whole of moses-cmd.

Conflicts:
	Jamroot
	OnDiskPt/TargetPhrase.cpp
	moses-cmd/src/Main.cpp
	moses/src/AlignmentInfo.cpp
	moses/src/AlignmentInfo.h
	moses/src/ChartTranslationOptionCollection.cpp
	moses/src/ChartTranslationOptionCollection.h
	moses/src/GenerationDictionary.cpp
	moses/src/Jamfile
	moses/src/Parameter.cpp
	moses/src/PhraseDictionary.cpp
	moses/src/StaticData.cpp
	moses/src/StaticData.h
	moses/src/TargetPhrase.h
	moses/src/TranslationSystem.cpp
	moses/src/TranslationSystem.h
	moses/src/Word.cpp
	phrase-extract/score.cpp
	regression-testing/Jamfile
	scripts/ems/experiment.meta
	scripts/ems/experiment.perl
	scripts/training/train-model.perl
2012-09-26 22:49:33 +01:00
Barry Haddow
8051981747 Fix so that it works without mira 2012-09-21 09:24:57 +01:00
Barry Haddow
37494dd673 fix phikoehn's merge conflict 2012-09-20 10:28:03 +01:00
Barry Haddow
f16965b841 Fix compile errors. Fix error when no interpolated lm. 2012-09-13 19:50:18 +01:00
phikoehn
19ef785146 bug fixes 2012-09-03 07:24:31 +01:00
phikoehn
0e783dc529 bug fix to enable pruned search graph output by default 2012-09-03 07:23:32 +01:00
phikoehn
4a1a995878 a lot of changes 2012-08-18 23:48:26 +01:00
phikoehn
366ab93f8a a lot of changes 2012-08-18 23:47:05 +01:00
Hieu Hoang
7757a3c56b Error from sort 2012-08-10 11:18:19 +01:00
Lane Schwartz
da5429318b KenLM maximum n-gram order can now be set via a compile-time flag 2012-08-08 16:22:13 -04:00
Barry Haddow
2b4e61d826 Merge branch 'trunk' into miramerge
Compiles, not tested.

Conflicts:
	Jamroot
	OnDiskPt/PhraseNode.h
	OnDiskPt/TargetPhrase.cpp
	OnDiskPt/TargetPhrase.h
	OnDiskPt/TargetPhraseCollection.cpp
	mert/BleuScorer.cpp
	mert/Data.cpp
	mert/FeatureData.cpp
	moses-chart-cmd/src/Main.cpp
	moses/src/AlignmentInfo.h
	moses/src/ChartManager.cpp
	moses/src/LM/Ken.cpp
	moses/src/LM/Ken.h
	moses/src/LMList.h
	moses/src/LexicalReordering.h
	moses/src/PhraseDictionaryTree.h
	moses/src/ScoreIndexManager.h
	moses/src/StaticData.h
	moses/src/TargetPhrase.h
	moses/src/Word.cpp
	scripts/ems/experiment.meta
	scripts/ems/experiment.perl
	scripts/training/train-model.perl
2012-07-17 13:36:50 +01:00
Eva Hasler
027a20730e merge Jamfiles 2012-07-04 11:49:07 +01:00
phikoehn
34c07e0ca8 bug fix 2012-07-03 20:01:59 +01:00
phikoehn
c8b2e89573 integrated sparse lexical features into experiment.perl, needs some more testing. 2012-07-03 06:20:09 +01:00
phikoehn
ff79f9f054 fix conflict
Merge branch 'master' of git://github.com/moses-smt/mosesdecoder

Conflicts:
	scripts/ems/experiment.perl
2012-07-03 00:05:13 +01:00
phikoehn
cce3f03f75 count bin feature 2012-07-02 23:59:17 +01:00
Hieu Hoang
dea9e778a2 bug creating filtering script when using factored model 2012-07-02 20:07:17 +01:00
Hieu Hoang
93bff3f201 lock m_vocab variable access in Encode() and Lookup(). Other functions are still not threadsafe 2012-06-26 13:33:34 -04:00
Hieu Hoang
debe090426 Change Bin to RealBin. Thanks to Tom Hoar 2012-06-26 11:57:23 -04:00
phikoehn
7cd8356752 minor bug fixes 2012-06-25 23:38:46 +01:00
phikoehn
765e789c0c Merge branch 'master' of git://github.com/moses-smt/mosesdecoder 2012-06-25 23:37:28 +01:00
phikoehn
9bbe553a86 allow nbest distinct in experiment.perl 2012-06-25 23:37:01 +01:00
Colin Cherry
07a5c67ebc Merge branch 'master' into miramerge
Conflicts:
	Jamroot
	misc/queryPhraseTable.cpp
	scripts/training/train-model.perl
2012-06-14 17:08:16 -04:00
Hieu Hoang
eaefd61bc9 minor warning 2012-06-08 17:30:40 +01:00
Hieu Hoang
22c038d93a take out debugging info 2012-06-08 00:20:49 +01:00