add condition for devtest chains, fix paths to moses/moses_chart

2 files changed, 14 insertions, 4 deletions

diff --git a/scripts/ems/experiment.meta b/scripts/ems/experiment.meta
index f61034de7..c2b9da556 100644
--- a/scripts/ems/experiment.meta
+++ b/scripts/ems/experiment.meta
@@ -449,6 +449,7 @@ tokenize-input-devtest
 	out: tokenized-input-devtest
 	default-name: tuning/input.devtest.tok
 	pass-unless: input-tokenizer
+	ignore-unless: use-mira
 	template: $input-tokenizer < IN > OUT
 parse-input
 	in: tokenized-input
@@ -461,6 +462,7 @@ parse-input-devtest
 	out: parsed-input-devtest
 	default-name: tuning/input.devtest.parsed
 	pass-unless: input-parser
+	ignore-unless: use-mira	
 	template: $input-parser < IN > OUT
 parse-relax-input
 	in: parsed-input
@@ -473,6 +475,7 @@ parse-relax-input-devtest
 	out: parse-relaxed-input-devtest
 	default-name: tuning/input.devtest.parse-relaxed
 	pass-unless: input-parse-relaxer
+	ignore-unless: use-mira
         template: $input-parse-relaxer < IN.$input-extension > OUT.$input-extension
 factorize-input
 	in: parse-relaxed-input
@@ -488,6 +491,7 @@ factorize-input-devtest
 	default-name: tuning/input.devtest.factorized
 	rerun-on-change: TRAINING:input-factors
 	pass-unless: TRAINING:input-factors
+	ignore-unless: use-mira
 	error: can't open
 	error: incompatible number of words in factor
 lowercase-input
@@ -502,6 +506,7 @@ lowercase-input-devtest
 	out: cased-input-devtest
 	default-name: tuning/input.devtest.lc
 	pass-unless: input-lowercaser
+	ignore-unless: use-mira
 	ignore-if: input-truecaser
 	template: $input-lowercaser < IN > OUT
 truecase-input
@@ -517,6 +522,7 @@ truecase-input-devtest
 	rerun-on-change: input-truecaser
 	default-name: tuning/input.devtest.tc
 	ignore-unless: input-truecaser
+	ignore-unless: use-mira
         template: $input-truecaser -model IN1.$input-extension < IN > OUT
 split-input 
 	in: cased-input SPLITTER:splitter-model
@@ -531,6 +537,7 @@ split-input-devtest
 	rerun-on-change: input-splitter
 	default-name: tuning/input.devtest.split
 	pass-unless: input-splitter
+	ignore-unless: use-mira
 	template: $input-splitter -model IN1.$input-extension $input-extension < IN > OUT
 reference-from-sgm
 	in: reference-sgm input-sgm
@@ -549,6 +556,7 @@ tokenize-reference-devtest
 	out: tokenized-reference-devtest
 	default-name: tuning/reference.devtest.tok
 	pass-unless: output-tokenizer
+	ignore-unless: use-mira
 	multiref: $moses-script-dir/ems/support/run-command-on-multiple-refsets.perl
 	template: $output-tokenizer < IN > OUT
 lowercase-reference
@@ -565,6 +573,7 @@ lowercase-reference-devtest
 	default-name: tuning/reference.devtest.lc
 	pass-unless: output-lowercaser
 	ignore-if: output-truecaser
+	ignore-unless: use-mira
 	multiref: $moses-script-dir/ems/support/run-command-on-multiple-refsets.perl
 	template: $output-lowercaser < IN > OUT	
 truecase-reference
@@ -581,6 +590,7 @@ truecase-reference-devtest
 	rerun-on-change: output-truecaser
 	default-name: tuning/reference.devtest.tc
 	ignore-unless: output-truecaser
+	ignore-unless: use-mira
 	multiref: $moses-script-dir/ems/support/run-command-on-multiple-refsets.perl
         template: $output-truecaser -model IN1.$output-extension < IN > OUT
 split-reference
@@ -595,6 +605,7 @@ split-reference-devtest
 	out: reference-devtest
 	default-name: tuning/reference.devtest.split
 	pass-unless: output-splitter
+	ignore-unless: use-mira
 	multiref: $moses-script-dir/ems/support/run-command-on-multiple-refsets.perl
 	template: $output-splitter -model IN1.$output-extension < IN > OUT
 filter
diff --git a/scripts/ems/experiment.perl b/scripts/ems/experiment.perl
index 3ce587a46..8812fab21 100755
--- a/scripts/ems/experiment.perl
+++ b/scripts/ems/experiment.perl
@@ -1701,10 +1701,10 @@ sub write_mira_config {
     
     print CFG "[devtest] \n";
     if (&get("TRAINING:hierarchical-rule-set")) {
-	print CFG "moses=\${moses-home}/moses-chart-cmd/src/moses_chart \n";
+	print CFG "moses=\${moses-home}/dist/bin/moses_chart \n";
     }
     else {
-	print CFG "moses=\${moses-home}/moses-cmd/src/moses \n";
+	print CFG "moses=\${moses-home}/dist/bin/moses \n";
     }
     # use multi-bleu to select the best set of weights
     print CFG "bleu=\${moses-home}/scripts/generic/multi-bleu.perl \n";
@@ -2316,8 +2316,7 @@ sub define_tuningevaluation_filter {
     $input_filter = &get("EVALUATION:$set:input-filter") unless $tuning_flag;
     $input_filter = &get("TUNING:input-filter") if $tuning_flag;
     $input_filter = $input unless $input_filter;
-    print STDERR "$type: input-filter: $input_filter\n";
-
+    
     my $filter_dir;
     if ($type) {
 	$filter_dir = "$dir/tuning/filtered.$type.$VERSION";