Merge branch 'master' of github.com:moses-smt/mosesdecoder

wuhaiyangit · Feb 4, 2017 · 5ecd52f · 5ecd52f
2 parents 5d1c319 + 1cc7ac7
commit 5ecd52f
Show file tree

Hide file tree

Showing 13 changed files with 33 additions and 1,289 deletions.
diff --git a/contrib/other-builds/moses2/.project b/contrib/other-builds/moses2/.project
@@ -97,6 +97,11 @@
 			<type>1</type>
 			<locationURI>PARENT-3-PROJECT_LOC/moses2/HypothesisColl.h</locationURI>
 		</link>
+		<link>
+			<name>InMemoryTrie</name>
+			<type>2</type>
+			<locationURI>virtual:/virtual</locationURI>
+		</link>
 		<link>
 			<name>InputPathBase.cpp</name>
 			<type>1</type>
@@ -167,11 +172,6 @@
 			<type>1</type>
 			<locationURI>PARENT-3-PROJECT_LOC/moses2/MemPoolAllocator.h</locationURI>
 		</link>
-		<link>
-			<name>MorphoTrie</name>
-			<type>2</type>
-			<locationURI>virtual:/virtual</locationURI>
-		</link>
 		<link>
 			<name>Phrase.cpp</name>
 			<type>1</type>
@@ -477,6 +477,21 @@
 			<type>1</type>
 			<locationURI>PARENT-3-PROJECT_LOC/moses2/FF/WordPenalty.h</locationURI>
 		</link>
+		<link>
+			<name>InMemoryTrie/InMemoryTrie.h</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/moses2/InMemoryTrie/InMemoryTrie.h</locationURI>
+		</link>
+		<link>
+			<name>InMemoryTrie/Node.h</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/moses2/InMemoryTrie/Node.h</locationURI>
+		</link>
+		<link>
+			<name>InMemoryTrie/utils.h</name>
+			<type>1</type>
+			<locationURI>PARENT-3-PROJECT_LOC/moses2/InMemoryTrie/utils.h</locationURI>
+		</link>
 		<link>
 			<name>LM/GPULM.cpp</name>
 			<type>1</type>
@@ -517,31 +532,6 @@
 			<type>1</type>
 			<locationURI>PARENT-3-PROJECT_LOC/moses2/LM/LanguageModel.h</locationURI>
 		</link>
-		<link>
-			<name>LM/LanguageModelDALM.cpp</name>
-			<type>1</type>
-			<locationURI>PARENT-3-PROJECT_LOC/moses2/LM/LanguageModelDALM.cpp</locationURI>
-		</link>
-		<link>
-			<name>LM/LanguageModelDALM.h</name>
-			<type>1</type>
-			<locationURI>PARENT-3-PROJECT_LOC/moses2/LM/LanguageModelDALM.h</locationURI>
-		</link>
-		<link>
-			<name>MorphoTrie/MorphTrie.h</name>
-			<type>1</type>
-			<locationURI>PARENT-3-PROJECT_LOC/moses2/MorphoTrie/MorphTrie.h</locationURI>
-		</link>
-		<link>
-			<name>MorphoTrie/Node.h</name>
-			<type>1</type>
-			<locationURI>PARENT-3-PROJECT_LOC/moses2/MorphoTrie/Node.h</locationURI>
-		</link>
-		<link>
-			<name>MorphoTrie/utils.h</name>
-			<type>1</type>
-			<locationURI>PARENT-3-PROJECT_LOC/moses2/MorphoTrie/utils.h</locationURI>
-		</link>
 		<link>
 			<name>PhraseBased/CubePruningMiniStack</name>
 			<type>2</type>
@@ -1457,26 +1447,6 @@
 			<type>1</type>
 			<locationURI>PARENT-3-PROJECT_LOC/moses2/TranslationModel/CompactPT/PackedArray.h</locationURI>
 		</link>
