mirror of
https://github.com/moses-smt/mosesdecoder.git
synced 2024-09-11 19:27:11 +03:00
Merge CreateOnDisk into OnDiskPt, pop out of src
This commit is contained in:
parent
ececab6e27
commit
a0d79781e5
@ -1 +0,0 @@
|
||||
exe CreateOnDisk : Main.cpp ../../moses/src//moses ../../OnDiskPt/src//OnDiskPt ;
|
2
Jamroot
2
Jamroot
@ -191,7 +191,7 @@ if [ option.get "git" : : "yes" ] {
|
||||
constant GITTAG : "" ;
|
||||
}
|
||||
|
||||
alias programs : lm//query lm//build_binary moses-chart-cmd/src//moses_chart moses-cmd/src//programs CreateOnDisk/src//CreateOnDisk mert//programs contrib/server//mosesserver misc//programs ;
|
||||
alias programs : lm//query lm//build_binary moses-chart-cmd/src//moses_chart moses-cmd/src//programs OnDiskPt//CreateOnDisk mert//programs contrib/server//mosesserver misc//programs ;
|
||||
|
||||
prefix = [ option.get "prefix" : $(TOP)/dist$(GITTAG) ] ;
|
||||
bindir = [ option.get "bindir" : $(prefix)/bin ] ;
|
||||
|
@ -1 +1,2 @@
|
||||
lib OnDiskPt : OnDiskWrapper.cpp SourcePhrase.cpp TargetPhrase.cpp Word.cpp Phrase.cpp PhraseNode.cpp TargetPhraseCollection.cpp Vocab.cpp ../../moses/src//headers ;
|
||||
lib OnDiskPt : OnDiskWrapper.cpp SourcePhrase.cpp TargetPhrase.cpp Word.cpp Phrase.cpp PhraseNode.cpp TargetPhraseCollection.cpp Vocab.cpp ../moses/src//headers ;
|
||||
exe CreateOnDisk : Main.cpp ../moses/src//moses OnDiskPt ;
|
@ -23,15 +23,15 @@
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <iterator>
|
||||
#include "../../moses/src/InputFileStream.h"
|
||||
#include "../../moses/src/Util.h"
|
||||
#include "../../moses/src/UserMessage.h"
|
||||
#include "../../OnDiskPt/src/OnDiskWrapper.h"
|
||||
#include "../../OnDiskPt/src/SourcePhrase.h"
|
||||
#include "../../OnDiskPt/src/TargetPhrase.h"
|
||||
#include "../../OnDiskPt/src/TargetPhraseCollection.h"
|
||||
#include "../../OnDiskPt/src/Word.h"
|
||||
#include "../../OnDiskPt/src/Vocab.h"
|
||||
#include "../moses/src/InputFileStream.h"
|
||||
#include "../moses/src/Util.h"
|
||||
#include "../moses/src/UserMessage.h"
|
||||
#include "../OnDiskPt/OnDiskWrapper.h"
|
||||
#include "../OnDiskPt/SourcePhrase.h"
|
||||
#include "../OnDiskPt/TargetPhrase.h"
|
||||
#include "../OnDiskPt/TargetPhraseCollection.h"
|
||||
#include "../OnDiskPt/Word.h"
|
||||
#include "../OnDiskPt/Vocab.h"
|
||||
#include "Main.h"
|
||||
|
||||
using namespace std;
|
@ -19,8 +19,8 @@
|
||||
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
***********************************************************************/
|
||||
#include <string>
|
||||
#include "../../OnDiskPt/src/SourcePhrase.h"
|
||||
#include "../../OnDiskPt/src/TargetPhrase.h"
|
||||
#include "../OnDiskPt/SourcePhrase.h"
|
||||
#include "../OnDiskPt/TargetPhrase.h"
|
||||
|
||||
typedef std::pair<size_t, size_t> AlignPair;
|
||||
typedef std::vector<AlignPair> AlignType;
|
@ -22,7 +22,7 @@
|
||||
#include <fstream>
|
||||
#include "Vocab.h"
|
||||
#include "PhraseNode.h"
|
||||
#include "../../moses/src/Word.h"
|
||||
#include "../moses/src/Word.h"
|
||||
|
||||
namespace OnDiskPt
|
||||
{
|
@ -19,7 +19,7 @@
|
||||
***********************************************************************/
|
||||
#include <iostream>
|
||||
#include "util/check.hh"
|
||||
#include "../../moses/src/Util.h"
|
||||
#include "../moses/src/Util.h"
|
||||
#include "Phrase.h"
|
||||
|
||||
using namespace std;
|
@ -22,7 +22,7 @@
|
||||
#include "OnDiskWrapper.h"
|
||||
#include "TargetPhraseCollection.h"
|
||||
#include "SourcePhrase.h"
|
||||
#include "../../moses/src/Util.h"
|
||||
#include "../moses/src/Util.h"
|
||||
|
||||
using namespace std;
|
||||
|
@ -20,10 +20,10 @@
|
||||
|
||||
#include <algorithm>
|
||||
#include <iostream>
|
||||
#include "../../moses/src/Util.h"
|
||||
#include "../../moses/src/TargetPhrase.h"
|
||||
#include "../../moses/src/PhraseDictionary.h"
|
||||
#include "../../moses/src/DummyScoreProducers.h"
|
||||
#include "../moses/src/Util.h"
|
||||
#include "../moses/src/TargetPhrase.h"
|
||||
#include "../moses/src/PhraseDictionary.h"
|
||||
#include "../moses/src/DummyScoreProducers.h"
|
||||
#include "TargetPhrase.h"
|
||||
#include "OnDiskWrapper.h"
|
||||
|
@ -20,9 +20,9 @@
|
||||
|
||||
#include <algorithm>
|
||||
#include <iostream>
|
||||
#include "../../moses/src/Util.h"
|
||||
#include "../../moses/src/TargetPhraseCollection.h"
|
||||
#include "../../moses/src/PhraseDictionary.h"
|
||||
#include "../moses/src/Util.h"
|
||||
#include "../moses/src/TargetPhraseCollection.h"
|
||||
#include "../moses/src/PhraseDictionary.h"
|
||||
#include "TargetPhraseCollection.h"
|
||||
#include "Vocab.h"
|
||||
#include "OnDiskWrapper.h"
|
@ -21,7 +21,7 @@
|
||||
#include <fstream>
|
||||
#include "OnDiskWrapper.h"
|
||||
#include "Vocab.h"
|
||||
#include "../../moses/src/FactorCollection.h"
|
||||
#include "../moses/src/FactorCollection.h"
|
||||
|
||||
using namespace std;
|
||||
|
@ -20,7 +20,7 @@
|
||||
***********************************************************************/
|
||||
#include <string>
|
||||
#include <map>
|
||||
#include "../../moses/src/TypeDef.h"
|
||||
#include "../moses/src/TypeDef.h"
|
||||
|
||||
namespace Moses
|
||||
{
|
@ -18,8 +18,8 @@
|
||||
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
***********************************************************************/
|
||||
|
||||
#include "../../moses/src/Util.h"
|
||||
#include "../../moses/src/Word.h"
|
||||
#include "../moses/src/Util.h"
|
||||
#include "../moses/src/Word.h"
|
||||
#include "Word.h"
|
||||
|
||||
using namespace std;
|
@ -1,3 +1,3 @@
|
||||
exe moses_chart : Main.cpp mbr.cpp IOWrapper.cpp TranslationAnalysis.cpp ../../moses/src//moses ../../OnDiskPt/src//OnDiskPt ;
|
||||
exe moses_chart : Main.cpp mbr.cpp IOWrapper.cpp TranslationAnalysis.cpp ../../moses/src//moses ;
|
||||
|
||||
install legacy-install : moses_chart : <location>. <install-type>EXE <install-dependencies>on <link>shared:<dll-path>$(TOP)/moses-chart-cmd/src <link>shared:<install-type>LIB ;
|
||||
|
@ -1,4 +1,4 @@
|
||||
alias deps : ../../moses/src//moses ../../OnDiskPt/src//OnDiskPt ;
|
||||
alias deps : ../../moses/src//moses ;
|
||||
|
||||
exe moses : Main.cpp mbr.cpp IOWrapper.cpp TranslationAnalysis.cpp LatticeMBR.cpp deps ;
|
||||
exe lmbrgrid : LatticeMBRGrid.cpp LatticeMBR.cpp IOWrapper.cpp deps ;
|
||||
|
@ -25,7 +25,7 @@
|
||||
#include "StaticData.h"
|
||||
#include "DotChartOnDisk.h"
|
||||
#include "ChartTranslationOptionList.h"
|
||||
#include "../../OnDiskPt/src/TargetPhraseCollection.h"
|
||||
#include "../../OnDiskPt/TargetPhraseCollection.h"
|
||||
|
||||
using namespace std;
|
||||
|
||||
|
@ -21,7 +21,7 @@
|
||||
#ifndef moses_ChartRuleLookupManagerOnDisk_h
|
||||
#define moses_ChartRuleLookupManagerOnDisk_h
|
||||
|
||||
#include "../../OnDiskPt/src/OnDiskWrapper.h"
|
||||
#include "../../OnDiskPt/OnDiskWrapper.h"
|
||||
|
||||
#include "ChartRuleLookupManager.h"
|
||||
#include "ChartTranslationOptionList.h"
|
||||
|
@ -20,7 +20,7 @@
|
||||
#include <algorithm>
|
||||
#include "DotChartOnDisk.h"
|
||||
#include "Util.h"
|
||||
#include "../../OnDiskPt/src/PhraseNode.h"
|
||||
#include "../../OnDiskPt/PhraseNode.h"
|
||||
|
||||
using namespace std;
|
||||
|
||||
|
@ -14,4 +14,4 @@ if [ option.get "with-synlm" : no : yes ] = yes
|
||||
lib moses :
|
||||
#All cpp files except those listed
|
||||
[ glob *.cpp DynSAInclude/*.cpp : ThreadPool.cpp SyntacticLanguageModel.cpp ]
|
||||
synlm ThreadPool LM//LM headers ../..//z ../../OnDiskPt/src//OnDiskPt ;
|
||||
synlm ThreadPool LM//LM headers ../..//z ../../OnDiskPt//OnDiskPt ;
|
||||
|
@ -25,9 +25,9 @@
|
||||
#include <vector>
|
||||
#include <string>
|
||||
#include "PhraseDictionary.h"
|
||||
#include "../../OnDiskPt/src/OnDiskWrapper.h"
|
||||
#include "../../OnDiskPt/src/Word.h"
|
||||
#include "../../OnDiskPt/src/PhraseNode.h"
|
||||
#include "../../OnDiskPt/OnDiskWrapper.h"
|
||||
#include "../../OnDiskPt/Word.h"
|
||||
#include "../../OnDiskPt/PhraseNode.h"
|
||||
|
||||
namespace Moses
|
||||
{
|
||||
|
@ -30,13 +30,13 @@ wmt10-data = $working-dir/data
|
||||
### basic tools
|
||||
#
|
||||
# moses decoder
|
||||
decoder = $moses-src-dir/moses-cmd/src/moses
|
||||
decoder = $moses-src-dir/dist/bin/moses
|
||||
|
||||
# conversion of phrase table into binary on-disk format
|
||||
ttable-binarizer = $moses-src-dir/misc/processPhraseTable
|
||||
ttable-binarizer = $moses-src-dir/dist/bin/processPhraseTable
|
||||
|
||||
# conversion of rule table into binary on-disk format
|
||||
#ttable-binarizer = "$moses-src-dir/CreateOnDisk/src/CreateOnDiskPt 1 1 5 100 2"
|
||||
#ttable-binarizer = "$moses-src-dir/dist/bin/CreateOnDiskPt 1 1 5 100 2"
|
||||
|
||||
# tokenizers - comment out if all your data is already tokenized
|
||||
input-tokenizer = "$moses-script-dir/tokenizer/tokenizer.perl -a -l $input-extension"
|
||||
|
@ -30,13 +30,13 @@ wmt10-data = $working-dir/data
|
||||
### basic tools
|
||||
#
|
||||
# moses decoder
|
||||
decoder = $moses-src-dir/moses-cmd/src/moses
|
||||
decoder = $moses-src-dir/dist/bin/moses
|
||||
|
||||
# conversion of phrase table into binary on-disk format
|
||||
ttable-binarizer = $moses-src-dir/misc/processPhraseTable
|
||||
|
||||
# conversion of rule table into binary on-disk format
|
||||
#ttable-binarizer = "$moses-src-dir/CreateOnDisk/src/CreateOnDiskPt 1 1 5 100 2"
|
||||
#ttable-binarizer = "$moses-src-dir/dist/bin/CreateOnDiskPt 1 1 5 100 2"
|
||||
|
||||
# tokenizers - comment out if all your data is already tokenized
|
||||
input-tokenizer = "$moses-script-dir/tokenizer/tokenizer.perl -a -l $input-extension"
|
||||
|
@ -30,13 +30,13 @@ wmt10-data = $working-dir/data
|
||||
### basic tools
|
||||
#
|
||||
# moses decoder
|
||||
decoder = $moses-src-dir/moses-chart-cmd/src/moses_chart
|
||||
decoder = $moses-src-dir/dist/bin/moses_chart
|
||||
|
||||
# conversion of phrase table into binary on-disk format
|
||||
#ttable-binarizer = $moses-src-dir/misc/processPhraseTable
|
||||
#ttable-binarizer = $moses-src-dir/dist/bin/processPhraseTable
|
||||
|
||||
# conversion of rule table into binary on-disk format
|
||||
ttable-binarizer = "$moses-src-dir/CreateOnDisk/src/CreateOnDiskPt 1 1 5 100 2"
|
||||
ttable-binarizer = "$moses-src-dir/dist/bin/CreateOnDiskPt 1 1 5 100 2"
|
||||
|
||||
# tokenizers - comment out if all your data is already tokenized
|
||||
input-tokenizer = "$moses-script-dir/tokenizer/tokenizer.perl -a -l $input-extension"
|
||||
|
@ -30,13 +30,13 @@ wmt10-data = $working-dir/data
|
||||
### basic tools
|
||||
#
|
||||
# moses decoder
|
||||
decoder = $moses-src-dir/moses-chart-cmd/src/moses_chart
|
||||
decoder = $moses-src-dir/dist/bin/moses_chart
|
||||
|
||||
# conversion of phrase table into binary on-disk format
|
||||
#ttable-binarizer = $moses-src-dir/misc/processPhraseTable
|
||||
#ttable-binarizer = $moses-src-dir/dist/bin/processPhraseTable
|
||||
|
||||
# conversion of rule table into binary on-disk format
|
||||
ttable-binarizer = "$moses-src-dir/CreateOnDisk/src/CreateOnDiskPt 1 1 5 100 2"
|
||||
ttable-binarizer = "$moses-src-dir/dist/bin/CreateOnDiskPt 1 1 5 100 2"
|
||||
|
||||
# tokenizers - comment out if all your data is already tokenized
|
||||
input-tokenizer = "$moses-script-dir/tokenizer/tokenizer.perl -a -l $input-extension"
|
||||
|
@ -30,13 +30,13 @@ toy-data = $moses-script-dir/ems/example/data
|
||||
### basic tools
|
||||
#
|
||||
# moses decoder
|
||||
decoder = $moses-src-dir/moses-cmd/src/moses
|
||||
decoder = $moses-src-dir/dist/bin/moses
|
||||
|
||||
# conversion of phrase table into binary on-disk format
|
||||
ttable-binarizer = $moses-src-dir/misc/processPhraseTable
|
||||
ttable-binarizer = $moses-src-dir/dist/bin/processPhraseTable
|
||||
|
||||
# conversion of rule table into binary on-disk format
|
||||
#ttable-binarizer = "$moses-src-dir/CreateOnDisk/src/CreateOnDiskPt 1 1 5 100 2"
|
||||
#ttable-binarizer = "$moses-src-dir/dist/bin/CreateOnDiskPt 1 1 5 100 2"
|
||||
|
||||
# tokenizers - comment out if all your data is already tokenized
|
||||
input-tokenizer = "$moses-script-dir/tokenizer/tokenizer.perl -a -l $input-extension"
|
||||
|
Loading…
Reference in New Issue
Block a user