Commit Graph

60 Commits

Author SHA1 Message Date
Kenneth Heafield
d4f433c7f4 Put core Moses into one library libmoses. 2012-11-12 18:07:53 +00:00
Kenneth Heafield
b6b2e35190 Change test_lib to obey --static 2012-10-30 19:42:11 +00:00
Kenneth Heafield
4977f2790f Update bjam to 1.51.0 2012-10-22 10:20:12 +01:00
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
650ad22c9c Merge remote branch 'upstream/master'
Conflicts:
	util/file.cc
	util/file.hh
2012-10-09 11:30:31 +01: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
Kenneth Heafield
f4471692ba Stop deleting /dev/null on OS X / Hiroshi Umemoto 2012-10-07 14:44:58 +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
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
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
4faab6c68f Extract kenlm into a submodule, referencing lazy 2012-09-24 18:30:51 +01:00
Kenneth Heafield
15b0ae1aef Single-threaded compilation fixes 2012-09-21 18:34:48 -04:00
Kenneth Heafield
968ab98f0c Make --with-regtest work without an argument, fix path handling 2012-09-11 10:43:28 +01:00
Kenneth Heafield
be76c67f96 Old buggy bjam always returns 0. Detect+reject.
http://boost.2283326.n4.nabble.com/bjam-exit-code-always-zero-td2696668.html
2012-09-09 12:00:13 +01:00
Kenneth Heafield
1a57ceeb1e Fall back on unversioned Boost 2012-08-17 08:48:01 -04:00
Kenneth Heafield
4637c4f642 Get the Boost version tag from version.hpp and include it in the name of the Boost libraries.
This will force people to use consistent headers and libraries and might fix some cases where a
user has installed libraries locally on top of a system-level install.
2012-08-16 17:22:44 -04:00
Kenneth Heafield
2556c8079a When used with --static, also add <runtime-link>static. 2012-08-06 12:21:16 -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
Kenneth Heafield
0c484ec8e7 New --nosegfault option for Tom Hoar 2012-08-06 08:15:04 -04:00
Hieu Hoang
dede0d1747 Merge branch 'master' of github.com:moses-smt/mosesdecoder 2012-07-31 15:50:28 +01:00
Kenneth Heafield
edf34e9d35 Loosen requirements for system bjam versions / Tom Hoar 2012-07-30 16:47:30 -04:00
Hieu Hoang
97f46537b7 wrap phi's suffix array implementation and extraction method in a wrapper class. Compiles 2012-07-30 21:07: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
Kenneth Heafield
a73dc0e5b4 Attempt to fix missing boost_system for some people with 1.50 2012-07-17 04:40:32 -04:00
Eva Hasler
f592c222fe revert mode changes 2012-07-04 12:25:21 +01:00
Eva Hasler
027a20730e merge Jamfiles 2012-07-04 11:49:07 +01:00
Kenneth Heafield
b9d4cc9af3 Alexander Fraser: Boost thread depends on Boost system. 2012-07-03 12:14:41 -04:00
Kenneth Heafield
be2b2224fb Extract hack to force recompilation if arguments change 2012-07-02 12:56:14 -04:00
Kenneth Heafield
272aeaa67e Merge some build system changes that were made for cdec 2012-06-21 09:52:25 -04:00
Eva Hasler
e1c1a5343c merge 2012-06-07 11:16:52 +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
Barry Haddow
f716673f67 Allow combination of --prefix and --git 2012-05-31 22:58:39 +01:00
Hieu Hoang
465c5cbf97 move all executables into bin 2012-05-31 12:55:05 +01:00
Tetsuo Kiso
5c939dc348 Force shared linkage only for clang-linux.
bjam's support for clang on Linux is buggy.
The support for clang on Darwin (Mac OS X) looks fine.
2012-05-13 21:02:27 +09:00
Tetsuo Kiso
5252ca94d0 Force shared linkage only for clang-linux.
bjam's support for clang on Linux is buggy.
The support for clang on Darwin (Mac OS X) looks fine.
2012-05-13 21:02:27 +09:00
Eva Hasler
30deedde9f changed permission, everything changed.. 2012-05-10 18:54:24 +01:00
Kenneth Heafield
c7f18473aa Force shared linkage with clang. 2012-05-10 13:15:12 -04:00
Kenneth Heafield
b64c182535 Force shared linkage with clang. 2012-05-10 13:15:12 -04: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
15afc2aef2 Fix autodetection for non-bash users 2012-05-10 11:44:58 -04:00
Kenneth Heafield
80e3198dd2 Fix autodetection for non-bash users 2012-05-10 11:44:58 -04:00
Christian Federmann
af9b02c59b Added new --with-macports option for using MacPorts on Mac OS X; this falls back to using /opt/local if no /path/to/macports is given and implicitly sets Boost parameters. Also note that this implies "using darwin ;" as compiler. 2012-05-10 09:40:13 +02:00
Christian Federmann
db398aeca0 Added new --with-macports option for using MacPorts on Mac OS X; this falls back to using /opt/local if no /path/to/macports is given and implicitly sets Boost parameters. Also note that this implies "using darwin ;" as compiler. 2012-05-10 09:40:13 +02:00
Kenneth Heafield
10821a9980 When given a relative install path, interpret it relative to pwd. 2012-05-08 14:42:09 -04:00
Kenneth Heafield
e1c2fa5452 When given a relative install path, interpret it relative to pwd. 2012-05-08 14:42:09 -04:00
Kenneth Heafield
7d247737ed Fix install-scripts 2012-05-08 14:00:42 -04:00