From 75d0f86f8f949e37c600096accf85d5521940f40 Mon Sep 17 00:00:00 2001 From: Chris Dyer Date: Wed, 16 May 2012 17:01:21 -0400 Subject: bjam cleanup --- Jamroot | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Jamroot') diff --git a/Jamroot b/Jamroot index f873db68..6daf7a9e 100644 --- a/Jamroot +++ b/Jamroot @@ -18,6 +18,10 @@ if [ test_header google/dense_hash_map ] || $(with-google-hash) { requirements += HAVE_SPARSEHASH $(with-google-hash) ; } +if [ test_header cmph.h ] || $(with-cmph) { + requirements += HAVE_CMPH $(with-cmph) ; +} + if [ test_header boost/serialization/map.hpp ] && [ test_library boost_serialization ] { requirements += HAVE_BOOST_ARCHIVE_TEXT_OARCHIVE_HPP ; } -- cgit v1.2.3 From ff6cc0d60f32c11fca9ffd81af93bec334728f31 Mon Sep 17 00:00:00 2001 From: Chris Dyer Date: Thu, 17 May 2012 23:48:23 -0400 Subject: jamfiles for creg --- Jamroot | 4 ++-- creg/Jamfile | 6 ++++++ creg/creg.cc | 2 +- training/liblbfgs/Jamfile | 5 +++++ 4 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 creg/Jamfile create mode 100644 training/liblbfgs/Jamfile (limited to 'Jamroot') diff --git a/Jamroot b/Jamroot index 6daf7a9e..f42a9bc3 100644 --- a/Jamroot +++ b/Jamroot @@ -29,9 +29,9 @@ if [ test_header boost/serialization/map.hpp ] && [ test_library boost_serializa project : requirements $(requirements) ; project : default-build single on release ; -install-bin-libs utils//programs mteval//programs klm/lm//programs decoder//cdec phrasinator//programs ; +install-bin-libs utils//programs mteval//programs klm/lm//programs training//liblbfgs decoder//cdec creg//creg phrasinator//programs ; -build-projects mteval decoder klm/lm ; +build-projects mteval decoder klm/lm training/liblbfgs creg ; #Compile everything ending with _test.cc into a test and run it. rule all_tests ( targets * : dependencies : properties * ) { diff --git a/creg/Jamfile b/creg/Jamfile new file mode 100644 index 00000000..cfed2388 --- /dev/null +++ b/creg/Jamfile @@ -0,0 +1,6 @@ +import lex ; + +exe creg : creg.cc json_feature_map_lexer.ll ..//utils ../training//liblbfgs ..//boost_program_options : ../training . : ..//z ; + +alias programs : creg ; + diff --git a/creg/creg.cc b/creg/creg.cc index 005ec9ac..b145ac49 100644 --- a/creg/creg.cc +++ b/creg/creg.cc @@ -65,7 +65,7 @@ void ReaderCB(const string& id, const SparseVector& fmap, void* extra) { if (rh.lc % 40000 == 0) { cerr << " [" << rh.lc << "]\n"; rh.flag = false; } const unordered_map::iterator it = rh.id2ind.find(id); if (it == rh.id2ind.end()) { - cerr << "Unlabeled example in line " << rh.lc << endl; + cerr << "Unlabeled example in line " << rh.lc << " (key=" << id << ')' << endl; abort(); } (*rh.xy_pairs)[it->second - 1].x = fmap; diff --git a/training/liblbfgs/Jamfile b/training/liblbfgs/Jamfile new file mode 100644 index 00000000..49c82748 --- /dev/null +++ b/training/liblbfgs/Jamfile @@ -0,0 +1,5 @@ +import testing ; + +lib liblbfgs : lbfgs.c : .. ; + +unit-test ll_test : ll_test.cc liblbfgs : .. ; -- cgit v1.2.3 From a70d6d3ed83a32d3cdf4bcb36a087426a4ed2c31 Mon Sep 17 00:00:00 2001 From: Chris Dyer Date: Fri, 18 May 2012 00:24:35 -0400 Subject: build with bjam --- Jamroot | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Jamroot') diff --git a/Jamroot b/Jamroot index f42a9bc3..fff11d56 100644 --- a/Jamroot +++ b/Jamroot @@ -26,7 +26,8 @@ if [ test_header boost/serialization/map.hpp ] && [ test_library boost_serializa requirements += HAVE_BOOST_ARCHIVE_TEXT_OARCHIVE_HPP ; } -project : requirements $(requirements) ; +# project : requirements $(requirements) ; +project : requirements $(requirements) darwin:static ; project : default-build single on release ; install-bin-libs utils//programs mteval//programs klm/lm//programs training//liblbfgs decoder//cdec creg//creg phrasinator//programs ; -- cgit v1.2.3