summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Jamroot4
-rw-r--r--creg/Jamfile6
-rw-r--r--creg/creg.cc2
-rw-r--r--training/liblbfgs/Jamfile5
4 files changed, 14 insertions, 3 deletions
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 <threading>single <warnings>on <variant>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 : <include>../training <include>. : <library>..//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<float>& fmap, void* extra) {
if (rh.lc % 40000 == 0) { cerr << " [" << rh.lc << "]\n"; rh.flag = false; }
const unordered_map<string, unsigned>::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 : <include>.. ;
+
+unit-test ll_test : ll_test.cc liblbfgs : <include>.. ;