Removed tm_args complication from pipeline

joshua-decoder · Apr 11, 2015 · 9e5ee85 · 9e5ee85
1 parent fb16123
commit 9e5ee85
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/scripts/training/pipeline.pl b/scripts/training/pipeline.pl
@@ -1524,10 +1524,8 @@ sub parse_tm_line {
   system("mkdir -p $tunedir") unless -d $tunedir;
 
   my $tmtype = "thrax";
-  my $tmargs = "";
   if ($GRAMMAR_TYPE eq "phrase") {
     $tmtype = "moses";
-    $tmargs = "-max-source-len $MAX_PHRASE_LEN";
   }
 
   foreach my $key (keys %TUNEFILES) {
@@ -1554,7 +1552,6 @@ sub parse_tm_line {
 			s/<GRAMMAR_TYPE>/$GRAMMAR_TYPE/g;
 			s/<GRAMMAR_FILE>/$TUNE_GRAMMAR/g;
       s/<GRAMMAR_KEYWORD>/$tmtype/g;
-      s/<GRAMMAR_ARGS>/$tmargs/g;
 			s/<GLUE_GRAMMAR>/$GLUE_GRAMMAR_FILE/g;
 			s/<MAXSPAN>/$MAXSPAN/g;
 			s/<OOV>/$OOV/g;
@@ -1733,7 +1730,7 @@ sub parse_tm_line {
   # Copy the config file over.
 
   $cachepipe->cmd("test-joshua-config-from-tune-$run",
-                  "cat $tunedir/joshua.config.final | $COPY_CONFIG -mark-oovs false -tm '$tmtype -owner pt -maxspan $MAXSPAN -path $TEST_GRAMMAR $tmargs' > $testrun/joshua.config",
+                  "cat $tunedir/joshua.config.final | $COPY_CONFIG -mark-oovs false -tm '$tmtype -owner pt -maxspan $MAXSPAN -path $TEST_GRAMMAR' > $testrun/joshua.config",
 									"$tunedir/joshua.config.final",
 									"$testrun/joshua.config");
 
@@ -1892,13 +1889,11 @@ sub parse_tm_line {
 
 # copy over the config file
 my $tmtype = "thrax";
-my $tmargs = "";
 if ($GRAMMAR_TYPE eq "phrase") {
   $tmtype = "moses";
-  $tmargs = "-max-source-len $MAX_PHRASE_LEN";
 }
 $cachepipe->cmd("test-$NAME-copy-config",
-                "cat $TUNEFILES{'joshua.config'} | $COPY_CONFIG -mark-oovs false -tm/pt '$tmtype -owner pt -maxspan $MAXSPAN -path $TEST_GRAMMAR $tmargs' -default-non-terminal $OOV -search $SEARCH_ALGORITHM > $testrun/joshua.config",
+                "cat $TUNEFILES{'joshua.config'} | $COPY_CONFIG -mark-oovs false -tm/pt '$tmtype -owner pt -maxspan $MAXSPAN -path $TEST_GRAMMAR' -default-non-terminal $OOV -search $SEARCH_ALGORITHM > $testrun/joshua.config",
                 $TUNEFILES{'joshua.config'},
                 "$testrun/joshua.config");