Commit Graph

113 Commits

Author SHA1 Message Date
Barry Haddow
01c4de24b7 don't delete moses ini specified in config 2012-11-06 10:59:15 +00:00
phikoehn
0dda804c46 sparse feature fixes 2012-10-18 03:09:49 +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
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
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
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
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
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
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
debe090426 Change Bin to RealBin. Thanks to Tom Hoar 2012-06-26 11:57:23 -04: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
Hieu Hoang
03ce774d0e suffix array creation script also creates glue grammar 2012-06-07 19:37:11 +01:00
Hieu Hoang
66800a3907 various filtered moses.ini work now 2012-06-07 18:43:51 +01:00
Hieu Hoang
21c80f4fbe pass number of ff from experiment.perl to train-model.perl for suffix array only 2012-06-07 17:53:52 +01:00
Hieu Hoang
5b7a9d5375 warning - undefined variablr 2012-06-07 16:14:12 +01:00
Hieu Hoang
e9c33669eb apply previous commit to TUNING:filter step 2012-06-07 16:01:19 +01:00
Hieu Hoang
05fc5ffce3 phrase table type deduced in experiment.perl. Passed to train-model.perl 2012-06-07 15:46:58 +01:00
Eva Hasler
e1c1a5343c merge 2012-06-07 11:16:52 +01:00
Hieu Hoang
0b59bee21c sa extraction works 2012-06-06 19:17:21 +01:00
Hieu Hoang
c6756f8301 start integrating adam's suffix array 2012-06-01 19:28:22 +01:00
Eva Hasler
6a6a35c65e fix start weights in experiment.perl, add hypothesis queue for picking hope and fear translations, add variations to 1slack formulation 2012-06-01 01:49:42 +01:00
Hieu Hoang
220ee4cd36 add -external-bin-dir for giza++/mgiza directory. Ignore -bin-dir and -script-root-dir 2012-05-31 16:52:37 +01:00
Colin Cherry
3c44d04baf Merge branch 'master' into miramerge
Conflicts:
	Jamroot
	mert/FeatureStats.cpp
	moses-cmd/src/IOWrapper.h
	scripts/training/mert-moses.pl
	scripts/training/train-model.perl.missing_bin_dir
2012-05-30 12:39:53 -04:00
phikoehn
07fafd51b5 Merge branch 'master' of git://github.com/moses-smt/mosesdecoder 2012-05-26 00:10:08 +01:00
phikoehn
561b9ac956 minor fixes 2012-05-26 00:09:50 +01:00
Phil Williams
90c0bc9f5c Add an optional PCFG scoring feature for target syntax models (similar to
the p_cfg feature used in Marcu, Wang, Echihabi, and Knight (2006)).
2012-05-25 17:29:47 +01:00
Barry Haddow
c397d2068b Merge branch 'trunk' into miramerge. Still to fix build.
Conflicts:
	Jamroot
	mert/Data.cpp
	mert/Data.h
	mert/FeatureArray.cpp
	mert/FeatureArray.h
	mert/FeatureData.cpp
	mert/FeatureData.h
	mert/FeatureStats.cpp
	mert/FeatureStats.h
	mert/mert.cpp
	moses-chart-cmd/src/IOWrapper.h
	moses-chart-cmd/src/Main.cpp
	moses-cmd/src/IOWrapper.cpp
	moses-cmd/src/IOWrapper.h
	moses-cmd/src/Main.cpp
	moses/src/GlobalLexicalModel.cpp
	moses/src/Jamfile
	moses/src/Parameter.cpp
	moses/src/PhraseDictionary.cpp
	moses/src/ScoreIndexManager.h
	moses/src/TargetPhrase.h
	regression-testing/tests/phrase.lexicalized-reordering-bin/truth/results.txt
	regression-testing/tests/phrase.lexicalized-reordering-cn/truth/results.txt
	regression-testing/tests/phrase.lexicalized-reordering/truth/results.txt
	regression-testing/tests/phrase.multiple-translation-system-lr/truth/results.txt
	regression-testing/tests/phrase.show-weights.lex-reorder/truth/results.txt
	regression-testing/tests/phrase.show-weights/truth/results.txt
	scripts/ems/experiment.meta
	scripts/ems/experiment.perl
	scripts/training/filter-model-given-input.pl
	scripts/training/mert-moses.pl
2012-05-24 21:11:35 +01:00
Eva Hasler
30deedde9f changed permission, everything changed.. 2012-05-10 18:54:24 +01:00
Eva Hasler
98da24a3a5 add condition for devtest chains, fix paths to moses/moses_chart 2012-04-24 05:17:19 +01:00
phikoehn
60ff4ff9fb minor fixes 2012-04-17 23:41:45 +01:00
phikoehn
a5a37c0371 minor fixes 2012-04-17 23:41:45 +01:00