Merge branch 'perf_moses2' of github.com:hieuhoang/mosesdecoder into perf_moses2

41 files changed, 141 insertions, 36 deletions

diff --git a/contrib/moses2/CreateProbingPT2.cpp b/contrib/moses2/CreateProbingPT2.cpp
index ed7af3bd9..24b0e2fd1 100644
--- a/contrib/moses2/CreateProbingPT2.cpp
+++ b/contrib/moses2/CreateProbingPT2.cpp
@@ -1,7 +1,7 @@
 #include <string>
 #include <boost/program_options.hpp>
 #include "util/usage.hh"
-#include "legacy/ProbingPT/storing.hh"
+#include "TranslationModel/ProbingPT/storing.hh"
 #include "legacy/InputFileStream.h"
 #include "legacy/OutputFileStream.h"
 #include "legacy/Util2.h"
diff --git a/contrib/moses2/FF/FeatureRegistry.cpp b/contrib/moses2/FF/FeatureRegistry.cpp
index b040eb8a1..ec3cffede 100644
--- a/contrib/moses2/FF/FeatureRegistry.cpp
+++ b/contrib/moses2/FF/FeatureRegistry.cpp
@@ -1,6 +1,7 @@
 #include "FeatureRegistry.h"
 
 #include "../TranslationModel/Memory/PhraseTableMemory.h"
+#include "../TranslationModel/PhraseTableCompact.h"
 #include "../TranslationModel/ProbingPT.h"
 #include "../TranslationModel/UnknownWordPenalty.h"
 #include "../TranslationModel/Transliteration.h"
@@ -51,6 +52,7 @@ 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/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 ed74865ee..f793d3b3f 100644
--- a/contrib/moses2/Jamfile
+++ b/contrib/moses2/Jamfile
@@ -54,12 +54,28 @@ alias deps :  ../..//z ../..//boost_iostreams ../..//boost_filesystem ../../mose
     LM/KENLMBatch.cpp
     LM/GPULM.cpp
     
- 	 	TranslationModel/PhraseTable.cpp 
- 	 	TranslationModel/ProbingPT.cpp 
- 	 	TranslationModel/Transliteration.cpp 
- 	 	TranslationModel/UnknownWordPenalty.cpp 
+ 	TranslationModel/PhraseTable.cpp 
+ 	TranslationModel/PhraseTableCompact.cpp 
+ 	TranslationModel/ProbingPT.cpp 
+ 	TranslationModel/Transliteration.cpp 
+ 	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
+
+    TranslationModel/ProbingPT/hash.cpp
+    TranslationModel/ProbingPT/line_splitter.cpp
+    TranslationModel/ProbingPT/probing_hash_utils.cpp
+    TranslationModel/ProbingPT/quering.cpp
+    TranslationModel/ProbingPT/storing.cpp
+    TranslationModel/ProbingPT/StoreVocab.cpp
+    TranslationModel/ProbingPT/StoreTarget.cpp
+    TranslationModel/ProbingPT/vocabid.cpp
+
    	parameters/AllOptions.cpp
    	parameters/BookkeepingOptions.cpp
    	parameters/ContextParameters.cpp
@@ -130,21 +146,6 @@ alias deps :  ../..//z ../..//boost_iostreams ../..//boost_filesystem ../../mose
 		legacy/Timer.cpp
 		legacy/Util2.cpp
 
-    legacy/ProbingPT/hash.cpp
-    legacy/ProbingPT/line_splitter.cpp
-    legacy/ProbingPT/probing_hash_utils.cpp
-    legacy/ProbingPT/quering.cpp
-    legacy/ProbingPT/storing.cpp
-    legacy/ProbingPT/StoreVocab.cpp
-    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/PhraseBased/Sentence.cpp b/contrib/moses2/PhraseBased/Sentence.cpp
index 2021da7d7..d0c728530 100644
--- a/contrib/moses2/PhraseBased/Sentence.cpp
+++ b/contrib/moses2/PhraseBased/Sentence.cpp
@@ -51,7 +51,7 @@ Sentence *Sentence::CreateFromStringXML(MemPool &pool, FactorCollection &vocab,
 
     string str2 = "<xml>" + str + "</xml>";
     pugi::xml_parse_result result = doc.load(str2.c_str(),
-                                    pugi::parse_default | pugi::parse_comments);
+                                    pugi::parse_cdata | pugi::parse_wconv_attribute | pugi::parse_eol | pugi::parse_comments);
     pugi::xml_node topNode = doc.child("xml");
 
     std::vector<std::string> toks;
