mirror of
https://github.com/moses-smt/mosesdecoder.git
synced 2024-12-26 05:14:36 +03:00
Fixed header includes to reflect recent reorganization of the file structure by HH.
This commit is contained in:
parent
480cc683d8
commit
cdc8f8f37f
@ -1,36 +1,36 @@
|
||||
exe mtt-build :
|
||||
mtt-build.cc
|
||||
$(TOP)/moses/generic//generic
|
||||
$(TOP)/moses/TranslationModel/UG/generic//generic
|
||||
$(TOP)//boost_iostreams
|
||||
$(TOP)//boost_program_options
|
||||
$(TOP)/moses/mm//mm
|
||||
$(TOP)/moses/TranslationModel/UG/mm//mm
|
||||
$(TOP)/util//kenutil
|
||||
;
|
||||
|
||||
exe mtt-dump :
|
||||
mtt-dump.cc
|
||||
$(TOP)/moses/generic//generic
|
||||
$(TOP)/moses/TranslationModel/UG/generic//generic
|
||||
$(TOP)//boost_iostreams
|
||||
$(TOP)//boost_program_options
|
||||
$(TOP)/moses/mm//mm
|
||||
$(TOP)/moses/TranslationModel/UG/mm//mm
|
||||
$(TOP)/util//kenutil
|
||||
;
|
||||
|
||||
exe symal2mam :
|
||||
symal2mam.cc
|
||||
$(TOP)/moses/generic//generic
|
||||
$(TOP)/moses/TranslationModel/UG/generic//generic
|
||||
$(TOP)//boost_iostreams
|
||||
$(TOP)//boost_program_options
|
||||
$(TOP)/moses/mm//mm
|
||||
$(TOP)/moses/TranslationModel/UG/mm//mm
|
||||
$(TOP)/util//kenutil
|
||||
;
|
||||
|
||||
exe custom-pt :
|
||||
custom-pt.cc
|
||||
$(TOP)/moses/generic//generic
|
||||
#$(TOP)/moses/generic//generic
|
||||
$(TOP)//boost_iostreams
|
||||
$(TOP)//boost_program_options
|
||||
$(TOP)/moses/mm//mm
|
||||
$(TOP)/moses/TranslationModel/UG/mm//mm
|
||||
$(TOP)/util//kenutil
|
||||
;
|
||||
|
||||
|
@ -28,9 +28,9 @@ MAKEFLAGS += --warn-undefined-variables
|
||||
HOST ?= $(shell hostname)
|
||||
HOSTTYPE ?= $(shell uname -m)
|
||||
|
||||
MOSES_ROOT = ${HOME}/code/moses/master/mosesdecoder
|
||||
MOSES_ROOT = ${HOME}/code/mosesdecoder
|
||||
WDIR = build/${HOSTTYPE}/${OPTI}
|
||||
VPATH = ${HOME}/code/moses/master/mosesdecoder/
|
||||
VPATH = ${HOME}/code/mosesdecoder/
|
||||
CXXFLAGS = ${PROF} -ggdb -Wall -O${OPTI} ${INCLUDES}
|
||||
CXXFLAGS += -DMAX_NUM_FACTORS=4
|
||||
CXXFLAGS += -DKENLM_MAX_ORDER=5
|
||||
@ -50,7 +50,7 @@ REQLIBS = m z pthread lzma ${BZLIB} \
|
||||
# icuuc icuio icui18n \
|
||||
|
||||
LIBS = $(addprefix -l, ${REQLIBS} moses)
|
||||
LIBDIRS = -L${HOME}/code/moses/master/mosesdecoder/lib
|
||||
LIBDIRS = -L${HOME}/code/mosesdecoder/lib
|
||||
BINDIR = bin
|
||||
ifeq "$(OPTI)" "0"
|
||||
BINPREF = debug.
|
||||
@ -81,7 +81,7 @@ clean:
|
||||
custom-pt: ${BINDIR}/${BINPREF}custom-pt
|
||||
echo $^
|
||||
|
||||
INMOGEN = $(wildcard ${MOSES_ROOT}/moses/generic/*/*.cpp)
|
||||
INMOGEN = $(wildcard ${MOSES_ROOT}/moses/TranslationModel/UG/generic/*/*.cpp)
|
||||
OBJ = $(patsubst %.cc,%.o,$(wildcard $(patsubst %.h,%.cc,$(wildcard *.h))))
|
||||
OBJ += $(patsubst %.cpp,%.o,${INMOGEN})
|
||||
EXE = $(patsubst %.cc,%.o,$(filter-out $(patsubst %.h,%.cc,$(wildcard *.h)),$(wildcard *.cc)))
|
||||
|
@ -8,9 +8,9 @@
|
||||
#include <iomanip>
|
||||
#include <algorithm>
|
||||
|
||||
#include "moses/generic/sorting/VectorIndexSorter.h"
|
||||
#include "moses/generic/sampling/Sampling.h"
|
||||
#include "moses/generic/file_io/ug_stream.h"
|
||||
#include "moses/TranslationModel/UG/generic/sorting/VectorIndexSorter.h"
|
||||
#include "moses/TranslationModel/UG/generic/sampling/Sampling.h"
|
||||
#include "moses/TranslationModel/UG/generic/file_io/ug_stream.h"
|
||||
|
||||
#include <boost/math/distributions/binomial.hpp>
|
||||
#include <boost/unordered_map.hpp>
|
||||
|
@ -15,7 +15,7 @@
|
||||
#include <boost/foreach.hpp>
|
||||
#include <boost/math/distributions/binomial.hpp>
|
||||
|
||||
#include "moses/generic/program_options/ug_get_options.h"
|
||||
#include "moses/TranslationModel/UG/generic/program_options/ug_get_options.h"
|
||||
// #include "ug_translation_finder.h"
|
||||
// #include "ug_sorters.h"
|
||||
// #include "ug_corpus_sampling.h"
|
||||
|
@ -25,12 +25,13 @@
|
||||
#include "ug_mm_ttrack.h"
|
||||
#include "tpt_pickler.h"
|
||||
#include "ug_deptree.h"
|
||||
#include "moses/generic/sorting/VectorIndexSorter.h"
|
||||
#include "moses/TranslationModel/UG/generic/sorting/VectorIndexSorter.h"
|
||||
#include "ug_im_tsa.h"
|
||||
|
||||
using namespace std;
|
||||
using namespace ugdiss;
|
||||
using namespace Moses;
|
||||
using namespace boost;
|
||||
namespace po=boost::program_options;
|
||||
|
||||
int with_pfas;
|
||||
@ -360,10 +361,10 @@ build_mmTSA(string infile, string outfile)
|
||||
{
|
||||
size_t mypid = fork();
|
||||
if(mypid) return mypid;
|
||||
mmTtrack<Token> T(infile);
|
||||
shared_ptr<mmTtrack<Token> > T(new mmTtrack<Token>(infile));
|
||||
bdBitset filter;
|
||||
filter.resize(T.size(),true);
|
||||
imTSA<Token> S(&T,filter,(quiet?NULL:&cerr));
|
||||
filter.resize(T->size(),true);
|
||||
imTSA<Token> S(T,filter,(quiet?NULL:&cerr));
|
||||
S.save_as_mm_tsa(outfile);
|
||||
exit(0);
|
||||
}
|
||||
|
@ -11,11 +11,11 @@
|
||||
#include <iomanip>
|
||||
#include "ug_typedefs.h"
|
||||
#include "tpt_pickler.h"
|
||||
#include "moses/generic/sorting/VectorIndexSorter.h"
|
||||
#include "moses/generic/sampling/Sampling.h"
|
||||
#include "moses/generic/file_io/ug_stream.h"
|
||||
#include "moses/TranslationModel/UG/generic/sorting/VectorIndexSorter.h"
|
||||
#include "moses/TranslationModel/UG/generic/sampling/Sampling.h"
|
||||
#include "moses/TranslationModel/UG/generic/file_io/ug_stream.h"
|
||||
#include <algorithm>
|
||||
#include "moses/generic/program_options/ug_get_options.h"
|
||||
#include "moses/TranslationModel/UG/generic/program_options/ug_get_options.h"
|
||||
|
||||
using namespace std;
|
||||
using namespace ugdiss;
|
||||
|
@ -11,8 +11,8 @@
|
||||
#include "ug_deptree.h"
|
||||
#include "tpt_tokenindex.h"
|
||||
#include "tpt_pickler.h"
|
||||
#include "moses/generic/program_options/ug_get_options.h"
|
||||
#include "moses/generic/file_io/ug_stream.h"
|
||||
#include "moses/TranslationModel/UG/generic/program_options/ug_get_options.h"
|
||||
#include "moses/TranslationModel/UG/generic/file_io/ug_stream.h"
|
||||
|
||||
#include <iostream>
|
||||
#include <string>
|
||||
|
@ -26,9 +26,9 @@
|
||||
#include <boost/foreach.hpp>
|
||||
#include <boost/thread.hpp>
|
||||
|
||||
#include "moses/generic/sorting/VectorIndexSorter.h"
|
||||
#include "moses/generic/sampling/Sampling.h"
|
||||
#include "moses/generic/file_io/ug_stream.h"
|
||||
#include "moses/TranslationModel/UG/generic/sorting/VectorIndexSorter.h"
|
||||
#include "moses/TranslationModel/UG/generic/sampling/Sampling.h"
|
||||
#include "moses/TranslationModel/UG/generic/file_io/ug_stream.h"
|
||||
#include "moses/Util.h"
|
||||
|
||||
#include "util/exception.hh"
|
||||
@ -734,8 +734,8 @@ namespace Moses {
|
||||
this->V2->open(base+L2+".tdx"); this->V2->iniReverseIndex();
|
||||
mmTSA<TKN>& i1 = *reinterpret_cast<mmTSA<TKN>*>(this->I1.get());
|
||||
mmTSA<TKN>& i2 = *reinterpret_cast<mmTSA<TKN>*>(this->I2.get());
|
||||
i1.open(base+L1+".sfa", this->T1.get());
|
||||
i2.open(base+L2+".sfa", this->T2.get());
|
||||
i1.open(base+L1+".sfa", this->T1);
|
||||
i2.open(base+L2+".sfa", this->T2);
|
||||
assert(this->T1->size() == this->T2->size());
|
||||
}
|
||||
|
||||
|
@ -5,7 +5,7 @@
|
||||
#ifndef __ug_lexical_phrase_scorer_h
|
||||
#define __ug_lexical_phrase_scorer_h
|
||||
|
||||
#include "moses/generic/file_io/ug_stream.h"
|
||||
#include "moses/TranslationModel/UG/generic/file_io/ug_stream.h"
|
||||
#include "tpt_tokenindex.h"
|
||||
#include <string>
|
||||
#include <boost/unordered_map.hpp>
|
||||
|
@ -20,9 +20,9 @@
|
||||
#include <boost/foreach.hpp>
|
||||
#include <boost/thread.hpp>
|
||||
|
||||
#include "moses/generic/sorting/VectorIndexSorter.h"
|
||||
#include "moses/generic/sampling/Sampling.h"
|
||||
#include "moses/generic/file_io/ug_stream.h"
|
||||
#include "moses/TranslationModel/UG/generic/sorting/VectorIndexSorter.h"
|
||||
#include "moses/TranslationModel/UG/generic/sampling/Sampling.h"
|
||||
#include "moses/TranslationModel/UG/generic/file_io/ug_stream.h"
|
||||
|
||||
#include "ug_typedefs.h"
|
||||
#include "ug_mm_ttrack.h"
|
||||
|
@ -1,6 +1,6 @@
|
||||
#include "ug_tsa_array_entry.h"
|
||||
#include "ug_ttrack_position.h"
|
||||
#include "moses/generic/sampling/Sampling.h"
|
||||
#include "moses/TranslationModel/UG/generic/sampling/Sampling.h"
|
||||
|
||||
// (c) 2007-2010 Ulrich Germann
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user