always compile moses2. No need to include xmlrpc-c

9 files changed, 28 insertions, 52 deletions

diff --git a/moses2/Jamfile b/moses2/Jamfile
index 022d4dcd6..9c1a6840b 100644
--- a/moses2/Jamfile
+++ b/moses2/Jamfile
@@ -9,6 +9,17 @@ else {
   alias cmph ;
 }
 
+if [ xmlrpc ] 
+{
+  echo "BUILDING MOSES2 SERVER!" ;
+  alias mserver2 : [ glob server/*.cpp ] ;
+}
+else 
+{
+  echo "NOT BUILDING MOSES2 SERVER!" ;
+  alias mserver2 ;
+}
+
 max-factors = [ option.get "max-factors" : 4 : 4 ] ;
 max-factors = <define>MAX_NUM_FACTORS=$(max-factors) <dependency>$(FACTOR-LOG) ;
 
@@ -170,25 +181,16 @@ alias deps :  ..//z ..//boost_iostreams ..//boost_filesystem : : : $(max-factors
     SCFG/nbest/NBest.cpp
     SCFG/nbest/NBests.cpp
     SCFG/nbest/NBestColl.cpp
-
-	server/Server.cpp
-	server/Translator.cpp
-	server/TranslationRequest.cpp
 	
     deps 
     cmph
+	mserver2
     :
     $(includes)
     ;
 
 exe moses2 : Main.cpp moses2_lib ../probingpt//probingpt ../util//kenutil ../lm//kenlm ;
 
-if [ xmlrpc ] {
-  echo "Building Moses2" ;
-  alias programs : moses2 ;
-}
-else {
-  echo "Not building Moses2" ;
-  alias programs : ;
-}
+echo "Building Moses2" ;
+alias programs : moses2 ;
 
diff --git a/moses2/Main.cpp b/moses2/Main.cpp
index 07271b175..6fa1f5bd8 100644
--- a/moses2/Main.cpp
+++ b/moses2/Main.cpp
@@ -6,9 +6,9 @@
 #include "Phrase.h"
 #include "TranslationTask.h"
 #include "MemPoolAllocator.h"
-#ifdef HAVE_SERVER
+#ifdef HAVE_XMLRPC_C
     #include "server/Server.h"
-#endif // HAVE_SERVER
+#endif // HAVE_XMLRPC_C
 
 #include "legacy/InputFileStream.h"
 #include "legacy/Parameter.h"
@@ -41,7 +41,6 @@ int main(int argc, char** argv)
   }
 
   //cerr << "system.numThreads=" << system.options.server.numThreads << endl;
-#ifdef HAVE_SERVER
   Moses2::ThreadPool pool(system.options.server.numThreads, system.cpuAffinityOffset, system.cpuAffinityOffsetIncr);
   //cerr << "CREATED POOL" << endl;
 
@@ -53,16 +52,6 @@ int main(int argc, char** argv)
       std::cerr << "RUN BATCH" << std::endl;
       batch_run(params, system, pool);
   }
-#endif // 
-//TODO : WIN32
-#ifndef HAVE_SERVER
-  // TODO :  remove hardcoding for num of threads
-  Moses2::ThreadPool pool(15, system.cpuAffinityOffset, system.cpuAffinityOffsetIncr);
-  //cerr << "CREATED POOL" << endl;
-
-  std::cerr << "RUN BATCH" << std::endl;
-  batch_run(params, system, pool);
-#endif // !HAVE_SERVER
 
   cerr << "Decoding took " << timer.get_elapsed_time() << endl;
   //	cerr << "g_numHypos=" << g_numHypos << endl;
@@ -71,14 +60,17 @@ int main(int argc, char** argv)
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////
-#ifdef HAVE_SERVER
-    void run_as_server(Moses2::System& system)
-    {
-        Moses2::Server server(system.options.server, system);
-        server.run(system); // actually: don't return. see Server::run()
-    }
+void run_as_server(Moses2::System& system)
+{
+#ifdef HAVE_XMLRPC_C
+	Moses2::Server server(system.options.server, system);
+	server.run(system); // actually: don't return. see Server::run()
+#else
+  UTIL_THROW2("Moses2 was compiled without xmlrpc-c. "
+              << "No server functionality available.");
+#endif
+}
 
-#endif // HAVE_SERVER
 ////////////////////////////////////////////////////////////////////////////////////////////////
 istream &GetInputStream(Moses2::Parameter &params)
 {
diff --git a/moses2/parameters/AllOptions.cpp b/moses2/parameters/AllOptions.cpp
index 595f6b415..664b8dc6d 100644
--- a/moses2/parameters/AllOptions.cpp
+++ b/moses2/parameters/AllOptions.cpp
@@ -31,9 +31,7 @@ init(Parameter const& param)
   if (!lmbr.init(param))       return false;
   if (!output.init(param))     return false;
   if (!unk.init(param))        return false;
-#if HAVE_SERVER
   if (!server.init(param))     return false;
-#endif // HAVE_SERVER
   if (!syntax.init(param))     return false;
 
   param.SetParameter(mira, "mira", false);
diff --git a/moses2/parameters/AllOptions.h b/moses2/parameters/AllOptions.h
index 187ddb7bb..2f09cd385 100644
--- a/moses2/parameters/AllOptions.h
+++ b/moses2/parameters/AllOptions.h
@@ -13,9 +13,7 @@
 #include "LMBR_Options.h"
 #include "ReportingOptions.h"
 #include "OOVHandlingOptions.h"
-#ifdef HAVE_SERVER
-    #include "ServerOptions.h"
-#endif // HAVE_SERVER
+#include "ServerOptions.h"
 #include "SyntaxOptions.h"
 
 namespace Moses2
@@ -33,9 +31,7 @@ struct
   LMBR_Options            lmbr;
   ReportingOptions      output;
   OOVHandlingOptions       unk;
-#ifdef HAVE_SERVER
   ServerOptions       server;
-#endif // HAVE_SERVER
   SyntaxOptions         syntax;
   bool mira;
   bool use_legacy_pt;
diff --git a/moses2/parameters/ServerOptions.cpp b/moses2/parameters/ServerOptions.cpp
index c00a43d26..3a21c1891 100644
--- a/moses2/parameters/ServerOptions.cpp
+++ b/moses2/parameters/ServerOptions.cpp
@@ -1,5 +1,4 @@
 // -*- mode: c++; indent-tabs-mode: nil; tab-width: 2 -*-
-#ifdef HAVE_SERVER
 #include <boost/foreach.hpp>
 #include <string>
 #include "../legacy/Parameter.h"
@@ -82,4 +81,3 @@ init(Parameter const& P)
   return true;
 }
 } // namespace Moses
-#endif
diff --git a/moses2/parameters/ServerOptions.h b/moses2/parameters/ServerOptions.h
index 49832abd6..2b67e5156 100644
--- a/moses2/parameters/ServerOptions.h
+++ b/moses2/parameters/ServerOptions.h
@@ -1,13 +1,10 @@
 // -*- mode: c++; indent-tabs-mode: nil; tab-width: 2 -*-
 #pragma once
-#ifdef HAVE_SERVER
 
+#include "../legacy/xmlrpc-c.h"
 #include <string>
 #include <map>
 #include <stdint.h>
-#include <xmlrpc-c/base.hpp>
-#include <xmlrpc-c/registry.hpp>
-#include <xmlrpc-c/server_abyss.hpp>
 
 namespace Moses2
 {
@@ -41,4 +38,3 @@ struct
 };
 
 }
-#endif // HAVE_SERVER
diff --git a/moses2/server/Server.cpp b/moses2/server/Server.cpp
index 66e83e0b7..de3542eb6 100644
--- a/moses2/server/Server.cpp
+++ b/moses2/server/Server.cpp
@@ -4,7 +4,6 @@
  *  Created on: 1 Apr 2016
  *      Author: hieu
  */
-#ifdef HAVE_SERVER
 #include <iostream>
 #include "../System.h"
 #include "Server.h"
@@ -71,4 +70,3 @@ ServerOptions const&Server::options() const
 
 
 } /* namespace Moses2 */
-#endif // HAVE_SERVER
diff --git a/moses2/server/TranslationRequest.cpp b/moses2/server/TranslationRequest.cpp
index 91ae3357f..2d50835a6 100644
--- a/moses2/server/TranslationRequest.cpp
+++ b/moses2/server/TranslationRequest.cpp
@@ -1,4 +1,3 @@
-#ifdef HAVE_SERVER
 #include <boost/foreach.hpp>
 #include "TranslationRequest.h"
 #include "../ManagerBase.h"
@@ -67,4 +66,3 @@ void TranslationRequest::pack_hypothesis(const Manager& manager, Hypothesis cons
 }
 
 }
-#endif // HAVE_SERVER
diff --git a/moses2/server/Translator.cpp b/moses2/server/Translator.cpp
index 9d6dcbc85..6f6212323 100644
--- a/moses2/server/Translator.cpp
+++ b/moses2/server/Translator.cpp
@@ -4,7 +4,6 @@
  *  Created on: 1 Apr 2016
  *      Author: hieu
  */
-#ifdef HAVE_SERVER
 #include <boost/shared_ptr.hpp>
 #include "Translator.h"
 #include "TranslationRequest.h"
@@ -67,4 +66,3 @@ void Translator::execute(xmlrpc_c::paramList const& paramList,
 }
 
 } /* namespace Moses2 */
-#endif // HAVE_SERVER