-		<link>
-			<name>TranslationModel/CompactPT/PhraseDecoder.cpp</name>
-			<type>1</type>
-			<locationURI>PARENT-3-PROJECT_LOC/moses2/TranslationModel/CompactPT/PhraseDecoder.cpp</locationURI>
-		</link>
-		<link>
-			<name>TranslationModel/CompactPT/PhraseDecoder.h</name>
-			<type>1</type>
-			<locationURI>PARENT-3-PROJECT_LOC/moses2/TranslationModel/CompactPT/PhraseDecoder.h</locationURI>
-		</link>
-		<link>
-			<name>TranslationModel/CompactPT/PhraseTableCompact.cpp</name>
-			<type>1</type>
-			<locationURI>PARENT-3-PROJECT_LOC/moses2/TranslationModel/CompactPT/PhraseTableCompact.cpp</locationURI>
-		</link>
-		<link>
-			<name>TranslationModel/CompactPT/PhraseTableCompact.h</name>
-			<type>1</type>
-			<locationURI>PARENT-3-PROJECT_LOC/moses2/TranslationModel/CompactPT/PhraseTableCompact.h</locationURI>
-		</link>
 		<link>
 			<name>TranslationModel/CompactPT/StringVector.h</name>
 			<type>1</type>

diff --git a/moses2/FF/FeatureRegistry.cpp b/moses2/FF/FeatureRegistry.cpp
@@ -1,7 +1,6 @@
 #include "FeatureRegistry.h"
 
 #include "../TranslationModel/Memory/PhraseTableMemory.h"
-#include "../TranslationModel/CompactPT/PhraseTableCompact.h"
 #include "../TranslationModel/ProbingPT/ProbingPT.h"
 #include "../TranslationModel/UnknownWordPenalty.h"
 #include "../TranslationModel/Transliteration.h"
@@ -53,7 +52,6 @@ FeatureRegistry::FeatureRegistry()
   // Feature with different name than class.
 #define MOSES_FNAME2(name, type) Add(name, new DefaultFeatureFactory< type >());
 
-  MOSES_FNAME2("PhraseDictionaryCompact", PhraseTableCompact);
   MOSES_FNAME2("PhraseDictionaryMemory", PhraseTableMemory);
   MOSES_FNAME(ProbingPT);
   MOSES_FNAME2("PhraseDictionaryTransliteration", Transliteration);

diff --git a/moses2/MorphoTrie/MorphTrie.h → moses2/InMemoryTrie/InMemoryTrie.h b/moses2/MorphoTrie/MorphTrie.h → moses2/InMemoryTrie/InMemoryTrie.h
@@ -1,5 +1,4 @@
-#ifndef MORPHTRIE_H_
-#define MORPHTRIE_H_
+#pragma once
 
 #include <vector>
 #include "Node.h"
