moses-smt/mosesdecoder
1
1
Fork 0
mirror of https://github.com/moses-smt/mosesdecoder.git synced 2024-12-26 13:23:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed header includes to reflect recent reorganization of the file structure by HH.

Browse Source
This commit is contained in:
Ulrich Germann 2013-10-28 21:59:05 +00:00
parent 480cc683d8
commit cdc8f8f37f
11 changed files with 37 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
moses/TranslationModel/UG/mm/Jamfile
View File

@ -1,36 +1,36 @@
exe mtt-build : exe mtt-build :
mtt-build.cc mtt-build.cc
$(TOP)/moses/generic//generic $(TOP)/moses/TranslationModel/UG/generic//generic
$(TOP)//boost_iostreams $(TOP)//boost_iostreams
$(TOP)//boost_program_options $(TOP)//boost_program_options
$(TOP)/moses/mm//mm $(TOP)/moses/TranslationModel/UG/mm//mm
$(TOP)/util//kenutil $(TOP)/util//kenutil
; ;
exe mtt-dump : exe mtt-dump :
mtt-dump.cc mtt-dump.cc
$(TOP)/moses/generic//generic $(TOP)/moses/TranslationModel/UG/generic//generic
$(TOP)//boost_iostreams $(TOP)//boost_iostreams
$(TOP)//boost_program_options $(TOP)//boost_program_options
$(TOP)/moses/mm//mm $(TOP)/moses/TranslationModel/UG/mm//mm
$(TOP)/util//kenutil $(TOP)/util//kenutil
; ;
exe symal2mam : exe symal2mam :
symal2mam.cc symal2mam.cc
$(TOP)/moses/generic//generic $(TOP)/moses/TranslationModel/UG/generic//generic
$(TOP)//boost_iostreams $(TOP)//boost_iostreams
$(TOP)//boost_program_options $(TOP)//boost_program_options
$(TOP)/moses/mm//mm $(TOP)/moses/TranslationModel/UG/mm//mm
$(TOP)/util//kenutil $(TOP)/util//kenutil
; ;
exe custom-pt : exe custom-pt :
custom-pt.cc custom-pt.cc
$(TOP)/moses/generic//generic #$(TOP)/moses/generic//generic
$(TOP)//boost_iostreams $(TOP)//boost_iostreams
$(TOP)//boost_program_options $(TOP)//boost_program_options
$(TOP)/moses/mm//mm $(TOP)/moses/TranslationModel/UG/mm//mm
$(TOP)/util//kenutil $(TOP)/util//kenutil
; ;

8
moses/TranslationModel/UG/mm/Makefile
View File

@ -28,9 +28,9 @@ MAKEFLAGS += --warn-undefined-variables
HOST ?= $(shell hostname) HOST ?= $(shell hostname)
HOSTTYPE ?= $(shell uname -m) HOSTTYPE ?= $(shell uname -m)
MOSES_ROOT = ${HOME}/code/moses/master/mosesdecoder MOSES_ROOT = ${HOME}/code/mosesdecoder
WDIR = build/${HOSTTYPE}/${OPTI} WDIR = build/${HOSTTYPE}/${OPTI}
VPATH = ${HOME}/code/moses/master/mosesdecoder/ VPATH = ${HOME}/code/mosesdecoder/
CXXFLAGS = ${PROF} -ggdb -Wall -O${OPTI} ${INCLUDES} CXXFLAGS = ${PROF} -ggdb -Wall -O${OPTI} ${INCLUDES}
CXXFLAGS += -DMAX_NUM_FACTORS=4 CXXFLAGS += -DMAX_NUM_FACTORS=4
CXXFLAGS += -DKENLM_MAX_ORDER=5 CXXFLAGS += -DKENLM_MAX_ORDER=5
@ -50,7 +50,7 @@ REQLIBS = m z pthread lzma ${BZLIB} \
# icuuc icuio icui18n \ # icuuc icuio icui18n \
LIBS = $(addprefix -l, ${REQLIBS} moses) LIBS = $(addprefix -l, ${REQLIBS} moses)
LIBDIRS = -L${HOME}/code/moses/master/mosesdecoder/lib LIBDIRS = -L${HOME}/code/mosesdecoder/lib
BINDIR = bin BINDIR = bin
ifeq "$(OPTI)" "0" ifeq "$(OPTI)" "0"
BINPREF = debug. BINPREF = debug.
@ -81,7 +81,7 @@ clean:
custom-pt: ${BINDIR}/${BINPREF}custom-pt custom-pt: ${BINDIR}/${BINPREF}custom-pt
echo $^ 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 %.cc,%.o,$(wildcard $(patsubst %.h,%.cc,$(wildcard *.h))))
OBJ += $(patsubst %.cpp,%.o,${INMOGEN}) OBJ += $(patsubst %.cpp,%.o,${INMOGEN})
EXE = $(patsubst %.cc,%.o,$(filter-out $(patsubst %.h,%.cc,$(wildcard *.h)),$(wildcard *.cc))) EXE = $(patsubst %.cc,%.o,$(filter-out $(patsubst %.h,%.cc,$(wildcard *.h)),$(wildcard *.cc)))