diff --git a/contrib/moses2/SCFG/Sentence.cpp b/contrib/moses2/SCFG/Sentence.cpp
index b900e6fbe..5e69a7e23 100644
--- a/contrib/moses2/SCFG/Sentence.cpp
+++ b/contrib/moses2/SCFG/Sentence.cpp
@@ -48,7 +48,7 @@ Sentence *Sentence::CreateFromStringXML(MemPool &pool, FactorCollection &vocab,
 
     string str2 = "<xml>" + str + "</xml>";
     pugi::xml_parse_result result = doc.load(str2.c_str(),
-                                    pugi::parse_default | pugi::parse_comments);
+                                      pugi::parse_cdata | pugi::parse_wconv_attribute | pugi::parse_eol | pugi::parse_comments);
     pugi::xml_node topNode = doc.child("xml");
 
     std::vector<std::string> toks;
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
diff --git a/contrib/moses2/TranslationModel/PhraseTableCompact.cpp b/contrib/moses2/TranslationModel/PhraseTableCompact.cpp
new file mode 100644
index 000000000..b7cadb9b1
--- /dev/null
+++ b/contrib/moses2/TranslationModel/PhraseTableCompact.cpp
@@ -0,0 +1,62 @@
+#include "PhraseTableCompact.h"
+
+namespace Moses2
+{
+PhraseTableCompact::PhraseTableCompact(size_t startInd, const std::string &line)
+:PhraseTable(startInd, line)
+{
+  ReadParameters();
+}
+
+PhraseTableCompact::~PhraseTableCompact()
+{
+
+}
+
+void PhraseTableCompact::Load(System &system)
+{
+
+}
+
+void PhraseTableCompact::SetParameter(const std::string& key, const std::string& value)
+{
+  if (key == "blah") {
+
+  }
+  else {
+    PhraseTable::SetParameter(key, value);
+  }
+}
+
+// scfg
+void PhraseTableCompact::InitActiveChart(
+    MemPool &pool,
+    const SCFG::Manager &mgr,
+    SCFG::InputPath &path) const
+{
+  UTIL_THROW2("Not implemented");
+}
+
+void PhraseTableCompact::Lookup(
+    MemPool &pool,
+    const SCFG::Manager &mgr,
+    size_t maxChartSpan,
+    const SCFG::Stacks &stacks,
+    SCFG::InputPath &path) const
+{
+  UTIL_THROW2("Not implemented");
+}
+
+void PhraseTableCompact::LookupGivenNode(
+    MemPool &pool,
+    const SCFG::Manager &mgr,
+    const SCFG::ActiveChartEntry &prevEntry,
+    const SCFG::Word &wordSought,
+    const Moses2::Hypotheses *hypos,
+    const Moses2::Range &subPhraseRange,
+    SCFG::InputPath &outPath) const
+{
+  UTIL_THROW2("Not implemented");
+}
+
+}
diff --git a/contrib/moses2/TranslationModel/PhraseTableCompact.h b/contrib/moses2/TranslationModel/PhraseTableCompact.h
new file mode 100644
index 000000000..2333c6eec
--- /dev/null
+++ b/contrib/moses2/TranslationModel/PhraseTableCompact.h
@@ -0,0 +1,40 @@
+#pragma once
+#include "PhraseTable.h"
+
+namespace Moses2
+{
+class PhraseTableCompact: public PhraseTable
+{
+public:
+  PhraseTableCompact(size_t startInd, const std::string &line);
+  virtual ~PhraseTableCompact();
+  void Load(System &system);
+  virtual void SetParameter(const std::string& key, const std::string& value);
+
+
+  // scfg
+  virtual void InitActiveChart(
+      MemPool &pool,
+      const SCFG::Manager &mgr,
+      SCFG::InputPath &path) const;
+
+  virtual void Lookup(
+      MemPool &pool,
+      const SCFG::Manager &mgr,
+      size_t maxChartSpan,
+      const SCFG::Stacks &stacks,
+      SCFG::InputPath &path) const;
+
+protected:
+  virtual void LookupGivenNode(
+      MemPool &pool,
+      const SCFG::Manager &mgr,
+      const SCFG::ActiveChartEntry &prevEntry,
+      const SCFG::Word &wordSought,
+      const Moses2::Hypotheses *hypos,
+      const Moses2::Range &subPhraseRange,
+      SCFG::InputPath &outPath) const;
+
+};
+
+}
diff --git a/contrib/moses2/TranslationModel/ProbingPT.cpp b/contrib/moses2/TranslationModel/ProbingPT.cpp
index de95e0e6e..0567e1ac1 100644
--- a/contrib/moses2/TranslationModel/ProbingPT.cpp
+++ b/contrib/moses2/TranslationModel/ProbingPT.cpp
@@ -12,9 +12,9 @@
 #include "../Phrase.h"
 #include "../legacy/InputFileStream.h"
 #include "../legacy/FactorCollection.h"
