You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@joshua.apache.org by mj...@apache.org on 2016/09/13 09:22:17 UTC

[1/2] incubator-joshua git commit: add phrase length to file

Repository: incubator-joshua
Updated Branches:
  refs/heads/master c3e7a1538 -> 3b5811aed


add phrase length to file


Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/930f4de1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/930f4de1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/930f4de1

Branch: refs/heads/master
Commit: 930f4de14fc8a513a8e56e5de73e9a340d2fa084
Parents: ca0411a
Author: Matt Post <po...@cs.jhu.edu>
Authored: Mon Sep 12 06:31:09 2016 -0400
Committer: Matt Post <po...@cs.jhu.edu>
Committed: Mon Sep 12 06:31:53 2016 -0400

----------------------------------------------------------------------
 scripts/training/pipeline.pl                 | 4 ++--
 scripts/training/templates/thrax-phrase.conf | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/930f4de1/scripts/training/pipeline.pl
----------------------------------------------------------------------
diff --git a/scripts/training/pipeline.pl b/scripts/training/pipeline.pl
index 41a0cbb..f4feca5 100755
--- a/scripts/training/pipeline.pl
+++ b/scripts/training/pipeline.pl
@@ -1149,7 +1149,7 @@ if (! defined $GRAMMAR_FILE) {
 
     # copy the thrax config file
     my $thrax_file = "thrax-$GRAMMAR_TYPE.conf";
-    system("grep -v ^input-file $THRAX_CONF_FILE > $thrax_file.tmp");
+    system("grep -v ^input-file $THRAX_CONF_FILE | perl -pe 's/<MAXPHRLEN>/$MAX_PHRASE_LEN/g' > $thrax_file.tmp");
     system("echo input-file $thrax_input >> $thrax_file.tmp");
     system("mv $thrax_file.tmp $thrax_file");
 
@@ -1734,7 +1734,7 @@ $cachepipe->cmd("test-bleu-${OPTIMIZER_RUN}",
 
 # Update the BLEU summary.
 # Sometimes the target side for test doesn't exist (e.g., WMT)
-if (-e $TEST{target}) {
+if (-e $TEST{target} || -e "$TEST{target}.0") {
   compute_bleu_summary("test/*/bleu", "test/final-bleu");
 
   if (defined $METEOR) {

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/930f4de1/scripts/training/templates/thrax-phrase.conf
----------------------------------------------------------------------
diff --git a/scripts/training/templates/thrax-phrase.conf b/scripts/training/templates/thrax-phrase.conf
index 1585383..3c89a22 100644
--- a/scripts/training/templates/thrax-phrase.conf
+++ b/scripts/training/templates/thrax-phrase.conf
@@ -19,7 +19,7 @@ reducers 16
 
 # Maximum length of initial phrase pairs. These are set to be shorter than
 # used by Hiero.
-initial-phrase-length   5
+initial-phrase-length   <MAXPHRLEN>
 lex-source-words        5
 lex-target-words        5
 


[2/2] incubator-joshua git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-joshua

Posted by mj...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-joshua


Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/3b5811ae
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/3b5811ae
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/3b5811ae

Branch: refs/heads/master
Commit: 3b5811aed26b9f537a603a42ab7f5ccac25c470e
Parents: 930f4de c3e7a15
Author: Matt Post <po...@cs.jhu.edu>
Authored: Tue Sep 13 05:21:10 2016 -0400
Committer: Matt Post <po...@cs.jhu.edu>
Committed: Tue Sep 13 05:21:10 2016 -0400

----------------------------------------------------------------------
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------