Commit Graph

9283 Commits

Author SHA1 Message Date
Kenneth Heafield
8bc4fa0390 Merge branch 'master' of github.com:moses-smt/mosesdecoder 2012-10-04 16:10:15 +01:00
Kenneth Heafield
f95ee6e00c MERT regtest should depend on extractor. 2012-10-04 16:08:37 +01:00
Kenneth Heafield
e3af51f3a4 Merge remote branch 'upstream/master'
Conflicts:
	jam-files/sanity.jam
2012-10-04 15:17:23 +01:00
Hieu Hoang
9ae55243e2 remove dependency on boost filesystem object 2012-10-04 15:08:22 +01:00
Kenneth Heafield
92d19401dc Merge remote branch 'upstream/master' 2012-10-04 11:20:07 +01:00
Phil Williams
0851a4d113 extract-ghkm: add --SentenceOffset option
This should behave the same as the --SentenceOffset option for
extract-rules.  The extract-parallel.perl script expects the rule
extractor to have this option.
2012-10-03 20:04:09 +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
Phil Williams
721d22e048 Merge branch 'master' of /home/s0898777/git/moses-integration 2012-10-03 19:57:01 +01:00
Wilker Aziz
7f5b6b2310 better doc 2012-10-03 20:04:48 +02:00
Kenneth Heafield
16833737b4 Useful methods for me, remove stale ones 2012-10-03 19:04:14 +01:00
Kenneth Heafield
71c4d0c2ff Update lazy 2012-10-03 19:01:16 +01:00
Eva Hasler
e7e4dbd405 merge remaining changes to mira, word pair features, phrase pair features 2012-10-03 18:53:55 +01:00
Phil Williams
0eaab4b6e4 Merge branch 'master' of /home/s0898777/git/moses-integration 2012-10-03 16:49:08 +01:00
Kenneth Heafield
9f460dd62a Merge remote branch 'upstream/master' 2012-10-03 14:27:14 +01:00
Kenneth Heafield
69a0fcde29 Merge ShrinkToLimit into ApplyThreshold 2012-10-03 14:23:46 +01:00
Kenneth Heafield
56dc2152e2 Merge remote branch 'upstream/master' 2012-10-03 13:29:43 +01:00
Kenneth Heafield
7a2f0d19bd Extract base class for ChartTranslationOptionList 2012-10-03 13:27:47 +01:00
Kenneth Heafield
1354d5c5f4 Remove unused forward declaration 2012-10-03 13:10:56 +01:00
wlin12
f92d63c9a2 input type bug fix 2012-10-02 18:54:51 +01:00
Kenneth Heafield
0d86844a33 Base class switcheroo 2012-10-02 16:47:50 +01:00
Kenneth Heafield
542502e6fd Abstract ChartCellCollection, extract source labels 2012-10-02 16:34:25 +01:00
Lane Schwartz
2085fd311b Merge branch 'master' of www:/repos/git/Decoders/mosesdecoder 2012-10-02 09:48:37 -04:00
Kenneth Heafield
a9524f079f Splitting ChartCell into cube v non-cube 2012-10-02 14:30: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
Kenneth Heafield
60f725f604 Restrict access to ChartCell 2012-10-02 13:27:02 +01:00
Eva Hasler
ebbf0d028c changes to mira, adding jackknife to experiment.perl 2012-10-01 20:36:52 +01:00
Kenneth Heafield
b7a280064e Merge remote branch 'upstream/master' 2012-10-01 17:31:57 +01:00
Kenneth Heafield
618e2d51a6 Apparently nobody uses hash.{h,cpp} 2012-10-01 17:18:49 +01:00
Kenneth Heafield
bdaffe3379 Merge remote branch 'upstream/master'
Conflicts:
	lm/Jamfile
	lm/bhiksha.cc
	lm/bhiksha.hh
	lm/binary_format.cc
	lm/binary_format.hh
	lm/build_binary.cc
	lm/left.hh
	lm/max_order.cc
	lm/model.cc
	lm/model.hh
	lm/quantize.hh
	lm/read_arpa.cc
	lm/search_hashed.hh
	lm/search_trie.cc
	lm/search_trie.hh
	lm/state.hh
	lm/trie.cc
	lm/trie.hh
	lm/trie_sort.cc
	lm/trie_sort.hh
	lm/vocab.cc
	lm/vocab.hh
	util/ersatz_progress.cc
	util/ersatz_progress.hh
	util/exception.cc
	util/exception.hh
	util/file.cc
	util/file.hh
	util/file_piece.cc
	util/probing_hash_table.hh
2012-10-01 16:53:20 +01:00
Phil Williams
564fa30663 Merge branch 'master' of /home/s0898777/git/moses-integration 2012-10-01 08:56:24 +01:00
Lane Schwartz
ca6a751f6e Merge branch 'master' of www:/repos/git/Decoders/mosesdecoder 2012-09-28 15:30:24 -04:00
Lane Schwartz
7b042edc6c Send stderr to /dev/null when looking for pawd.
This cleans up the logs a bit for those of us who don't have pawd.
Otherwise, messages like the following show up in the logs:

/usr/bin/which: no pawd in ...
2012-09-28 14:55:09 -04:00
Lane Schwartz
a323c8daf7 Send stderr to /dev/null when looking for pawd.
This cleans up the logs a bit for those of us who don't have pawd.
Otherwise, messages like the following show up in the logs:

/usr/bin/which: no pawd in ...

bash: pawd: command not found
2012-09-28 14:37:53 -04:00
Kenneth Heafield
78f295c0a0 KenLM c34d00 2012-09-28 15:04:48 +01:00
Kenneth Heafield
287836438c Tweak Boost command line 2012-09-28 13:14:25 +01:00
Kenneth Heafield
1e3f85b96a Merge remote-tracking branch 'upstream/master'
Conflicts:
	.gitmodules
2012-09-27 18:30:38 +01:00
Kenneth Heafield
0688794840 Use absolute path so regtests still work 2012-09-27 18:02:23 +01:00
Kenneth Heafield
fec0cb7595 Change StackVec to contain ChartCellLabel* 2012-09-27 17:33:31 +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
9931a1e0fd Merge remote branch 'github/master' into miramerge 2012-09-26 22:50:48 +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
Kenneth Heafield
9c990ee3a8 Merge remote-tracking branch 'upstream/master'
Conflicts:
	moses/src/LM/Jamfile
2012-09-26 19:22:33 +01:00
Kenneth Heafield
080585b5c4 Start hacking 2012-09-26 19:21:07 +01:00
Kenneth Heafield
bc866f37ff New approach to forcing recompiles
Fixes annoying problem that unsuccessful build iterations would keep rebuilding Factory.o and CompactPT
2012-09-26 19:14:26 +01:00
Kenneth Heafield
3d8e1274b1 Abstract ChartCellLabel 2012-09-26 17:25:40 +01:00
Kenneth Heafield
32e46c716a Simplify call 2012-09-26 17:15:46 +01:00
Kenneth Heafield
bf81bdeda5 Update regression tests with .gitignore 2012-09-26 16:43:06 +01:00
Barry Haddow
1ce788e2b8 Fixes for regression tests 2012-09-26 14:40:06 +01:00
Kenneth Heafield
b47f7b15ad Merge remote-tracking branch 'upstream/master' 2012-09-26 12:54:48 +01:00
Kenneth Heafield
ab60d1ad6f Slightly less wasteful OnDiskPt word conversion
Ideally, OnDiskPt would convert its entire vocabulary to Word in advance.
2012-09-26 12:52:11 +01:00