Commit Graph

170 Commits

Author SHA1 Message Date
Barry Haddow
365e680115 Merge remote-tracking branch 'origin/master' into miramerge
NB Untested

Conflicts:
	Jamroot
	moses-chart-cmd/src/Main.cpp
	moses/src/ChartManager.cpp
	moses/src/RuleTable/LoaderStandard.cpp
	moses/src/RuleTable/PhraseDictionaryALSuffixArray.cpp
	moses/src/Word.cpp
2012-10-15 21:35:56 +01:00
Kenneth Heafield
0eb98df0fe Submodules are evil. Undo it. 2012-10-15 13:58:33 +01:00
Barry Haddow
a638736722 Reinstate Moses unit tests 2012-10-11 21:33:11 +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
4faab6c68f Extract kenlm into a submodule, referencing lazy 2012-09-24 18:30:51 +01:00
wlin12
6202c7cc60 adding the code for relative entropy pruning to contrib/relent-filter 2012-09-07 17:33:44 +01:00
Kenneth Heafield
b317522563 Move max-order to lm directory and direct dependencies. 2012-08-18 12:07:53 -04:00
Lane Schwartz
2556dfc0e5 If --install-scripts is provided with no argument, install to $prefix/scripts
If --prefix is specified, but --install-scripts is not, do not install scripts
2012-08-08 16:50:33 -04:00
Lane Schwartz
a2afc98665 Add program to query the KenLM maximum n-gram order 2012-08-08 16:41:29 -04: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
Kenneth Heafield
b52ed110b0 Build changes. --static will force static linkage.
--without-libsegfault will skip libSegFault.
2012-08-06 10:41:49 -04:00
Marcin Junczys-Dowmunt
767969af6d Jamroot 2012-08-04 22:49:42 +02:00
Marcin Junczys-Dowmunt
a245e9ea55 Correction of jamfiles etc. 2012-08-04 15:39:30 +02:00
Marcin Junczys-Dowmunt
88a860d776 Warnings, build issues 2012-08-03 19:29:21 +02:00
Marcin Junczys-Dowmunt
a35791893f Updated Jamsfiles, build instructions etc. 2012-08-03 16:38:45 +02:00
Kenneth Heafield
141861842d Change header file glob from an opt-out to an opt-in for Ondrej Bojar 2012-07-30 15:50:30 -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
Kenneth Heafield
272aeaa67e Merge some build system changes that were made for cdec 2012-06-21 09:52:25 -04: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
Barry Haddow
06f7615779 Merge branch 'miramerge' of github.com:moses-smt/mosesdecoder into miramerge 2012-06-07 00:26:47 +01:00
Barry Haddow
e53aee1275 Fix mpi build 2012-06-07 00:26:22 +01:00
Hieu Hoang
86a1886cb4 get rid of mention of --with-giza arg 2012-06-05 18:15:43 +01:00
Kenneth Heafield
833435561d Warning about dist directory. 2012-05-31 19:13:01 -04:00
Hieu Hoang
417d5ee57b move biconcor to / 2012-05-31 23:32:24 +01:00
Hieu Hoang
a5ca652a76 move c++ code out of /script/ to / 2012-05-31 17:58:10 +01:00
Hieu Hoang
4eef94b121 move c++ code out of /script/ to / 2012-05-31 17:24:06 +01:00
Hieu Hoang
4c88377cbe change CreateOnDisk to CreateOnDiskPt 2012-05-31 14:28:58 +01:00
Hieu Hoang
465c5cbf97 move all executables into bin 2012-05-31 12:55:05 +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
Hieu Hoang
8844be6f25 Move queryOnDiskPt from contrib to OnDiskPt folder. Easier to amend Jam file 2012-05-25 13:41:06 +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
Kenneth Heafield
e3a155494b Fix bjam from any directory. Add iostreams dependency to score for Hieu. 2012-05-10 12:18:49 -04:00
Kenneth Heafield
952f4b2523 Fix bjam from any directory. Add iostreams dependency to score for Hieu. 2012-05-10 12:18:49 -04:00
Kenneth Heafield
36f31a017b Refactor Jamroot to separate Moses high-level and common low-level. 2012-05-07 12:58:34 -04:00
Kenneth Heafield
8fc321cb7b Refactor Jamroot to separate Moses high-level and common low-level. 2012-05-07 12:58:34 -04:00
Kenneth Heafield
265f2207fc Only add -static to clang on linux 2012-05-06 20:13:19 -04:00
Kenneth Heafield
28b1fbcf5d Only add -static to clang on linux 2012-05-06 20:13:19 -04:00
Kenneth Heafield
32e5d5e170 Apparently bjam doesn't pass -static to clang 2012-05-04 19:06:03 -04:00
Kenneth Heafield
2e7e28092c Apparently bjam doesn't pass -static to clang 2012-05-04 19:06:03 -04:00
Kenneth Heafield
d3a8d281a9 Fix previous.sh for people who don't have bjam installed 2012-04-02 15:20:56 -04:00
Kenneth Heafield
1b858ef085 Fix previous.sh for people who don't have bjam installed 2012-04-02 15:20:56 -04:00
Kenneth Heafield
a54f7f855f Save bjam arguments to previous.sh. 2012-03-30 19:57:05 -04:00
Kenneth Heafield
40c5888723 Save bjam arguments to previous.sh. 2012-03-30 19:57:05 -04:00
Kenneth Heafield
05909cc7f4 Optional header installation 2012-02-13 14:31:37 -05:00
Kenneth Heafield
d62f301345 Optional header installation 2012-02-13 14:31:37 -05:00
Phil Williams
8462f24b72 Restore the "--with-tcmalloc" configuration option that was lost
in the transition from autotools to bjam.
2012-01-23 11:34:46 +00:00
Phil Williams
1d3b095013 Restore the "--with-tcmalloc" configuration option that was lost
in the transition from autotools to bjam.
2012-01-23 11:34:46 +00:00
Barry Haddow
fde9c37b26 enable mpi support 2011-12-15 21:54:56 +00:00
Barry Haddow
a64bba48ad Add moses and mira unit tests to bjam build. 2011-12-15 12:36:07 +00:00
Barry Haddow
b2c1e97a53 mira now builds with bjam 2011-12-15 11:30:58 +00:00
Kenneth Heafield
e99f42f70b Also support just clean... 2011-12-05 11:09:48 +00:00
Kenneth Heafield
0095bef952 Also support just clean... 2011-12-05 11:09:48 +00:00
Kenneth Heafield
2c53b59def Clean train-model-perl even if --with-giza isn't passed. 2011-12-05 11:01:34 +00:00
Kenneth Heafield
b8b009136f Clean train-model-perl even if --with-giza isn't passed. 2011-12-05 11:01:34 +00:00
Kenneth Heafield
761be56e74 Bypass Boost checks on --clean 2011-12-05 02:53:35 -08:00
Kenneth Heafield
7cc0ea81b7 Bypass Boost checks on --clean 2011-12-05 02:53:35 -08:00
Kenneth Heafield
a0d79781e5 Merge CreateOnDisk into OnDiskPt, pop out of src 2011-12-01 18:26:05 +00:00
Kenneth Heafield
9fe831c60c Merge CreateOnDisk into OnDiskPt, pop out of src 2011-12-01 18:26:05 +00:00
Kenneth Heafield
ececab6e27 Fine, go back to allowing multi-threaded builds to link against IRSTLM 2011-12-01 17:52:11 +00:00
Kenneth Heafield
8d68887fc0 Fine, go back to allowing multi-threaded builds to link against IRSTLM 2011-12-01 17:52:11 +00:00
Kenneth Heafield
56d2b0d3e9 Forgot to do variable substitution 2011-12-01 04:11:58 -08:00
Kenneth Heafield
8923905e38 Forgot to do variable substitution 2011-12-01 04:11:58 -08:00
Kenneth Heafield
3dfb19402d Merge branch 'master' of github.com:moses-smt/mosesdecoder 2011-11-30 12:32:50 +00:00
Kenneth Heafield
7dd078573e Merge branch 'master' of github.com:moses-smt/mosesdecoder 2011-11-30 12:32:50 +00:00
Kenneth Heafield
dd80a7956f Force single-threaded build if --with-irstlm 2011-11-30 12:17:47 +00:00
Kenneth Heafield
7d027b307f Force single-threaded build if --with-irstlm 2011-11-30 12:17:47 +00:00
Kenneth Heafield
7451269923 More error checking for moses server 2011-11-30 08:53:13 +00:00
Kenneth Heafield
d4099a7455 More error checking for moses server 2011-11-30 08:53:13 +00:00
Kenneth Heafield
2722fe2317 Add optional regression testing to the build 2011-11-28 15:52:53 +00:00
Kenneth Heafield
c52268757d Add optional regression testing to the build 2011-11-28 15:52:53 +00:00
Kenneth Heafield
2b5ef4b33b Unused code 2011-11-28 12:04:04 +00:00
Kenneth Heafield
180e987602 Unused code 2011-11-28 12:04:04 +00:00
Kenneth Heafield
180b74bcac prefix style of installation 2011-11-28 12:01:33 +00:00
Kenneth Heafield
05636004fd prefix style of installation 2011-11-28 12:01:33 +00:00
Kenneth Heafield
ab9976b719 Respect CXXFLAGS, CFLAGS, LDFLAGS 2011-11-28 04:35:46 -05:00
Kenneth Heafield
bf9528403d Respect CXXFLAGS, CFLAGS, LDFLAGS 2011-11-28 04:35:46 -05:00
Kenneth Heafield
a0efeb5e6e --enable-boost-pool option 2011-11-27 16:53:40 +00:00
Kenneth Heafield
6abce3cfcc --enable-boost-pool option 2011-11-27 16:53:40 +00:00
Kenneth Heafield
82d40e4044 Check for boost and version number 2011-11-26 12:18:17 +00:00
Kenneth Heafield
5a40524eff Check for boost and version number 2011-11-26 12:18:17 +00:00
Kenneth Heafield
a7222a322d Regression tests expect mert in mert/ 2011-11-25 22:14:04 +00:00
Kenneth Heafield
6edf5fe9cc Regression tests expect mert in mert/ 2011-11-25 22:14:04 +00:00
Kenneth Heafield
ab7469ee04 Minor commenting 2011-11-25 18:09:07 +00:00
Kenneth Heafield
3e54901d45 Minor commenting 2011-11-25 18:09:07 +00:00
Kenneth Heafield
ae2272d291 Comment reformatting 2011-11-25 17:30:36 +00:00
Kenneth Heafield
74a2d014f0 Comment reformatting 2011-11-25 17:30:36 +00:00
Kenneth Heafield
3130534480 Build scripts from root. 2011-11-25 16:53:02 +00:00
Kenneth Heafield
0da8f1f4eb Build scripts from root. 2011-11-25 16:53:02 +00:00
Kenneth Heafield
e20a9e93b2 Add GITTAG constant 2011-11-25 14:41:49 +00:00
Kenneth Heafield
e8dd8f2853 Add GITTAG constant 2011-11-25 14:41:49 +00:00
Kenneth Heafield
9d994ffc5c --with-boost 2011-11-25 03:55:36 -08:00
Kenneth Heafield
de3d8f72b7 --with-boost 2011-11-25 03:55:36 -08:00
Kenneth Heafield
13848b1ea3 D'oh forgot a boost_ 2011-11-24 08:26:44 -05:00
Kenneth Heafield
9778438ad7 D'oh forgot a boost_ 2011-11-24 08:26:44 -05:00
Kenneth Heafield
1a4dba45b3 Backwards compatible boost selection. Apparently boost.jam sucks at old versions. Go back to manual boost with shell scripts. 2011-11-23 19:12:44 +00:00
Kenneth Heafield
b8640e4324 Backwards compatible boost selection. Apparently boost.jam sucks at old versions. Go back to manual boost with shell scripts. 2011-11-23 19:12:44 +00:00
Barry Haddow
7b472960b1 Move projects from top level to contrib
server build probably broken
2011-11-23 14:48:50 +00:00
Barry Haddow
5e2731619c Move projects from top level to contrib
server build probably broken
2011-11-23 14:48:50 +00:00
Kenneth Heafield
ccf08a29f3 Link against libSegFault if possible, --git option for installation. 2011-11-23 14:01:58 +00:00
Kenneth Heafield
24099bd9b1 Link against libSegFault if possible, --git option for installation. 2011-11-23 14:01:58 +00:00