6
moses/TranslationModel/UG/mm/custom-pt.cc
View File

@ -8,9 +8,9 @@
#include <iomanip> #include <iomanip>
#include <algorithm> #include <algorithm>
#include "moses/generic/sorting/VectorIndexSorter.h" #include "moses/TranslationModel/UG/generic/sorting/VectorIndexSorter.h"
#include "moses/generic/sampling/Sampling.h" #include "moses/TranslationModel/UG/generic/sampling/Sampling.h"
#include "moses/generic/file_io/ug_stream.h" #include "moses/TranslationModel/UG/generic/file_io/ug_stream.h"
#include <boost/math/distributions/binomial.hpp> #include <boost/math/distributions/binomial.hpp>
#include <boost/unordered_map.hpp> #include <boost/unordered_map.hpp>

2
moses/TranslationModel/UG/mm/mmlex-build.cc
View File

@ -15,7 +15,7 @@
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <boost/math/distributions/binomial.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_translation_finder.h"
// #include "ug_sorters.h" // #include "ug_sorters.h"
// #include "ug_corpus_sampling.h" // #include "ug_corpus_sampling.h"

9
moses/TranslationModel/UG/mm/mtt-build.cc
View File

@ -25,12 +25,13 @@
#include "ug_mm_ttrack.h" #include "ug_mm_ttrack.h"
#include "tpt_pickler.h" #include "tpt_pickler.h"
#include "ug_deptree.h" #include "ug_deptree.h"
#include "moses/generic/sorting/VectorIndexSorter.h" #include "moses/TranslationModel/UG/generic/sorting/VectorIndexSorter.h"
#include "ug_im_tsa.h" #include "ug_im_tsa.h"
using namespace std; using namespace std;
using namespace ugdiss; using namespace ugdiss;
using namespace Moses; using namespace Moses;
using namespace boost;
namespace po=boost::program_options; namespace po=boost::program_options;
int with_pfas; int with_pfas;
@ -360,10 +361,10 @@ build_mmTSA(string infile, string outfile)
{ {
size_t mypid = fork(); size_t mypid = fork();
if(mypid) return mypid; if(mypid) return mypid;
mmTtrack<Token> T(infile); shared_ptr<mmTtrack<Token> > T(new mmTtrack<Token>(infile));
bdBitset filter; bdBitset filter;
filter.resize(T.size(),true); filter.resize(T->size(),true);
imTSA<Token> S(&T,filter,(quiet?NULL:&cerr)); imTSA<Token> S(T,filter,(quiet?NULL:&cerr));
S.save_as_mm_tsa(outfile); S.save_as_mm_tsa(outfile);
exit(0); exit(0);
} }

8
moses/TranslationModel/UG/mm/mtt.count.cc
View File

@ -11,11 +11,11 @@
#include <iomanip> #include <iomanip>
#include "ug_typedefs.h" #include "ug_typedefs.h"
#include "tpt_pickler.h" #include "tpt_pickler.h"
#include "moses/generic/sorting/VectorIndexSorter.h" #include "moses/TranslationModel/UG/generic/sorting/VectorIndexSorter.h"
#include "moses/generic/sampling/Sampling.h" #include "moses/TranslationModel/UG/generic/sampling/Sampling.h"
#include "moses/generic/file_io/ug_stream.h" #include "moses/TranslationModel/UG/generic/file_io/ug_stream.h"
#include <algorithm> #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 std;
using namespace ugdiss; using namespace ugdiss;

