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

8 files changed, 31 insertions, 27 deletions

diff --git a/contrib/other-builds/all.workspace b/contrib/other-builds/all.workspace
index 03a39c4fd..3df758293 100644
--- a/contrib/other-builds/all.workspace
+++ b/contrib/other-builds/all.workspace
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CodeLite_Workspace Name="all" Database="all.tags">
-  <Project Name="manual-label" Path="manual-label/manual-label.project" Active="Yes"/>
+  <Project Name="manual-label" Path="manual-label/manual-label.project" Active="No"/>
   <Project Name="extract" Path="extract/extract.project" Active="No"/>
   <Project Name="util" Path="util/util.project" Active="No"/>
   <Project Name="extract-mixed-syntax" Path="extract-mixed-syntax/extract-mixed-syntax.project" Active="No"/>
   <Project Name="lm" Path="lm/lm.project" Active="No"/>
   <Project Name="OnDiskPt" Path="OnDiskPt/OnDiskPt.project" Active="No"/>
   <Project Name="search" Path="search/search.project" Active="No"/>
-  <Project Name="moses" Path="moses/moses.project" Active="No"/>
-  <Project Name="moses-cmd" Path="moses-cmd/moses-cmd.project" Active="No"/>
+  <Project Name="moses-cmd" Path="moses-cmd/moses-cmd.project" Active="Yes"/>
   <Project Name="score" Path="score/score.project" Active="No"/>
   <Project Name="consolidate" Path="consolidate/consolidate.project" Active="No"/>
+  <Project Name="moses" Path="moses/moses.project" Active="No"/>
   <BuildMatrix>
     <WorkspaceConfiguration Name="Debug" Selected="yes">
       <Project Name="manual-label" ConfigName="Debug"/>
@@ -20,10 +20,10 @@
       <Project Name="lm" ConfigName="Debug"/>
       <Project Name="OnDiskPt" ConfigName="Debug"/>
       <Project Name="search" ConfigName="Debug"/>
-      <Project Name="moses" ConfigName="Debug"/>
       <Project Name="moses-cmd" ConfigName="Debug"/>
       <Project Name="score" ConfigName="Debug"/>
       <Project Name="consolidate" ConfigName="Debug"/>
+      <Project Name="moses" ConfigName="Debug"/>
     </WorkspaceConfiguration>
     <WorkspaceConfiguration Name="Release" Selected="yes">
       <Project Name="manual-label" ConfigName="Release"/>
@@ -33,10 +33,10 @@
       <Project Name="lm" ConfigName="Release"/>
       <Project Name="OnDiskPt" ConfigName="Release"/>
       <Project Name="search" ConfigName="Release"/>
-      <Project Name="moses" ConfigName="Release"/>
       <Project Name="moses-cmd" ConfigName="Release"/>
       <Project Name="score" ConfigName="Release"/>
       <Project Name="consolidate" ConfigName="Release"/>
+      <Project Name="moses" ConfigName="Release"/>
     </WorkspaceConfiguration>
   </BuildMatrix>
 </CodeLite_Workspace>
diff --git a/contrib/other-builds/consolidate/consolidate.project b/contrib/other-builds/consolidate/consolidate.project
index 4f94c949b..25539fad4 100644
--- a/contrib/other-builds/consolidate/consolidate.project
+++ b/contrib/other-builds/consolidate/consolidate.project
@@ -128,10 +128,10 @@
     </Configuration>
   </Settings>
   <Dependencies Name="Debug">
-    <Project Name="moses"/>
     <Project Name="util"/>
     <Project Name="lm"/>
     <Project Name="search"/>
     <Project Name="OnDiskPt"/>
   </Dependencies>
+  <Dependencies Name="Release"/>
 </CodeLite_Project>
diff --git a/contrib/other-builds/extract-mixed-syntax/extract-mixed-syntax.project b/contrib/other-builds/extract-mixed-syntax/extract-mixed-syntax.project
index 587005dc0..83c652f8c 100644
--- a/contrib/other-builds/extract-mixed-syntax/extract-mixed-syntax.project
+++ b/contrib/other-builds/extract-mixed-syntax/extract-mixed-syntax.project
@@ -141,8 +141,8 @@
       </Completion>
     </Configuration>
   </Settings>
-  <Dependencies Name="Release"/>
   <Dependencies Name="Debug">
     <Project Name="util"/>
   </Dependencies>
+  <Dependencies Name="Release"/>
 </CodeLite_Project>
diff --git a/contrib/other-builds/manual-label/manual-label.project b/contrib/other-builds/manual-label/manual-label.project
index 3e3efcddb..5c678561a 100644
--- a/contrib/other-builds/manual-label/manual-label.project
+++ b/contrib/other-builds/manual-label/manual-label.project
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CodeLite_Project Name="manual-label" InternalType="Console">
   <Plugins>
+    <Plugin Name="qmake">
+      <![CDATA[00010001N0005Debug000000000000]]>
+    </Plugin>
     <Plugin Name="CMakePlugin">
       <![CDATA[[{
   "name": "Debug",
@@ -13,9 +16,6 @@
   "parentProject": ""
  }]]]>
     </Plugin>
-    <Plugin Name="qmake">
-      <![CDATA[00010001N0005Debug000000000000]]>
-    </Plugin>
   </Plugins>
   <Description/>
   <Dependencies/>
@@ -31,8 +31,6 @@
     <File Name="Main.cpp"/>
     <File Name="Main.h"/>
   </VirtualDirectory>
-  <Dependencies Name="Debug"/>
-  <Dependencies Name="Release"/>
   <Settings Type="Executable">
     <GlobalSettings>
       <Compiler Options="" C_Options="" Assembler="">
@@ -128,4 +126,6 @@
       </Completion>
     </Configuration>
   </Settings>
