Commit Graph

55 Commits

Author SHA1 Message Date
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
952f4b2523 Fix bjam from any directory. Add iostreams dependency to score for Hieu. 2012-05-10 12:18:49 -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
28b1fbcf5d Only add -static to clang on linux 2012-05-06 20:13:19 -04:00
Kenneth Heafield
2e7e28092c Apparently bjam doesn't pass -static to clang 2012-05-04 19:06:03 -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
40c5888723 Save bjam arguments to previous.sh. 2012-03-30 19:57:05 -04:00
Kenneth Heafield
d62f301345 Optional header installation 2012-02-13 14:31:37 -05: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
0095bef952 Also support just clean... 2011-12-05 11:09:48 +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
7cc0ea81b7 Bypass Boost checks on --clean 2011-12-05 02:53:35 -08:00
Kenneth Heafield
9fe831c60c Merge CreateOnDisk into OnDiskPt, pop out of src 2011-12-01 18:26:05 +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
8923905e38 Forgot to do variable substitution 2011-12-01 04:11:58 -08:00
Kenneth Heafield
7dd078573e Merge branch 'master' of github.com:moses-smt/mosesdecoder 2011-11-30 12:32:50 +00:00
Kenneth Heafield
7d027b307f Force single-threaded build if --with-irstlm 2011-11-30 12:17:47 +00:00
Kenneth Heafield
d4099a7455 More error checking for moses server 2011-11-30 08:53:13 +00:00
Kenneth Heafield
c52268757d Add optional regression testing to the build 2011-11-28 15:52:53 +00:00
Kenneth Heafield
180e987602 Unused code 2011-11-28 12:04:04 +00:00
Kenneth Heafield
05636004fd prefix style of installation 2011-11-28 12:01:33 +00:00
Kenneth Heafield
bf9528403d Respect CXXFLAGS, CFLAGS, LDFLAGS 2011-11-28 04:35:46 -05:00
Kenneth Heafield
6abce3cfcc --enable-boost-pool option 2011-11-27 16:53:40 +00:00
Kenneth Heafield
5a40524eff Check for boost and version number 2011-11-26 12:18:17 +00:00
Kenneth Heafield
6edf5fe9cc Regression tests expect mert in mert/ 2011-11-25 22:14:04 +00:00
Kenneth Heafield
3e54901d45 Minor commenting 2011-11-25 18:09:07 +00:00
Kenneth Heafield
74a2d014f0 Comment reformatting 2011-11-25 17:30:36 +00:00
Kenneth Heafield
0da8f1f4eb Build scripts from root. 2011-11-25 16:53:02 +00:00
Kenneth Heafield
e8dd8f2853 Add GITTAG constant 2011-11-25 14:41:49 +00:00
Kenneth Heafield
de3d8f72b7 --with-boost 2011-11-25 03:55:36 -08:00
Kenneth Heafield
9778438ad7 D'oh forgot a boost_ 2011-11-24 08:26:44 -05: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
5e2731619c Move projects from top level to contrib
server build probably broken
2011-11-23 14:48:50 +00:00
Kenneth Heafield
24099bd9b1 Link against libSegFault if possible, --git option for installation. 2011-11-23 14:01:58 +00:00
Barry Haddow
f948f32c88 misc jamming 2011-11-23 12:10:45 +00:00
Kenneth Heafield
ccd4964a91 Better help message 2011-11-23 11:29:42 +00:00
Kenneth Heafield
82d2513a83 Apparently order matters when it comes to <debug-symbols>on. 2011-11-22 13:17:31 -05:00
Kenneth Heafield
076d94dd9e Jam: Had inverted --notrace by accident. -g on by default at Barry's request. 2011-11-22 13:13:44 -05:00
Kenneth Heafield
cc7edff099 Merge branch 'master' of github.com:moses-smt/mosesdecoder 2011-11-22 12:55:17 -05:00
Barry Haddow
6d1438b97f Disable object pool as it's broken (not threadsafe?) 2011-11-22 16:06:34 +00:00
Kenneth Heafield
ca38bcab98 Stop bjam from complaining that a toolset isn't configured 2011-11-21 18:07:30 -05:00
Kenneth Heafield
a65ed7e587 Jam: install executables in legacy paths and stop leaving a.out files everywhere 2011-11-21 13:20:52 -05:00
Kenneth Heafield
0c239662bf Go back to using boost.jam. It does -mt right. 2011-11-21 12:41:14 -05:00
Kenneth Heafield
da89f1e9b9 Moses server Jam 2011-11-21 17:19:24 +00:00
Kenneth Heafield
463f2e232e Link dynamically against libz if we have to 2011-11-21 15:09:38 +00:00
Kenneth Heafield
5822851f41 Attempt to unbreak build, now it wants static zlib 2011-11-21 15:02:40 +00:00
Kenneth Heafield
21d55d2c26 Jam: Documentation, link against -mt, SRI warnings off 2011-11-21 09:31:10 -05:00