Merge pull request #177 from ppasupat/fix-cprune-deps

Fix cprune dependencies

build.xml

@@ -69,7 +69,7 @@
   </target>
 
   <!-- Compile tables -->
-  <target name="tables" depends="init,core,corenlp">
+  <target name="tables" depends="init,core,corenlp,cprune">
     <echo message="Compiling ${ant.project.name}: tables"/>
     <mkdir dir="${classes}/tables"/>
     <javac srcdir="${src}" destdir="${classes}/tables" classpathref="lib.path" debug="true" includeantruntime="false" source="${source}" target="${target}">
@@ -79,7 +79,7 @@
   </target>
 
   <!-- Compile cprune -->
-  <target name="cprune" depends="init,core,corenlp,tables">
+  <target name="cprune" depends="init,core">
     <echo message="Compiling ${ant.project.name}: cprune"/>
     <mkdir dir="${classes}/cprune"/>
     <javac srcdir="${src}" destdir="${classes}/cprune" classpathref="lib.path" debug="true" includeantruntime="false" source="${source}" target="${target}">

pull-dependencies

@@ -256,6 +256,11 @@ addModule('tables-data-0.5', 'WikiTableQuestions dataset v0.5 (for backward repr
   system "cd lib/data && unzip WikiTableQuestions-0.5-compact.zip" or exit 1
 })
 
+addModule('tables-cprune', 'Neighbor information for applying macro grammar on tables', lambda {
+  pull('/u/nlp/data/semparse/cprune/nn_0.zip', 'data/nn_0', {:symlink => true})
+  system "cd lib/data/nn_0 && unzip nn_0.zip" or exit 1
+})
+
 addModule('overnight', 'Creating a parser for multiple domains', lambda {
   # Geo evaluation
   pull('/u/nlp/data/semparse/overnight/geo880.db', 'data/overnight/', {:symlink => true})

run

@@ -593,8 +593,6 @@ addMode('overnight', 'Overnight semantic parsing', l(
       o('FloatingParser.maxDepth', 11),
       o('Grammar.tags','generate','general', 'geo880'),
       o('SimpleLexicon.inPaths', 'lib/data/overnight/geo880.lexicon'),
-      o('OvernightDerivationPruningComputer.usePredicateDict'),
-      o('OvernightDerivationPruningComputer.predicateDictPath','lib/data/overnight/geo880.predicate.dict'),
     nil),
     'calendar' => l(
       o('Grammar.tags','generate','general'),

tables/README.md

@@ -71,6 +71,7 @@ type conversion.
 
 To get the official number of a trained model, run
 
+    ./pull-dependencies tables-cprune
     ./run @mode=tables @data=u-1 @feat=all @train=0 -Derivation.showValues -Builder.inParamsPath path/to/params
 
 (Change the `@data` other options to match the ones used during training.)