@@ -8,10 +7,10 @@ namespace Moses2
 {
 
 template<class KeyClass, class ValueClass>
-class MorphTrie
+class InMemoryTrie
 {
 public:
-  MorphTrie() {
+  InMemoryTrie() {
   }
   Node<KeyClass, ValueClass>* insert(const std::vector<KeyClass>& word,
                                      const ValueClass& value);
@@ -26,7 +25,7 @@ class MorphTrie
 };
 
 template<class KeyClass, class ValueClass>
-Node<KeyClass, ValueClass>* MorphTrie<KeyClass, ValueClass>::insert(
+Node<KeyClass, ValueClass>* InMemoryTrie<KeyClass, ValueClass>::insert(
   const std::vector<KeyClass>& word, const ValueClass& value)
 {
   Node<KeyClass, ValueClass>* cNode = &root;
@@ -39,7 +38,7 @@ Node<KeyClass, ValueClass>* MorphTrie<KeyClass, ValueClass>::insert(
 }
 
 template<class KeyClass, class ValueClass>
-const Node<KeyClass, ValueClass>* MorphTrie<KeyClass, ValueClass>::getNode(
+const Node<KeyClass, ValueClass>* InMemoryTrie<KeyClass, ValueClass>::getNode(
   const std::vector<KeyClass>& words) const
 {
   size_t stoppedAtInd;
@@ -51,7 +50,7 @@ const Node<KeyClass, ValueClass>* MorphTrie<KeyClass, ValueClass>::getNode(
 }
 
 template<class KeyClass, class ValueClass>
-const Node<KeyClass, ValueClass> &MorphTrie<KeyClass, ValueClass>::getNode(
+const Node<KeyClass, ValueClass> &InMemoryTrie<KeyClass, ValueClass>::getNode(
   const std::vector<KeyClass>& words, size_t &stoppedAtInd) const
 {
   const Node<KeyClass, ValueClass> *prevNode = &root, *newNode;
@@ -70,7 +69,7 @@ const Node<KeyClass, ValueClass> &MorphTrie<KeyClass, ValueClass>::getNode(
 }
 
 template<class KeyClass, class ValueClass>
-std::vector<const Node<KeyClass, ValueClass>*> MorphTrie<KeyClass, ValueClass>::getNodes(
+std::vector<const Node<KeyClass, ValueClass>*> InMemoryTrie<KeyClass, ValueClass>::getNodes(
   const std::vector<KeyClass>& words, size_t &stoppedAtInd) const
 {
   std::vector<const Node<KeyClass, ValueClass>*> ret;
@@ -95,4 +94,3 @@ std::vector<const Node<KeyClass, ValueClass>*> MorphTrie<KeyClass, ValueClass>::
 
 }
 
-#endif /* end of include guard: MORPHTRIE_H_ */
diff --git a/moses2/MorphoTrie/Node.h → moses2/InMemoryTrie/Node.h b/moses2/MorphoTrie/Node.h → moses2/InMemoryTrie/Node.h
@@ -1,5 +1,4 @@
-#ifndef NODE_H_
-#define NODE_H_
+#pragma once
 
 #include <vector>
 #include <boost/unordered_map.hpp>
@@ -84,4 +83,3 @@ Node<KeyClass, ValueClass>* Node<KeyClass, ValueClass>::findSub(
 
 }
 
-#endif /* end of include guard: NODE_H_ */
diff --git a/moses2/MorphoTrie/utils.h → moses2/InMemoryTrie/utils.h b/moses2/MorphoTrie/utils.h → moses2/InMemoryTrie/utils.h
@@ -1,4 +1,6 @@
-#include "MorphTrie.h"
+#pragma once
+
+#include "InMemoryTrie.h"
 #include <fstream>
 #include <ostream>
 #include <string>

diff --git a/moses2/Jamfile b/moses2/Jamfile
@@ -48,7 +48,6 @@ alias deps :  ..//z ..//boost_iostreams ..//boost_filesystem ../moses/Translatio
     FF/OSM/KenOSM.cpp
     FF/OSM/osmHyp.cpp
 
- #   LM/LanguageModelDALM.cpp
     LM/LanguageModel.cpp
     LM/KENLM.cpp
     LM/KENLMBatch.cpp
@@ -59,12 +58,10 @@ alias deps :  ..//z ..//boost_iostreams ..//boost_filesystem ../moses/Translatio
  	TranslationModel/UnknownWordPenalty.cpp 
     TranslationModel/Memory/PhraseTableMemory.cpp 
 
- 	TranslationModel/CompactPT/PhraseTableCompact.cpp 
     TranslationModel/CompactPT/BlockHashIndex.cpp
     TranslationModel/CompactPT/CmphStringVectorAdapter.cpp
     TranslationModel/CompactPT/LexicalReorderingTableCompact.cpp
     TranslationModel/CompactPT/MurmurHash3.cpp
-    TranslationModel/CompactPT/PhraseDecoder.cpp
     TranslationModel/CompactPT/TargetPhraseCollectionCache.cpp
     TranslationModel/CompactPT/ThrowingFwrite.cpp
 

diff --git a/moses2/LM/LanguageModel.h b/moses2/LM/LanguageModel.h
@@ -9,7 +9,7 @@
 
 #include "../FF/StatefulFeatureFunction.h"
 #include "../TypeDef.h"
-#include "../MorphoTrie/MorphTrie.h"
+#include "../InMemoryTrie/InMemoryTrie.h"
 #include "../legacy/Factor.h"
 #include "../legacy/Util2.h"
 
@@ -74,7 +74,7 @@ class LanguageModel: public StatefulFeatureFunction
   FactorType m_factorType;
   size_t m_order;
 
-  MorphTrie<const Factor*, LMScores> m_root;
+  InMemoryTrie<const Factor*, LMScores> m_root;
   SCORE m_oov;
   const Factor *m_bos;
   const Factor *m_eos;