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 2017/01/26 01:02:52 UTC
[1/7] incubator-joshua git commit: Added check / warning that packed
grammar is loaded first
Repository: incubator-joshua
Updated Branches:
refs/heads/JOSHUA-327 f58188163 -> 2af955c55
refs/heads/master 3ef13a056 -> a8b328269
Added check / warning that packed grammar is loaded first
Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/288e256c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/288e256c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/288e256c
Branch: refs/heads/JOSHUA-327
Commit: 288e256c609b4bae3bfdedc364eb0160fcb015bc
Parents: 3ef13a0
Author: Matt Post <po...@cs.jhu.edu>
Authored: Wed Jan 25 16:14:59 2017 -0500
Committer: Matt Post <po...@cs.jhu.edu>
Committed: Wed Jan 25 16:14:59 2017 -0500
----------------------------------------------------------------------
src/main/java/org/apache/joshua/decoder/Decoder.java | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/288e256c/src/main/java/org/apache/joshua/decoder/Decoder.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/decoder/Decoder.java b/src/main/java/org/apache/joshua/decoder/Decoder.java
index 7b202b9..73db86a 100644
--- a/src/main/java/org/apache/joshua/decoder/Decoder.java
+++ b/src/main/java/org/apache/joshua/decoder/Decoder.java
@@ -468,6 +468,15 @@ public class Decoder {
+ "Perhaps it doesn't exist, or it may be an old packed file format.";
throw new RuntimeException(msg);
}
+
+ /* Bug check. It is a problem if you load the glue grammar before a packed grammar, due to vocabulary
+ * issues. That should be fixed one day, but in the meantime, it is important to tell people about it.
+ */
+ if (glueGrammar != null) {
+ LOG.error("FATAL: the glue grammar must be listed AFTER any packed grammar.");
+ LOG.error(" Change the order in the config file so that your packed grammar is loaded first.");
+ throw new RuntimeException("Glue grammar loaded before a packed grammar.");
+ }
} else {
// thrax, hiero, samt
grammar = new MemoryBasedBatchGrammar(type, path, owner,
[3/7] incubator-joshua git commit: do the glue grammar check before
loading the packed grammar
Posted by mj...@apache.org.
do the glue grammar check before loading the packed grammar
Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/d870a593
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/d870a593
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/d870a593
Branch: refs/heads/master
Commit: d870a593ca49584a167ad742bc50b0bbcc0e8f84
Parents: 288e256
Author: Matt Post <po...@cs.jhu.edu>
Authored: Wed Jan 25 20:01:55 2017 -0500
Committer: Matt Post <po...@cs.jhu.edu>
Committed: Wed Jan 25 20:01:55 2017 -0500
----------------------------------------------------------------------
.../java/org/apache/joshua/decoder/Decoder.java | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/d870a593/src/main/java/org/apache/joshua/decoder/Decoder.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/decoder/Decoder.java b/src/main/java/org/apache/joshua/decoder/Decoder.java
index 73db86a..e105fd2 100644
--- a/src/main/java/org/apache/joshua/decoder/Decoder.java
+++ b/src/main/java/org/apache/joshua/decoder/Decoder.java
@@ -459,6 +459,15 @@ public class Decoder {
} else {
if (new File(path).isDirectory()) {
+ /* Bug check. It is a problem if you load the glue grammar before a packed grammar, due to vocabulary
+ * issues. That should be fixed one day, but in the meantime, it is important to tell people about it.
+ */
+ if (glueGrammar != null) {
+ LOG.error("FATAL: the glue grammar must be listed AFTER any packed grammar.");
+ LOG.error(" Change the order in the config file so that your packed grammar is loaded first.");
+ throw new RuntimeException("Glue grammar loaded before a packed grammar.");
+ }
+
try {
PackedGrammar packed_grammar = new PackedGrammar(path, span_limit, owner, type, joshuaConfiguration);
packed_grammars.add(packed_grammar);
@@ -469,14 +478,6 @@ public class Decoder {
throw new RuntimeException(msg);
}
- /* Bug check. It is a problem if you load the glue grammar before a packed grammar, due to vocabulary
- * issues. That should be fixed one day, but in the meantime, it is important to tell people about it.
- */
- if (glueGrammar != null) {
- LOG.error("FATAL: the glue grammar must be listed AFTER any packed grammar.");
- LOG.error(" Change the order in the config file so that your packed grammar is loaded first.");
- throw new RuntimeException("Glue grammar loaded before a packed grammar.");
- }
} else {
// thrax, hiero, samt
grammar = new MemoryBasedBatchGrammar(type, path, owner,
[4/7] incubator-joshua git commit: do the glue grammar check before
loading the packed grammar
Posted by mj...@apache.org.
do the glue grammar check before loading the packed grammar
Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/d870a593
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/d870a593
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/d870a593
Branch: refs/heads/JOSHUA-327
Commit: d870a593ca49584a167ad742bc50b0bbcc0e8f84
Parents: 288e256
Author: Matt Post <po...@cs.jhu.edu>
Authored: Wed Jan 25 20:01:55 2017 -0500
Committer: Matt Post <po...@cs.jhu.edu>
Committed: Wed Jan 25 20:01:55 2017 -0500
----------------------------------------------------------------------
.../java/org/apache/joshua/decoder/Decoder.java | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/d870a593/src/main/java/org/apache/joshua/decoder/Decoder.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/decoder/Decoder.java b/src/main/java/org/apache/joshua/decoder/Decoder.java
index 73db86a..e105fd2 100644
--- a/src/main/java/org/apache/joshua/decoder/Decoder.java
+++ b/src/main/java/org/apache/joshua/decoder/Decoder.java
@@ -459,6 +459,15 @@ public class Decoder {
} else {
if (new File(path).isDirectory()) {
+ /* Bug check. It is a problem if you load the glue grammar before a packed grammar, due to vocabulary
+ * issues. That should be fixed one day, but in the meantime, it is important to tell people about it.
+ */
+ if (glueGrammar != null) {
+ LOG.error("FATAL: the glue grammar must be listed AFTER any packed grammar.");
+ LOG.error(" Change the order in the config file so that your packed grammar is loaded first.");
+ throw new RuntimeException("Glue grammar loaded before a packed grammar.");
+ }
+
try {
PackedGrammar packed_grammar = new PackedGrammar(path, span_limit, owner, type, joshuaConfiguration);
packed_grammars.add(packed_grammar);
@@ -469,14 +478,6 @@ public class Decoder {
throw new RuntimeException(msg);
}
- /* Bug check. It is a problem if you load the glue grammar before a packed grammar, due to vocabulary
- * issues. That should be fixed one day, but in the meantime, it is important to tell people about it.
- */
- if (glueGrammar != null) {
- LOG.error("FATAL: the glue grammar must be listed AFTER any packed grammar.");
- LOG.error(" Change the order in the config file so that your packed grammar is loaded first.");
- throw new RuntimeException("Glue grammar loaded before a packed grammar.");
- }
} else {
// thrax, hiero, samt
grammar = new MemoryBasedBatchGrammar(type, path, owner,
[6/7] incubator-joshua git commit: Merge branch 'JOSHUA-328'
Posted by mj...@apache.org.
Merge branch 'JOSHUA-328'
Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/a8b32826
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/a8b32826
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/a8b32826
Branch: refs/heads/master
Commit: a8b328269c760bce1e70e035e7ec5d2d68b4d32e
Parents: 3ef13a0 d870a59
Author: Matt Post <po...@cs.jhu.edu>
Authored: Wed Jan 25 20:02:06 2017 -0500
Committer: Matt Post <po...@cs.jhu.edu>
Committed: Wed Jan 25 20:02:06 2017 -0500
----------------------------------------------------------------------
src/main/java/org/apache/joshua/decoder/Decoder.java | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
[7/7] incubator-joshua git commit: Merge branch 'master' into
JOSHUA-327
Posted by mj...@apache.org.
Merge branch 'master' into JOSHUA-327
Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/2af955c5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/2af955c5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/2af955c5
Branch: refs/heads/JOSHUA-327
Commit: 2af955c55727b4942ac3613a87e819fc5836b18b
Parents: f581881 a8b3282
Author: Matt Post <po...@cs.jhu.edu>
Authored: Wed Jan 25 20:02:23 2017 -0500
Committer: Matt Post <po...@cs.jhu.edu>
Committed: Wed Jan 25 20:02:23 2017 -0500
----------------------------------------------------------------------
src/main/java/org/apache/joshua/decoder/Decoder.java | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
[5/7] incubator-joshua git commit: Merge branch 'JOSHUA-328'
Posted by mj...@apache.org.
Merge branch 'JOSHUA-328'
Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/a8b32826
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/a8b32826
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/a8b32826
Branch: refs/heads/JOSHUA-327
Commit: a8b328269c760bce1e70e035e7ec5d2d68b4d32e
Parents: 3ef13a0 d870a59
Author: Matt Post <po...@cs.jhu.edu>
Authored: Wed Jan 25 20:02:06 2017 -0500
Committer: Matt Post <po...@cs.jhu.edu>
Committed: Wed Jan 25 20:02:06 2017 -0500
----------------------------------------------------------------------
src/main/java/org/apache/joshua/decoder/Decoder.java | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
[2/7] incubator-joshua git commit: Added check / warning that packed
grammar is loaded first
Posted by mj...@apache.org.
Added check / warning that packed grammar is loaded first
Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/288e256c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/288e256c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/288e256c
Branch: refs/heads/master
Commit: 288e256c609b4bae3bfdedc364eb0160fcb015bc
Parents: 3ef13a0
Author: Matt Post <po...@cs.jhu.edu>
Authored: Wed Jan 25 16:14:59 2017 -0500
Committer: Matt Post <po...@cs.jhu.edu>
Committed: Wed Jan 25 16:14:59 2017 -0500
----------------------------------------------------------------------
src/main/java/org/apache/joshua/decoder/Decoder.java | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/288e256c/src/main/java/org/apache/joshua/decoder/Decoder.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/decoder/Decoder.java b/src/main/java/org/apache/joshua/decoder/Decoder.java
index 7b202b9..73db86a 100644
--- a/src/main/java/org/apache/joshua/decoder/Decoder.java
+++ b/src/main/java/org/apache/joshua/decoder/Decoder.java
@@ -468,6 +468,15 @@ public class Decoder {
+ "Perhaps it doesn't exist, or it may be an old packed file format.";
throw new RuntimeException(msg);
}
+
+ /* Bug check. It is a problem if you load the glue grammar before a packed grammar, due to vocabulary
+ * issues. That should be fixed one day, but in the meantime, it is important to tell people about it.
+ */
+ if (glueGrammar != null) {
+ LOG.error("FATAL: the glue grammar must be listed AFTER any packed grammar.");
+ LOG.error(" Change the order in the config file so that your packed grammar is loaded first.");
+ throw new RuntimeException("Glue grammar loaded before a packed grammar.");
+ }
} else {
// thrax, hiero, samt
grammar = new MemoryBasedBatchGrammar(type, path, owner,