+  <Dependencies Name="Debug"/>
+  <Dependencies Name="Release"/>
 </CodeLite_Project>
diff --git a/contrib/other-builds/moses-cmd/moses-cmd.project b/contrib/other-builds/moses-cmd/moses-cmd.project
index ecef4038b..d4f4c8463 100644
--- a/contrib/other-builds/moses-cmd/moses-cmd.project
+++ b/contrib/other-builds/moses-cmd/moses-cmd.project
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CodeLite_Project Name="moses-cmd" InternalType="Console">
   <Plugins>
+    <Plugin Name="qmake">
+      <![CDATA[00010001N0005Debug000000000000]]>
+    </Plugin>
     <Plugin Name="CMakePlugin">
       <![CDATA[[{
   "name": "Debug",
@@ -13,9 +16,6 @@
   "parentProject": ""
  }]]]>
     </Plugin>
-    <Plugin Name="qmake">
-      <![CDATA[00010001N0005Debug000000000000]]>
-    </Plugin>
   </Plugins>
   <Description/>
   <Dependencies/>
@@ -26,14 +26,6 @@
     <File Name="../../../moses-cmd/MainVW.cpp" ExcludeProjConfig="Debug"/>
     <File Name="../../../moses-cmd/MainVW.h" ExcludeProjConfig="Debug"/>
   </VirtualDirectory>
-  <Dependencies Name="Release"/>
-  <Dependencies Name="Debug">
-    <Project Name="OnDiskPt"/>
-    <Project Name="lm"/>
-    <Project Name="moses"/>
-    <Project Name="search"/>
-    <Project Name="util"/>
-  </Dependencies>
   <Settings Type="Executable">
     <GlobalSettings>
       <Compiler Options="" C_Options="" Assembler="">
@@ -78,7 +70,7 @@
         <Library Value="rt"/>
       </Linker>
       <ResourceCompiler Options="" Required="no"/>
-      <General OutputFile="$(IntermediateDirectory)/$(ProjectName)" IntermediateDirectory="./Debug" Command="./$(ProjectName)" CommandArguments="-f /var/folders/c4/2p48fcwx611dmkdqq44mbblm0000gn/T/ZVd8xvuJAR.ini -i /Users/hieu/workspace/github/moses-regression-tests/tests/phrase.basic-surface-binptable.oldformat/to-translate.txt" UseSeparateDebugArgs="yes" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="yes" IsGUIProgram="no" IsEnabled="yes"/>
+      <General OutputFile="$(IntermediateDirectory)/$(ProjectName)" IntermediateDirectory="./Debug" Command="./$(ProjectName)" CommandArguments="-f moses -" UseSeparateDebugArgs="yes" DebugArguments="" WorkingDirectory="/Users/hieu/workspace/experiment/issues/chart.hierarchical-withkenlm" PauseExecWhenProcTerminates="yes" IsGUIProgram="no" IsEnabled="yes"/>
       <Environment EnvVarSetName="&lt;Use Defaults&gt;" DbgSetName="&lt;Use Defaults&gt;">
         <![CDATA[]]>
       </Environment>
@@ -103,7 +95,7 @@
         <CustomPostBuild/>
         <CustomPreBuild/>
       </AdditionalRules>
-      <Completion EnableCpp11="no">
+      <Completion EnableCpp11="no" EnableCpp14="no">
         <ClangCmpFlagsC/>
         <ClangCmpFlags/>
         <ClangPP/>
@@ -142,7 +134,7 @@
         <CustomPostBuild/>
         <CustomPreBuild/>
       </AdditionalRules>
-      <Completion EnableCpp11="no">
+      <Completion EnableCpp11="no" EnableCpp14="no">
         <ClangCmpFlagsC/>
         <ClangCmpFlags/>
         <ClangPP/>
@@ -150,4 +142,11 @@
       </Completion>
     </Configuration>
   </Settings>
+  <Dependencies Name="Debug">
+    <Project Name="OnDiskPt"/>
+    <Project Name="lm"/>
+    <Project Name="search"/>
+    <Project Name="util"/>
+  </Dependencies>
+  <Dependencies Name="Release"/>
 </CodeLite_Project>
diff --git a/contrib/other-builds/moses/moses.project b/contrib/other-builds/moses/moses.project
index adebcdfb4..aadebe173 100644
--- a/contrib/other-builds/moses/moses.project
+++ b/contrib/other-builds/moses/moses.project
@@ -873,4 +873,8 @@
       </Completion>
     </Configuration>
   </Settings>
+  <VirtualDirectory Name="parameters">
+    <File Name="../../../moses/parameters/ContextParameters.cpp"/>
+    <File Name="../../../moses/parameters/ContextParameters.h"/>
+  </VirtualDirectory>
 </CodeLite_Project>
diff --git a/contrib/other-builds/score/score.project b/contrib/other-builds/score/score.project
index dcc0f7b47..c88df0e78 100644
--- a/contrib/other-builds/score/score.project
+++ b/contrib/other-builds/score/score.project
@@ -135,6 +135,6 @@
   </Settings>
   <Dependencies Name="Debug">
     <Project Name="util"/>
-    <Project Name="moses"/>
   </Dependencies>
+  <Dependencies Name="Release"/>
 </CodeLite_Project>
diff --git a/scripts/ems/experiment.meta b/scripts/ems/experiment.meta
index aa9a457bb..3d337cf59 100644
--- a/scripts/ems/experiment.meta
+++ b/scripts/ems/experiment.meta
@@ -157,6 +157,7 @@ train
 	out: splitter-model
 	default-name: splitter/split-model
 	ignore-unless: input-splitter output-splitter
+	ignore-if: no-splitter-training
 
 [LM] multiple
 get-corpus