4
moses/TranslationModel/UG/mm/symal2mam.cc
View File

@ -11,8 +11,8 @@
#include "ug_deptree.h" #include "ug_deptree.h"
#include "tpt_tokenindex.h" #include "tpt_tokenindex.h"
#include "tpt_pickler.h" #include "tpt_pickler.h"
#include "moses/generic/program_options/ug_get_options.h" #include "moses/TranslationModel/UG/generic/program_options/ug_get_options.h"
#include "moses/generic/file_io/ug_stream.h" #include "moses/TranslationModel/UG/generic/file_io/ug_stream.h"
#include <iostream> #include <iostream>
#include <string> #include <string>

10
moses/TranslationModel/UG/mm/ug_bitext.h
View File

@ -26,9 +26,9 @@
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <boost/thread.hpp> #include <boost/thread.hpp>
#include "moses/generic/sorting/VectorIndexSorter.h" #include "moses/TranslationModel/UG/generic/sorting/VectorIndexSorter.h"
#include "moses/generic/sampling/Sampling.h" #include "moses/TranslationModel/UG/generic/sampling/Sampling.h"
#include "moses/generic/file_io/ug_stream.h" #include "moses/TranslationModel/UG/generic/file_io/ug_stream.h"
#include "moses/Util.h" #include "moses/Util.h"
#include "util/exception.hh" #include "util/exception.hh"
@ -734,8 +734,8 @@ namespace Moses {
this->V2->open(base+L2+".tdx"); this->V2->iniReverseIndex(); this->V2->open(base+L2+".tdx"); this->V2->iniReverseIndex();
mmTSA<TKN>& i1 = *reinterpret_cast<mmTSA<TKN>*>(this->I1.get()); mmTSA<TKN>& i1 = *reinterpret_cast<mmTSA<TKN>*>(this->I1.get());
mmTSA<TKN>& i2 = *reinterpret_cast<mmTSA<TKN>*>(this->I2.get()); mmTSA<TKN>& i2 = *reinterpret_cast<mmTSA<TKN>*>(this->I2.get());
i1.open(base+L1+".sfa", this->T1.get()); i1.open(base+L1+".sfa", this->T1);
i2.open(base+L2+".sfa", this->T2.get()); i2.open(base+L2+".sfa", this->T2);
assert(this->T1->size() == this->T2->size()); assert(this->T1->size() == this->T2->size());
} }

2
moses/TranslationModel/UG/mm/ug_lexical_phrase_scorer2.h
View File

@ -5,7 +5,7 @@
#ifndef __ug_lexical_phrase_scorer_h #ifndef __ug_lexical_phrase_scorer_h
#define __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 "tpt_tokenindex.h"
#include <string> #include <string>
#include <boost/unordered_map.hpp> #include <boost/unordered_map.hpp>

6
moses/TranslationModel/UG/mm/ug_mmbitext.h
View File

@ -20,9 +20,9 @@
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <boost/thread.hpp> #include <boost/thread.hpp>
#include "moses/generic/sorting/VectorIndexSorter.h" #include "moses/TranslationModel/UG/generic/sorting/VectorIndexSorter.h"
#include "moses/generic/sampling/Sampling.h" #include "moses/TranslationModel/UG/generic/sampling/Sampling.h"
#include "moses/generic/file_io/ug_stream.h" #include "moses/TranslationModel/UG/generic/file_io/ug_stream.h"
#include "ug_typedefs.h" #include "ug_typedefs.h"
#include "ug_mm_ttrack.h" #include "ug_mm_ttrack.h"

2
moses/TranslationModel/UG/mm/ug_tsa_array_entry.cc
View File

@ -1,6 +1,6 @@
#include "ug_tsa_array_entry.h" #include "ug_tsa_array_entry.h"
#include "ug_ttrack_position.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 // (c) 2007-2010 Ulrich Germann