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/08/24 14:08:13 UTC

[1/2] incubator-joshua git commit: added berkeleyaligner

Repository: incubator-joshua
Updated Branches:
  refs/heads/JOSHUA-304 [created] 255927dba


added berkeleyaligner


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

Branch: refs/heads/JOSHUA-304
Commit: d3a2291c004d383c5cb65ab466af582ab6f39d6c
Parents: 25d28fe
Author: Matt Post <po...@cs.jhu.edu>
Authored: Wed Aug 24 09:43:01 2016 -0400
Committer: Matt Post <po...@cs.jhu.edu>
Committed: Wed Aug 24 09:43:01 2016 -0400

----------------------------------------------------------------------
 download-deps.sh | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/d3a2291c/download-deps.sh
----------------------------------------------------------------------
diff --git a/download-deps.sh b/download-deps.sh
index 6e4797b..8fbdf69 100755
--- a/download-deps.sh
+++ b/download-deps.sh
@@ -15,3 +15,7 @@ git clone https://github.com/joshua-decoder/giza-pp.git ext/giza-pp
 
 git clone https://github.com/joshua-decoder/symal.git ext/symal
 (make -C ext/symal all)
+
+git clone https://github.com/joshua-decoder/berkeleyaligner ext/berkeleyaligner
+(cd ext/berkeleyaligner; ant)
+


[2/2] incubator-joshua git commit: formatting fixes, updated path to JAR

Posted by mj...@apache.org.
formatting fixes, updated path to JAR


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

Branch: refs/heads/JOSHUA-304
Commit: 255927dba585965822c3d35f4d90e35d3199994f
Parents: d3a2291
Author: Matt Post <po...@cs.jhu.edu>
Authored: Wed Aug 24 10:07:38 2016 -0400
Committer: Matt Post <po...@cs.jhu.edu>
Committed: Wed Aug 24 10:07:38 2016 -0400

----------------------------------------------------------------------
 scripts/training/paralign.pl                      |  2 +-
 .../training/templates/alignment/word-align.conf  | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/255927db/scripts/training/paralign.pl
----------------------------------------------------------------------
diff --git a/scripts/training/paralign.pl b/scripts/training/paralign.pl
index d5159a7..2f04fc1 100755
--- a/scripts/training/paralign.pl
+++ b/scripts/training/paralign.pl
@@ -78,7 +78,7 @@ sub run_berkeley_aligner {
 
   # run the job
   $cachepipe->cmd("berkeley-aligner-chunk-$chunkno",
-                  "java -d64 -Xmx$args{aligner_mem} -jar $JOSHUA/lib/berkeleyaligner.jar ++alignments/$chunkno/word-align.conf",
+                  "java -d64 -Xmx$args{aligner_mem} -jar $JOSHUA/ext/berkeleyaligner/distribution/berkeleyaligner.jar ++alignments/$chunkno/word-align.conf",
                   "alignments/$chunkno/word-align.conf",
                   "$args{train_dir}/splits/corpus.$args{source}.$chunkno",
                   "$args{train_dir}/splits/corpus.$args{target}.$chunkno",

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/255927db/scripts/training/templates/alignment/word-align.conf
----------------------------------------------------------------------
diff --git a/scripts/training/templates/alignment/word-align.conf b/scripts/training/templates/alignment/word-align.conf
index 83904d3..5fe3e0c 100644
--- a/scripts/training/templates/alignment/word-align.conf
+++ b/scripts/training/templates/alignment/word-align.conf
@@ -11,8 +11,8 @@
 
 forwardModels	MODEL1 HMM
 reverseModels	MODEL1 HMM
-mode			JOINT JOINT
-iters			5 5
+mode	JOINT JOINT
+iters	5 5
 
 ###############################################
 # Execution: Controls output and program flow 
@@ -20,9 +20,9 @@ iters			5 5
 
 execDir	alignments/<CHUNK>
 create
-saveParams		false
-numThreads		1
-msPerLine		10000
+saveParams	false
+numThreads	1
+msPerLine	10000
 alignTraining
 
 #################
@@ -33,10 +33,10 @@ foreignSuffix	<SOURCE>
 englishSuffix	<TARGET>
 
 # Choose the training sources, which can either be directories or files that list files/directories
-trainSources <TRAIN_DIR>/splits/corpus
-sentences	 MAX
-testSources /dev/null
-overwriteExecDir true
+trainSources	<TRAIN_DIR>/splits/corpus
+sentences	MAX
+testSources	/dev/null
+overwriteExecDir	true
 
 #################
 # 1-best output