Merge branch 'master' of github.com:moses-smt/mosesdecoder

moses-smt · Sep 8, 2014 · f73538a · f73538a
2 parents 18437a0 + 5571ec9
commit f73538a
Show file tree

Hide file tree

Showing 16 changed files with 2,794 additions and 723 deletions.
diff --git a/Jamroot b/Jamroot
@@ -125,6 +125,19 @@ if [ option.get "with-cmph" : : "yes" ] {
   requirements += <define>HAVE_CMPH ;
 }
 
+if [ option.get "with-icu" : : "yes" ]
+{
+  external-lib icuuc ;
+  external-lib icuio ;
+  external-lib icui18n ;
+  requirements += <library>icuuc/<link>shared ;
+  requirements += <library>icuio/<link>shared ;
+  requirements += <library>icui18n/<link>shared ;
+  requirements += <cxxflags>-fPIC ;
+  requirements += <address-model>64 ;
+  requirements += <runtime-link>shared ;
+}
+
 if [ option.get "with-probing-pt" : : "yes" ]
 {
   external-lib boost_serialization ;
@@ -159,7 +172,6 @@ build-projects lm util phrase-extract search moses moses/LM mert moses-cmd moses
 if [ option.get "with-mm" : : "yes" ]
 {
  alias mm :  
-  moses/TranslationModel/UG//spe-check-coverage2
   moses/TranslationModel/UG//ptable-lookup 
   moses/TranslationModel/UG//sim-pe 
   moses/TranslationModel/UG//spe-check-coverage 

diff --git a/contrib/server/mosesserver.cpp b/contrib/server/mosesserver.cpp
@@ -281,7 +281,7 @@ class Translator : public xmlrpc_c::method
         const ChartHypothesis *hypo = manager.GetBestHypothesis();
         outputChartHypo(out,hypo);
         if (addGraphInfo) {
-          const size_t translationId = tinput.GetTranslationId();
+          // const size_t translationId = tinput.GetTranslationId();
           std::ostringstream sgstream;
           manager.OutputSearchGraphMoses(sgstream);
           retData.insert(pair<string, xmlrpc_c::value>("sg", xmlrpc_c::value_string(sgstream.str())));

diff --git a/moses/TranslationModel/UG/Jamfile b/moses/TranslationModel/UG/Jamfile
@@ -9,6 +9,18 @@ $(TOP)/moses/TranslationModel/UG//mmsapt
 $(TOP)/util//kenutil 
 ; 
 
+exe try-align2 : 
+try-align2.cc 
+$(TOP)/moses//moses
+$(TOP)/moses/TranslationModel/UG/generic//generic 
+$(TOP)/moses/TranslationModel/UG/generic//stringdist 
+$(TOP)//boost_iostreams 
+$(TOP)//boost_program_options 
+$(TOP)/moses/TranslationModel/UG/mm//mm 
+$(TOP)/moses/TranslationModel/UG//mmsapt 
+$(TOP)/util//kenutil 
+; 
+
 exe ptable-lookup : 
 ptable-lookup.cc 
 $(TOP)/moses//moses
@@ -53,6 +65,16 @@ $(TOP)/moses/TranslationModel/UG//mmsapt
 $(TOP)/util//kenutil 
 ; 
 
-install $(PREFIX)/bin : try-align ; 
+exe spe-check-coverage3 : 
+spe-check-coverage3.cc 
+$(TOP)/moses//moses
+$(TOP)/moses/TranslationModel/UG/generic//generic 
+$(TOP)//boost_iostreams 
+$(TOP)//boost_program_options 
+$(TOP)/moses/TranslationModel/UG/mm//mm 
+$(TOP)/moses/TranslationModel/UG//mmsapt 
+$(TOP)/util//kenutil 
+; 
+install $(PREFIX)/bin : try-align try-align2 ; 
 
 fakelib mmsapt : [ glob *.cpp mmsapt*.cc sapt*.cc ] ;
diff --git a/moses/TranslationModel/UG/generic/Jamfile b/moses/TranslationModel/UG/generic/Jamfile
@@ -1 +1,2 @@
-fakelib generic : [ glob */*.cc */*.cpp ] ; 
+fakelib generic : [ glob */*.cc */*.cpp : stringdist/* ] ; 
+fakelib stringdist : [ glob stringdist/*.cc ] ;