-#include "../legacy/ProbingPT/quering.hh"
 #include "../legacy/Util2.h"
-#include "../legacy/ProbingPT/probing_hash_utils.hh"
+#include "ProbingPT/quering.hh"
+#include "ProbingPT/probing_hash_utils.hh"
 #include "../FF/FeatureFunctions.h"
 #include "../PhraseBased/PhraseImpl.h"
 #include "../PhraseBased/TargetPhraseImpl.h"
diff --git a/contrib/moses2/legacy/ProbingPT/StoreTarget.cpp b/contrib/moses2/TranslationModel/ProbingPT/StoreTarget.cpp
index d53b51d8a..326aaea5f 100644
--- a/contrib/moses2/legacy/ProbingPT/StoreTarget.cpp
+++ b/contrib/moses2/TranslationModel/ProbingPT/StoreTarget.cpp
@@ -8,8 +8,8 @@
 #include "StoreTarget.h"
 #include "line_splitter.hh"
 #include "probing_hash_utils.hh"
-#include "../OutputFileStream.h"
-#include "../Util2.h"
+#include "../../legacy/OutputFileStream.h"
+#include "../../legacy/Util2.h"
 
 using namespace std;
 
diff --git a/contrib/moses2/legacy/ProbingPT/StoreTarget.h b/contrib/moses2/TranslationModel/ProbingPT/StoreTarget.h
index 6fc3b1f66..6fc3b1f66 100644
--- a/contrib/moses2/legacy/ProbingPT/StoreTarget.h
+++ b/contrib/moses2/TranslationModel/ProbingPT/StoreTarget.h
diff --git a/contrib/moses2/legacy/ProbingPT/StoreVocab.cpp b/contrib/moses2/TranslationModel/ProbingPT/StoreVocab.cpp
index e0b5b0b08..e0b5b0b08 100644
--- a/contrib/moses2/legacy/ProbingPT/StoreVocab.cpp
+++ b/contrib/moses2/TranslationModel/ProbingPT/StoreVocab.cpp
diff --git a/contrib/moses2/legacy/ProbingPT/StoreVocab.h b/contrib/moses2/TranslationModel/ProbingPT/StoreVocab.h
index 1fba50674..e9808707a 100644
--- a/contrib/moses2/legacy/ProbingPT/StoreVocab.h
+++ b/contrib/moses2/TranslationModel/ProbingPT/StoreVocab.h
@@ -7,8 +7,8 @@
 #pragma once
 #include <string>
 #include <boost/unordered_map.hpp>
