diff options
author | Hieu Hoang <hieuhoang@gmail.com> | 2016-09-29 12:59:43 +0300 |
---|---|---|
committer | Hieu Hoang <hieuhoang@gmail.com> | 2016-09-29 12:59:43 +0300 |
commit | 7572107753b7a0318f5b85675b334a47caf8a280 (patch) | |
tree | cdb7a30b363eb5a03e352b070933621da321f0d6 | |
parent | 8e619c67fa13de2032d60800905699dc3ad21a01 (diff) |
move Compact pt implementation from legacy -> TranslationModel
-rw-r--r-- | contrib/moses2/FF/LexicalReordering/LexicalReordering.cpp | 2 | ||||
-rw-r--r-- | contrib/moses2/Jamfile | 12 | ||||
-rw-r--r-- | contrib/moses2/TranslationModel/CompactPT/BlockHashIndex.cpp (renamed from contrib/moses2/legacy/CompactPT/BlockHashIndex.cpp) | 0 | ||||
-rw-r--r-- | contrib/moses2/TranslationModel/CompactPT/BlockHashIndex.h (renamed from contrib/moses2/legacy/CompactPT/BlockHashIndex.h) | 2 | ||||
-rw-r--r-- | contrib/moses2/TranslationModel/CompactPT/CanonicalHuffman.h (renamed from contrib/moses2/legacy/CompactPT/CanonicalHuffman.h) | 0 | ||||
-rw-r--r-- | contrib/moses2/TranslationModel/CompactPT/CmphStringVectorAdapter.cpp (renamed from contrib/moses2/legacy/CompactPT/CmphStringVectorAdapter.cpp) | 0 | ||||
-rw-r--r-- | contrib/moses2/TranslationModel/CompactPT/CmphStringVectorAdapter.h (renamed from contrib/moses2/legacy/CompactPT/CmphStringVectorAdapter.h) | 0 | ||||
-rw-r--r-- | contrib/moses2/TranslationModel/CompactPT/LexicalReorderingTableCompact.cpp (renamed from contrib/moses2/legacy/CompactPT/LexicalReorderingTableCompact.cpp) | 2 | ||||
-rw-r--r-- | contrib/moses2/TranslationModel/CompactPT/LexicalReorderingTableCompact.h (renamed from contrib/moses2/legacy/CompactPT/LexicalReorderingTableCompact.h) | 0 | ||||
-rw-r--r-- | contrib/moses2/TranslationModel/CompactPT/ListCoders.h (renamed from contrib/moses2/legacy/CompactPT/ListCoders.h) | 0 | ||||
-rw-r--r-- | contrib/moses2/TranslationModel/CompactPT/MmapAllocator.h (renamed from contrib/moses2/legacy/CompactPT/MmapAllocator.h) | 0 | ||||
-rw-r--r-- | contrib/moses2/TranslationModel/CompactPT/MonotonicVector.h (renamed from contrib/moses2/legacy/CompactPT/MonotonicVector.h) | 0 | ||||
-rw-r--r-- | contrib/moses2/TranslationModel/CompactPT/MurmurHash3.cpp (renamed from contrib/moses2/legacy/CompactPT/MurmurHash3.cpp) | 0 | ||||
-rw-r--r-- | contrib/moses2/TranslationModel/CompactPT/MurmurHash3.h (renamed from contrib/moses2/legacy/CompactPT/MurmurHash3.h) | 0 | ||||
-rw-r--r-- | contrib/moses2/TranslationModel/CompactPT/PackedArray.h (renamed from contrib/moses2/legacy/CompactPT/PackedArray.h) | 0 | ||||
-rw-r--r-- | contrib/moses2/TranslationModel/CompactPT/StringVector.h (renamed from contrib/moses2/legacy/CompactPT/StringVector.h) | 0 | ||||
-rw-r--r-- | contrib/moses2/TranslationModel/CompactPT/ThrowingFwrite.cpp (renamed from contrib/moses2/legacy/CompactPT/ThrowingFwrite.cpp) | 0 | ||||
-rw-r--r-- | contrib/moses2/TranslationModel/CompactPT/ThrowingFwrite.h (renamed from contrib/moses2/legacy/CompactPT/ThrowingFwrite.h) | 0 |
18 files changed, 9 insertions, 9 deletions
diff --git a/contrib/moses2/FF/LexicalReordering/LexicalReordering.cpp b/contrib/moses2/FF/LexicalReordering/LexicalReordering.cpp index 061b29dce..97394ce84 100644 --- a/contrib/moses2/FF/LexicalReordering/LexicalReordering.cpp +++ b/contrib/moses2/FF/LexicalReordering/LexicalReordering.cpp @@ -12,6 +12,7 @@ #include "PhraseBasedReorderingState.h" #include "BidirectionalReorderingState.h" #include "../../TranslationModel/PhraseTable.h" +#include "../../TranslationModel/CompactPT/LexicalReorderingTableCompact.h" #include "../../System.h" #include "../../PhraseBased/PhraseImpl.h" #include "../../PhraseBased/Manager.h" @@ -20,7 +21,6 @@ #include "../../PhraseBased/TargetPhraseImpl.h" #include "../../legacy/InputFileStream.h" #include "../../legacy/Util2.h" -#include "../../legacy/CompactPT/LexicalReorderingTableCompact.h" using namespace std; diff --git a/contrib/moses2/Jamfile b/contrib/moses2/Jamfile index e4346379e..c025d02cf 100644 --- a/contrib/moses2/Jamfile +++ b/contrib/moses2/Jamfile @@ -61,6 +61,12 @@ alias deps : ../..//z ../..//boost_iostreams ../..//boost_filesystem ../../mose TranslationModel/UnknownWordPenalty.cpp TranslationModel/Memory/PhraseTableMemory.cpp + TranslationModel/CompactPT/BlockHashIndex.cpp + TranslationModel/CompactPT/CmphStringVectorAdapter.cpp + TranslationModel/CompactPT/LexicalReorderingTableCompact.cpp + TranslationModel/CompactPT/MurmurHash3.cpp + TranslationModel/CompactPT/ThrowingFwrite.cpp + parameters/AllOptions.cpp parameters/BookkeepingOptions.cpp parameters/ContextParameters.cpp @@ -140,12 +146,6 @@ alias deps : ../..//z ../..//boost_iostreams ../..//boost_filesystem ../../mose legacy/ProbingPT/StoreTarget.cpp legacy/ProbingPT/vocabid.cpp - legacy/CompactPT/BlockHashIndex.cpp - legacy/CompactPT/CmphStringVectorAdapter.cpp - legacy/CompactPT/LexicalReorderingTableCompact.cpp - legacy/CompactPT/MurmurHash3.cpp - legacy/CompactPT/ThrowingFwrite.cpp - SCFG/ActiveChart.cpp SCFG/Hypothesis.cpp SCFG/InputPath.cpp diff --git a/contrib/moses2/legacy/CompactPT/BlockHashIndex.cpp b/contrib/moses2/TranslationModel/CompactPT/BlockHashIndex.cpp index 338a8e221..338a8e221 100644 --- a/contrib/moses2/legacy/CompactPT/BlockHashIndex.cpp +++ b/contrib/moses2/TranslationModel/CompactPT/BlockHashIndex.cpp diff --git a/contrib/moses2/legacy/CompactPT/BlockHashIndex.h b/contrib/moses2/TranslationModel/CompactPT/BlockHashIndex.h index d4f17748d..5706fca09 100644 --- a/contrib/moses2/legacy/CompactPT/BlockHashIndex.h +++ b/contrib/moses2/TranslationModel/CompactPT/BlockHashIndex.h @@ -37,7 +37,7 @@ #include "util/string_stream.hh" #ifdef WITH_THREADS -#include "../ThreadPool.h" +#include "../../legacy/ThreadPool.h" #else #include <ctime> #endif diff --git a/contrib/moses2/legacy/CompactPT/CanonicalHuffman.h b/contrib/moses2/TranslationModel/CompactPT/CanonicalHuffman.h index ffb6488c0..ffb6488c0 100644 --- a/contrib/moses2/legacy/CompactPT/CanonicalHuffman.h +++ b/contrib/moses2/TranslationModel/CompactPT/CanonicalHuffman.h diff --git a/contrib/moses2/legacy/CompactPT/CmphStringVectorAdapter.cpp b/contrib/moses2/TranslationModel/CompactPT/CmphStringVectorAdapter.cpp index a51dc5a45..a51dc5a45 100644 --- a/contrib/moses2/legacy/CompactPT/CmphStringVectorAdapter.cpp +++ b/contrib/moses2/TranslationModel/CompactPT/CmphStringVectorAdapter.cpp diff --git a/contrib/moses2/legacy/CompactPT/CmphStringVectorAdapter.h b/contrib/moses2/TranslationModel/CompactPT/CmphStringVectorAdapter.h index 20d43a80c..20d43a80c 100644 --- a/contrib/moses2/legacy/CompactPT/CmphStringVectorAdapter.h +++ b/contrib/moses2/TranslationModel/CompactPT/CmphStringVectorAdapter.h diff --git a/contrib/moses2/legacy/CompactPT/LexicalReorderingTableCompact.cpp b/contrib/moses2/TranslationModel/CompactPT/LexicalReorderingTableCompact.cpp index 17f68b6d5..1d32b9a6f 100644 --- a/contrib/moses2/legacy/CompactPT/LexicalReorderingTableCompact.cpp +++ b/contrib/moses2/TranslationModel/CompactPT/LexicalReorderingTableCompact.cpp @@ -22,7 +22,7 @@ #include "LexicalReorderingTableCompact.h" #include "../../SubPhrase.h" -#include "../Util2.h" +#include "../../legacy/Util2.h" namespace Moses2 { diff --git a/contrib/moses2/legacy/CompactPT/LexicalReorderingTableCompact.h b/contrib/moses2/TranslationModel/CompactPT/LexicalReorderingTableCompact.h index 90abf4197..90abf4197 100644 --- a/contrib/moses2/legacy/CompactPT/LexicalReorderingTableCompact.h +++ b/contrib/moses2/TranslationModel/CompactPT/LexicalReorderingTableCompact.h diff --git a/contrib/moses2/legacy/CompactPT/ListCoders.h b/contrib/moses2/TranslationModel/CompactPT/ListCoders.h index 5a01274d9..5a01274d9 100644 --- a/contrib/moses2/legacy/CompactPT/ListCoders.h +++ b/contrib/moses2/TranslationModel/CompactPT/ListCoders.h diff --git a/contrib/moses2/legacy/CompactPT/MmapAllocator.h b/contrib/moses2/TranslationModel/CompactPT/MmapAllocator.h index 1e40d8d41..1e40d8d41 100644 --- a/contrib/moses2/legacy/CompactPT/MmapAllocator.h +++ b/contrib/moses2/TranslationModel/CompactPT/MmapAllocator.h diff --git a/contrib/moses2/legacy/CompactPT/MonotonicVector.h b/contrib/moses2/TranslationModel/CompactPT/MonotonicVector.h index 586397db8..586397db8 100644 --- a/contrib/moses2/legacy/CompactPT/MonotonicVector.h +++ b/contrib/moses2/TranslationModel/CompactPT/MonotonicVector.h diff --git a/contrib/moses2/legacy/CompactPT/MurmurHash3.cpp b/contrib/moses2/TranslationModel/CompactPT/MurmurHash3.cpp index c3e567af6..c3e567af6 100644 --- a/contrib/moses2/legacy/CompactPT/MurmurHash3.cpp +++ b/contrib/moses2/TranslationModel/CompactPT/MurmurHash3.cpp diff --git a/contrib/moses2/legacy/CompactPT/MurmurHash3.h b/contrib/moses2/TranslationModel/CompactPT/MurmurHash3.h index f513008cf..f513008cf 100644 --- a/contrib/moses2/legacy/CompactPT/MurmurHash3.h +++ b/contrib/moses2/TranslationModel/CompactPT/MurmurHash3.h diff --git a/contrib/moses2/legacy/CompactPT/PackedArray.h b/contrib/moses2/TranslationModel/CompactPT/PackedArray.h index 409c3cca8..409c3cca8 100644 --- a/contrib/moses2/legacy/CompactPT/PackedArray.h +++ b/contrib/moses2/TranslationModel/CompactPT/PackedArray.h diff --git a/contrib/moses2/legacy/CompactPT/StringVector.h b/contrib/moses2/TranslationModel/CompactPT/StringVector.h index 87d6388bf..87d6388bf 100644 --- a/contrib/moses2/legacy/CompactPT/StringVector.h +++ b/contrib/moses2/TranslationModel/CompactPT/StringVector.h diff --git a/contrib/moses2/legacy/CompactPT/ThrowingFwrite.cpp b/contrib/moses2/TranslationModel/CompactPT/ThrowingFwrite.cpp index d9fec5013..d9fec5013 100644 --- a/contrib/moses2/legacy/CompactPT/ThrowingFwrite.cpp +++ b/contrib/moses2/TranslationModel/CompactPT/ThrowingFwrite.cpp diff --git a/contrib/moses2/legacy/CompactPT/ThrowingFwrite.h b/contrib/moses2/TranslationModel/CompactPT/ThrowingFwrite.h index 2a0c71a27..2a0c71a27 100644 --- a/contrib/moses2/legacy/CompactPT/ThrowingFwrite.h +++ b/contrib/moses2/TranslationModel/CompactPT/ThrowingFwrite.h |