Rearrange parser training modules (#430)

google · Nov 18, 2019 · 75452a3 · 75452a3
1 parent 93541e9
commit 75452a3
Show file tree

Hide file tree

Showing 17 changed files with 49 additions and 107 deletions.
diff --git a/sling/nlp/parser/BUILD b/sling/nlp/parser/BUILD
@@ -129,11 +129,43 @@ cc_library(
   alwayslink = 1,
 )
 
+cc_library(
+  name = "frame-evaluation",
+  hdrs = ["frame-evaluation.h"],
+  srcs = ["frame-evaluation.cc"],
+  deps = [
+    "//sling/base",
+    "//sling/file",
+    "//sling/frame:object",
+    "//sling/frame:serialization",
+    "//sling/frame:store",
+    "//sling/nlp/document:document",
+    "//sling/nlp/document:document-corpus",
+    "//sling/string:strcat",
+    "//sling/string:printf",
+  ],
+)
+
+cc_library(
+  name = "transition-generator",
+  hdrs = ["transition-generator.h"],
+  srcs = ["transition-generator.cc"],
+  deps = [
+    ":parser-action",
+    "//sling/base",
+    "//sling/frame:object",
+    "//sling/frame:serialization",
+    "//sling/frame:store",
+    "//sling/nlp/document:document",
+  ],
+)
+
 cc_library(
   name = "parser-trainer",
   srcs = ["parser-trainer.cc"],
   hdrs = ["parser-trainer.h"],
   deps = [
+    "frame-evaluation",
     ":parser-action",
     ":parser-features",
     ":roles",
@@ -148,7 +180,6 @@ cc_library(
     "//sling/nlp/document:document-corpus",
     "//sling/nlp/document:lexical-encoder",
     "//sling/nlp/document:lexicon",
-    "//sling/nlp/parser/trainer:frame-evaluation",
     "//sling/task:learner",
     "//sling/util:mutex",
     "//sling/util:unicode",
@@ -160,14 +191,14 @@ cc_library(
   srcs = ["caspar-trainer.cc"],
   deps = [
     ":parser-trainer",
+    ":transition-generator",
     "//sling/base",
     "//sling/myelin:builder",
     "//sling/myelin:flow",
     "//sling/myelin:gradient",
     "//sling/myelin:learning",
     "//sling/nlp/document:document",
     "//sling/nlp/document:document-corpus",
-    "//sling/nlp/parser/trainer:transition-generator",
   ],
   alwayslink = 1,
 )

diff --git a/sling/nlp/parser/caspar-trainer.cc b/sling/nlp/parser/caspar-trainer.cc
@@ -19,7 +19,7 @@
 #include "sling/myelin/learning.h"
 #include "sling/nlp/parser/action-table.h"
 #include "sling/nlp/parser/parser-trainer.h"
-#include "sling/nlp/parser/trainer/transition-generator.h"
+#include "sling/nlp/parser/transition-generator.h"
 
 namespace sling {
 namespace nlp {

diff --git a/sling/nlp/parser/trainer/frame-evaluation.cc → sling/nlp/parser/frame-evaluation.cc b/sling/nlp/parser/trainer/frame-evaluation.cc → sling/nlp/parser/frame-evaluation.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "sling/nlp/parser/trainer/frame-evaluation.h"
+#include "sling/nlp/parser/frame-evaluation.h"
 
 #include <algorithm>
 

diff --git a/sling/nlp/parser/trainer/frame-evaluation.h → sling/nlp/parser/frame-evaluation.h b/sling/nlp/parser/trainer/frame-evaluation.h → sling/nlp/parser/frame-evaluation.h
@@ -14,8 +14,8 @@
 
 // Frame evaluation.
 
-#ifndef SLING_NLP_PARSER_TRAINER_FRAME_EVALUATION_H_
-#define SLING_NLP_PARSER_TRAINER_FRAME_EVALUATION_H_
+#ifndef SLING_NLP_PARSER_FRAME_EVALUATION_H_
+#define SLING_NLP_PARSER_FRAME_EVALUATION_H_
 
 #include <string>
 #include <unordered_map>
@@ -225,4 +225,4 @@ class FrameEvaluation {
 }  // namespace nlp
 }  // namespace sling
 
-#endif // SLING_NLP_PARSER_TRAINER_FRAME_EVALUATION_H_
+#endif // SLING_NLP_PARSER_FRAME_EVALUATION_H_
diff --git a/sling/nlp/parser/parser-trainer.h b/sling/nlp/parser/parser-trainer.h
@@ -27,10 +27,10 @@
 #include "sling/nlp/document/document.h"
 #include "sling/nlp/document/document-corpus.h"
 #include "sling/nlp/document/lexical-encoder.h"
+#include "sling/nlp/parser/frame-evaluation.h"
 #include "sling/nlp/parser/parser-action.h"
 #include "sling/nlp/parser/parser-features.h"
 #include "sling/nlp/parser/roles.h"
-#include "sling/nlp/parser/trainer/frame-evaluation.h"
 #include "sling/task/learner.h"
 #include "sling/util/mutex.h"
 

diff --git a/sling/nlp/parser/tools/BUILD b/sling/nlp/parser/tools/BUILD
@@ -15,7 +15,7 @@ cc_binary(
     "//sling/nlp/document:document-tokenizer",
     "//sling/nlp/document:lex",
     "//sling/nlp/parser",
-    "//sling/nlp/parser/trainer:frame-evaluation",
+    "//sling/nlp/parser:frame-evaluation",
     "//sling/string:printf",
   ],
 )

diff --git a/sling/nlp/parser/tools/parse.cc b/sling/nlp/parser/tools/parse.cc
@@ -44,8 +44,8 @@
 #include "sling/nlp/document/document-corpus.h"
 #include "sling/nlp/document/document-tokenizer.h"
 #include "sling/nlp/document/lex.h"
+#include "sling/nlp/parser/frame-evaluation.h"
 #include "sling/nlp/parser/parser.h"
-#include "sling/nlp/parser/trainer/frame-evaluation.h"
 #include "sling/string/printf.h"
 
 DEFINE_string(parser, "", "Input file with flow model");

diff --git a/sling/nlp/parser/trainer/BUILD b/sling/nlp/parser/trainer/BUILD
diff --git a/sling/nlp/parser/trainer/generate-transitions.cc b/sling/nlp/parser/trainer/generate-transitions.cc
diff --git a/python/myelin/lexical_encoder.py → sling/nlp/parser/trainer/lexical_encoder.py b/python/myelin/lexical_encoder.py → sling/nlp/parser/trainer/lexical_encoder.py
diff --git a/sling/nlp/parser/trainer/pytorch_modules.py b/sling/nlp/parser/trainer/pytorch_modules.py
@@ -22,10 +22,10 @@
 
 from cascade import Delegate
 from cascade import SoftmaxDelegate
+from lexical_encoder import LexicalEncoder
 from parser_state import ParserState
 from trace import Trace
 
-from sling.myelin.lexical_encoder import LexicalEncoder
 import sling
 import sling.myelin.nn as flownn
 import sling.myelin.flow as flow

diff --git a/...lp/parser/trainer/transition-generator.cc → sling/nlp/parser/transition-generator.cc b/...lp/parser/trainer/transition-generator.cc → sling/nlp/parser/transition-generator.cc
@@ -12,13 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include "sling/nlp/parser/transition-generator.h"
+
 #include <algorithm>
 #include <deque>
 #include <vector>
 
 #include "sling/frame/object.h"
 #include "sling/frame/store.h"
-#include "sling/nlp/parser/trainer/transition-generator.h"
 
 namespace sling {
 namespace nlp {

diff --git a/...nlp/parser/trainer/transition-generator.h → sling/nlp/parser/transition-generator.h b/...nlp/parser/trainer/transition-generator.h → sling/nlp/parser/transition-generator.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef SLING_NLP_PARSER_TRAINER_TRANSITION_GENERATOR_H_
-#define SLING_NLP_PARSER_TRAINER_TRANSITION_GENERATOR_H_
+#ifndef SLING_NLP_PARSER_TRANSITION_GENERATOR_H_
+#define SLING_NLP_PARSER_TRANSITION_GENERATOR_H_
 
 #include <functional>
 
@@ -37,4 +37,4 @@ void Generate(const Document &document,
 }  // namespace nlp
 }  // namespace sling
 
-#endif  // SLING_NLP_PARSER_TRAINER_TRANSITION_GENERATOR_H_
+#endif  // SLING_NLP_PARSER_TRANSITION_GENERATOR_H_
diff --git a/sling/pyapi/BUILD b/sling/pyapi/BUILD
@@ -54,7 +54,7 @@ cc_library(
     "//sling/nlp/kb:facts",
     "//sling/nlp/kb:phrase-table",
     "//sling/nlp/parser",
-    "//sling/nlp/parser/trainer:frame-evaluation",
+    "//sling/nlp/parser:frame-evaluation",
     "//sling/nlp/wiki:wikidata-converter",
     "//sling/task:dashboard",
     "//sling/task:job",

diff --git a/sling/pyapi/pyparser.cc b/sling/pyapi/pyparser.cc
@@ -17,8 +17,8 @@
 #include "sling/nlp/document/document.h"
 #include "sling/nlp/document/document-tokenizer.h"
 #include "sling/nlp/document/lex.h"
+#include "sling/nlp/parser/frame-evaluation.h"
 #include "sling/nlp/parser/parser.h"
-#include "sling/nlp/parser/trainer/frame-evaluation.h"
 #include "sling/pyapi/pyframe.h"
 #include "sling/pyapi/pystore.h"
 

diff --git a/tools/build-wheel.py b/tools/build-wheel.py
@@ -74,7 +74,6 @@ def sha256_content_checksum(data):
   'python/myelin/__init__.py': '$DATA$/sling/myelin/__init__.py',
   'python/myelin/builder.py': '$DATA$/sling/myelin/builder.py',
   'python/myelin/flow.py': '$DATA$/sling/myelin/flow.py',
-  'python/myelin/lexical_encoder.py': '$DATA$/sling/myelin/lexical_encoder.py',
   'python/myelin/nn.py': '$DATA$/sling/myelin/nn.py',
   'python/myelin/tf.py': '$DATA$/sling/myelin/tf.py',
 

diff --git a/tools/buildall.sh b/tools/buildall.sh
@@ -15,7 +15,6 @@ bazel build -c opt $* \
   sling/nlp/ner:* \
   sling/nlp/parser:* \
   sling/nlp/parser/tools:* \
-  sling/nlp/parser/trainer:* \
   sling/nlp/wiki:* \
   sling/pyapi:* \
   sling/stream:* \