-#include "../OutputFileStream.h"
-#include "../Util2.h"
+#include "../../legacy/OutputFileStream.h"
+#include "../../legacy/Util2.h"
 
 namespace Moses2
 {
diff --git a/contrib/moses2/legacy/ProbingPT/hash.cpp b/contrib/moses2/TranslationModel/ProbingPT/hash.cpp
index aab5ee2b3..aab5ee2b3 100644
--- a/contrib/moses2/legacy/ProbingPT/hash.cpp
+++ b/contrib/moses2/TranslationModel/ProbingPT/hash.cpp
diff --git a/contrib/moses2/legacy/ProbingPT/hash.hh b/contrib/moses2/TranslationModel/ProbingPT/hash.hh
index 78cc27999..78cc27999 100644
--- a/contrib/moses2/legacy/ProbingPT/hash.hh
+++ b/contrib/moses2/TranslationModel/ProbingPT/hash.hh
diff --git a/contrib/moses2/legacy/ProbingPT/line_splitter.cpp b/contrib/moses2/TranslationModel/ProbingPT/line_splitter.cpp
index e4b5e2694..e4b5e2694 100644
--- a/contrib/moses2/legacy/ProbingPT/line_splitter.cpp
+++ b/contrib/moses2/TranslationModel/ProbingPT/line_splitter.cpp
diff --git a/contrib/moses2/legacy/ProbingPT/line_splitter.hh b/contrib/moses2/TranslationModel/ProbingPT/line_splitter.hh
index 3b086b44a..3b086b44a 100644
--- a/contrib/moses2/legacy/ProbingPT/line_splitter.hh
+++ b/contrib/moses2/TranslationModel/ProbingPT/line_splitter.hh
diff --git a/contrib/moses2/legacy/ProbingPT/probing_hash_utils.cpp b/contrib/moses2/TranslationModel/ProbingPT/probing_hash_utils.cpp
index c72709d3c..c72709d3c 100644
--- a/contrib/moses2/legacy/ProbingPT/probing_hash_utils.cpp
+++ b/contrib/moses2/TranslationModel/ProbingPT/probing_hash_utils.cpp
diff --git a/contrib/moses2/legacy/ProbingPT/probing_hash_utils.hh b/contrib/moses2/TranslationModel/ProbingPT/probing_hash_utils.hh
index 841934027..841934027 100644
--- a/contrib/moses2/legacy/ProbingPT/probing_hash_utils.hh
+++ b/contrib/moses2/TranslationModel/ProbingPT/probing_hash_utils.hh
diff --git a/contrib/moses2/legacy/ProbingPT/quering.cpp b/contrib/moses2/TranslationModel/ProbingPT/quering.cpp
index a4aa37792..f26439442 100644
--- a/contrib/moses2/legacy/ProbingPT/quering.cpp
+++ b/contrib/moses2/TranslationModel/ProbingPT/quering.cpp
@@ -1,6 +1,6 @@
 #include "quering.hh"
 #include "util/exception.hh"
-#include "../Util2.h"
+#include "../../legacy/Util2.h"
 
 using namespace std;
 
diff --git a/contrib/moses2/legacy/ProbingPT/quering.hh b/contrib/moses2/TranslationModel/ProbingPT/quering.hh
index 1dd9bc1af..aae4b4f09 100644
--- a/contrib/moses2/legacy/ProbingPT/quering.hh
+++ b/contrib/moses2/TranslationModel/ProbingPT/quering.hh
@@ -8,7 +8,7 @@
 #include "probing_hash_utils.hh"
 #include "hash.hh" //Includes line splitter
 #include "line_splitter.hh"
-#include "../Util2.h"
+#include "../../legacy/Util2.h"
 
 namespace Moses2
 {
diff --git a/contrib/moses2/legacy/ProbingPT/storing.cpp b/contrib/moses2/TranslationModel/ProbingPT/storing.cpp
index c531a3012..75cdcc038 100644
--- a/contrib/moses2/legacy/ProbingPT/storing.cpp
+++ b/contrib/moses2/TranslationModel/ProbingPT/storing.cpp
@@ -4,8 +4,8 @@
 #include "storing.hh"
 #include "StoreTarget.h"
 #include "StoreVocab.h"
-#include "../Util2.h"
-#include "../InputFileStream.h"
+#include "../../legacy/Util2.h"
+#include "../../legacy/InputFileStream.h"
 
 using namespace std;
 
diff --git a/contrib/moses2/legacy/ProbingPT/storing.hh b/contrib/moses2/TranslationModel/ProbingPT/storing.hh
index 10d7050d3..10d7050d3 100644
--- a/contrib/moses2/legacy/ProbingPT/storing.hh
+++ b/contrib/moses2/TranslationModel/ProbingPT/storing.hh
diff --git a/contrib/moses2/legacy/ProbingPT/vocabid.cpp b/contrib/moses2/TranslationModel/ProbingPT/vocabid.cpp
index 3c007262c..696373ee5 100644
--- a/contrib/moses2/legacy/ProbingPT/vocabid.cpp
+++ b/contrib/moses2/TranslationModel/ProbingPT/vocabid.cpp
@@ -1,7 +1,7 @@
 #include <boost/foreach.hpp>
 #include "vocabid.hh"
 #include "StoreVocab.h"
-#include "../Util2.h"
+#include "../../legacy/Util2.h"
 
 namespace Moses2
 {
diff --git a/contrib/moses2/legacy/ProbingPT/vocabid.hh b/contrib/moses2/TranslationModel/ProbingPT/vocabid.hh
index 55d99d453..55d99d453 100644
--- a/contrib/moses2/legacy/ProbingPT/vocabid.hh
+++ b/contrib/moses2/TranslationModel/ProbingPT/vocabid.hh