Update Python wheel with new myelin and task components (#184)

google · May 16, 2018 · 8d3bb6e · 8d3bb6e
1 parent 5aa5511
commit 8d3bb6e
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 571 deletions.
diff --git a/python/flow.py b/python/flow.py
diff --git a/sling/nlp/parser/trainer/flow/builder.py → python/myelin/builder.py b/sling/nlp/parser/trainer/flow/builder.py → python/myelin/builder.py
diff --git a/sling/nlp/parser/trainer/flow/flow.py → python/myelin/flow.py b/sling/nlp/parser/trainer/flow/flow.py → python/myelin/flow.py
diff --git a/sling/nlp/parser/trainer/flow/nn.py → python/myelin/nn.py b/sling/nlp/parser/trainer/flow/nn.py → python/myelin/nn.py
diff --git a/sling/nlp/parser/trainer/pytorch_modules.py b/sling/nlp/parser/trainer/pytorch_modules.py
@@ -23,11 +23,9 @@
 sys.path.insert(0, "sling/nlp/parser/trainer")
 from parser_state import ParserState
 
-sys.path.insert(0, "sling/nlp/parser/trainer/flow")
-
-import nn as flownn
-import flow as flow
-import builder as builder
+import sling.myelin.nn as flownn
+import sling.myelin.flow as flow
+import sling.myelin.builder as builder
 
 Param = nn.Parameter
 Var = torch.autograd.Variable
@@ -628,4 +626,3 @@ def link(bldr, name, dim, cnx, prefix=True):
     finish_concat_op(ff, ff_concat_op)
     fl.save(flow_file)
 
-
diff --git a/sling/nlp/parser/trainer/tests/BUILD b/sling/nlp/parser/trainer/tests/BUILD
diff --git a/sling/nlp/parser/trainer/tests/make-test-docs.cc b/sling/nlp/parser/trainer/tests/make-test-docs.cc
diff --git a/tools/build-wheel.py b/tools/build-wheel.py
@@ -17,7 +17,7 @@
 # The Python wheel produced by this script can be installed with the following
 # command:
 #
-#   sudo pip install /tmp/sling-1.0.0-cp27-none-linux_x86_64.whl
+#   sudo pip install /tmp/sling-2.0.0-cp27-none-linux_x86_64.whl
 #
 # If you are developing the SLING system, it is convenient to just add a
 # link to the SLING repository directly from the Python package directory
@@ -46,7 +46,7 @@ def sha256_content_checksum(data):
 
 # Wheel package information.
 package = "sling"
-version = "1.0.0"
+version = "2.0.0"
 dist_dir = package + "-" + version + ".dist-info"
 data_dir = package + "-" + version + ".data/purelib"
 record_filename = dist_dir + "/RECORD"
@@ -58,10 +58,19 @@ def sha256_content_checksum(data):
 # Files to distribute in wheel.
 files = {
   'bazel-bin/sling/pyapi/pysling.so': '$DATA$/sling/pysling.so',
+
   'python/__init__.py': '$DATA$/sling/__init__.py',
+  'python/flags.py': '$DATA$/sling/flags.py',
+  'python/log.py': '$DATA$/sling/log.py',
+
   'python/nlp/__init__.py': '$DATA$/sling/nlp/__init__.py',
   'python/nlp/document.py': '$DATA$/sling/nlp/document.py',
   'python/nlp/parser.py': '$DATA$/sling/nlp/parser.py',
+
+  'python/task/__init__.py': '$DATA$/sling/task/__init__.py',
+  'python/task/corpora.py': '$DATA$/sling/task/corpora.py',
+  'python/task/wiki.py': '$DATA$/sling/task/wiki.py',
+  'python/task/workflow.py': '$DATA$/sling/task/workflow.py',
 }
 
 # Create new wheel zip archive.