summaryrefslogtreecommitdiff
path: root/training
diff options
context:
space:
mode:
authorredpony <redpony@ec762483-ff6d-05da-a07a-a48fb63a330f>2010-12-05 01:42:19 +0000
committerredpony <redpony@ec762483-ff6d-05da-a07a-a48fb63a330f>2010-12-05 01:42:19 +0000
commita50b6162b1c5b18473db9de98aa1fa73620b9af9 (patch)
tree5a61803ff88354b341ea5546ab0ef9860ee727f2 /training
parent5694fc704f0c7b040c28f88a034e67a1ed19d3ba (diff)
small changes
git-svn-id: https://ws10smt.googlecode.com/svn/trunk@740 ec762483-ff6d-05da-a07a-a48fb63a330f
Diffstat (limited to 'training')
-rw-r--r--training/Makefile.am9
-rw-r--r--training/mpi_online_optimize.cc11
2 files changed, 10 insertions, 10 deletions
diff --git a/training/Makefile.am b/training/Makefile.am
index 8218ff0a..cb17aeff 100644
--- a/training/Makefile.am
+++ b/training/Makefile.am
@@ -9,8 +9,9 @@ bin_PROGRAMS = \
plftools \
collapse_weights \
cllh_filter_grammar \
- mpi_online_optimize \
- mpi_batch_optimize
+ mpi_online_optimize
+
+# mpi_batch_optimize
noinst_PROGRAMS = \
lbfgs_test \
@@ -21,8 +22,8 @@ TESTS = lbfgs_test optimize_test
mpi_online_optimize_SOURCES = mpi_online_optimize.cc online_optimizer.cc
mpi_online_optimize_LDADD = $(top_srcdir)/decoder/libcdec.a $(top_srcdir)/mteval/libmteval.a $(top_srcdir)/utils/libutils.a ../klm/lm/libklm.a ../klm/util/libklm_util.a -lz
-mpi_batch_optimize_SOURCES = mpi_batch_optimize.cc optimize.cc
-mpi_batch_optimize_LDADD = $(top_srcdir)/decoder/libcdec.a $(top_srcdir)/mteval/libmteval.a $(top_srcdir)/utils/libutils.a ../klm/lm/libklm.a ../klm/util/libklm_util.a -lz
+#mpi_batch_optimize_SOURCES = mpi_batch_optimize.cc optimize.cc
+#mpi_batch_optimize_LDADD = $(top_srcdir)/decoder/libcdec.a $(top_srcdir)/mteval/libmteval.a $(top_srcdir)/utils/libutils.a ../klm/lm/libklm.a ../klm/util/libklm_util.a -lz
if MPI
bin_PROGRAMS += compute_cllh
diff --git a/training/mpi_online_optimize.cc b/training/mpi_online_optimize.cc
index 0f994c59..325ba030 100644
--- a/training/mpi_online_optimize.cc
+++ b/training/mpi_online_optimize.cc
@@ -8,10 +8,6 @@
#include <boost/program_options.hpp>
#include <boost/program_options/variables_map.hpp>
-#ifdef HAVE_MPI
-#include <boost/mpi/timer.hpp>
-#include <boost/mpi.hpp>
-#endif
#include "verbose.h"
#include "hg.h"
@@ -26,6 +22,11 @@
#include "sparse_vector.h"
#include "sampler.h"
+#ifdef HAVE_MPI
+#include <boost/mpi/timer.hpp>
+#include <boost/mpi.hpp>
+namespace mpi = boost::mpi;
+#endif
using namespace std;
namespace po = boost::program_options;
@@ -197,8 +198,6 @@ struct TrainingObserver : public DecoderObserver {
};
#ifdef HAVE_MPI
-namespace mpi = boost::mpi;
-
namespace boost { namespace mpi {
template<>
struct is_commutative<std::plus<SparseVector<double> >, SparseVector<double> >