From 4c765362d0a5162d2ac781bf3b3acea76fe6a6f0 Mon Sep 17 00:00:00 2001
From: Sida Wang <sidaw@cs.stanford.edu>
Date: Fri, 17 Mar 2017 22:08:24 -0700
Subject: [PATCH] outerloop stuff

---
 build.xml         | 67 -----------------------------------------------
 pull-dependencies |  5 ----
 run               | 12 ++++-----
 shrdlurn/run      |  4 +++
 4 files changed, 9 insertions(+), 79 deletions(-)

diff --git a/build.xml b/build.xml
index 18c20e3..aebef55 100644
--- a/build.xml
+++ b/build.xml
@@ -23,9 +23,6 @@
   <!-- Compile -->
   <target name="compile" depends="init">
     <antcall target="compile.released"/>
-    <!-- BEGIN_HIDE -->
-    <antcall target="compile.internal"/>
-    <!-- END_HIDE -->
   </target>
 
   <target name="compile.released" depends="init,core,cache,corenlp,freebase,tables,overnight"/>
@@ -100,69 +97,6 @@
     </javac>
     <jar destfile="${libsempre}/sempre-interactive.jar" basedir="${classes}/interactive"/>
   </target>
-	
-  <!-- BEGIN_HIDE -->
-  <target name="compile.internal" depends="fbalignment,paraphrase,clojure,regex,jungle,logicpuzzles"/>
-
-  <!-- Compile fbalignment -->
-  <target name="fbalignment" depends="init,freebase">
-    <echo message="Compiling ${ant.project.name}: fbalignment"/>
-    <mkdir dir="${classes}/fbalignment"/>
-    <javac srcdir="${src}" destdir="${classes}/fbalignment" classpathref="lib.path" debug="true" includeantruntime="false" source="${source}" target="${target}">
-      <include name="edu/stanford/nlp/sempre/fbalignment/"/>
-    </javac>
-    <jar destfile="${libsempre}/sempre-fbalignment.jar" basedir="${classes}/fbalignment"/>
-  </target>
-
-  <!-- Compile paraphrase -->
-  <target name="paraphrase" depends="init,fbalignment">
-    <echo message="Compiling ${ant.project.name}: paraphrase"/>
-    <mkdir dir="${classes}/paraphrase"/>
-    <javac srcdir="${src}" destdir="${classes}/paraphrase" classpathref="lib.path" debug="true" includeantruntime="false" source="${source}" target="${target}">
-      <include name="edu/stanford/nlp/sempre/paraphrase/"/>
-    </javac>
-    <jar destfile="${libsempre}/sempre-paraphrase.jar" basedir="${classes}/paraphrase"/>
-  </target>
-
-  <!-- Compile clojure -->
-  <target name="clojure" depends="init,core">
-    <echo message="Compiling ${ant.project.name}: clojure"/>
-    <mkdir dir="${classes}/clojure"/>
-    <javac srcdir="${src}" destdir="${classes}/clojure" classpathref="lib.path" debug="true" includeantruntime="false" source="${source}" target="${target}">
-      <include name="edu/stanford/nlp/sempre/clojure/"/>
-    </javac>
-    <jar destfile="${libsempre}/sempre-clojure.jar" basedir="${classes}/clojure"/>
-  </target>
-
-  <!-- Compile regex -->
-  <target name="regex" depends="init,core">
-    <echo message="Compiling ${ant.project.name}: regex"/>
-    <mkdir dir="${classes}/regex"/>
-    <javac srcdir="${src}" destdir="${classes}/regex" classpathref="lib.path" debug="true" includeantruntime="false" source="${source}" target="${target}">
-      <include name="edu/stanford/nlp/sempre/regex/"/>
-    </javac>
-    <jar destfile="${libsempre}/sempre-regex.jar" basedir="${classes}/regex"/>
-  </target>
-
-  <!-- Compile jungle -->
-  <target name="jungle" depends="init,core,cache">
-    <echo message="Compiling ${ant.project.name}: jungle"/>
-    <mkdir dir="${classes}/jungle"/>
-    <javac srcdir="${src}" destdir="${classes}/jungle" classpathref="lib.path" debug="true" includeantruntime="false" source="${source}" target="${target}">
-      <include name="edu/stanford/nlp/sempre/jungle/"/>
-    </javac>
-    <jar destfile="${libsempre}/sempre-jungle.jar" basedir="${classes}/jungle"/>
-  </target>
-
-  <!-- Compile logicpuzzles -->
-  <target name="logicpuzzles" depends="init,core">
-    <echo message="Compiling ${ant.project.name}: logicpuzzles"/>
-    <mkdir dir="${classes}/logicpuzzles"/>
-    <javac srcdir="${src}" destdir="${classes}/logicpuzzles" classpathref="lib.path" debug="true" includeantruntime="false" source="${source}" target="${target}">
-      <include name="edu/stanford/nlp/sempre/logicpuzzles/"/>
-    </javac>
-    <jar destfile="${libsempre}/sempre-logicpuzzles.jar" basedir="${classes}/logicpuzzles"/>
-  </target>
 
   <!-- Compile geo880 -->
   <target name="geo880" depends="init,core,corenlp,tables">
@@ -174,7 +108,6 @@
     <jar destfile="${libsempre}/sempre-geo880.jar" basedir="${classes}/geo880"/>
   </target>
 
-  <!-- END_HIDE -->
   <!-- Clean up -->
   <target name="clean">
     <delete includeemptydirs="true" quiet="true">
diff --git a/pull-dependencies b/pull-dependencies
index a71da79..a73e46e 100755
--- a/pull-dependencies
+++ b/pull-dependencies
@@ -290,11 +290,6 @@ addModule('geo880', 'Data, lexicon, grammars and KB for geo880', lambda {
   pull('/u/nlp/data/semparse/geo880/geo880.kg', 'data/geo880', {:symlink => true})
   pull('/u/nlp/data/semparse/geo880/geo880.type_hierarchy', 'data/geo880', {:symlink => true})
 })
-
-# Community server for voxelurn
-addModule('community', 'Community Server', lambda {
-  exec('./community-server/install-deps.py')
-})
 ############################################################
 
 if ARGV.size == 0
diff --git a/run b/run
index 224996b..f4e2a3b 100755
--- a/run
+++ b/run
@@ -75,7 +75,6 @@ addMode('test', 'Run unit tests', lambda { |e|
     lambda { |e|
       e.key?(:sparqlserver) ? "-Dsparqlserver=http://#{e[:sparqlserver]}/sparql" : l()
     },
-    letDefault(:debug, 0), sel(:debug, l(), l('-Xdebug', '-Xrunjdwp:server=y,transport=dt_socket,suspend=y,address=8898')),
     'org.testng.TestNG',
     lambda { |e|
       if e[:class]
@@ -84,7 +83,6 @@ addMode('test', 'Run unit tests', lambda { |e|
         'testng.xml'
       end
     },
-
     lambda { |e|
       if e[:fast]
         o('excludegroups', 'sparql,corenlp')
@@ -217,7 +215,7 @@ def free917
 
     # Grammar
     o('Grammar.inPaths', 'freebase/data/emnlp2013.grammar'),
-    o('Parser.beamSize', 500),
+    o('Parser.beamSize', 500), 
 
     emnlp2013AblationExperiments('free917'),
 
@@ -550,7 +548,7 @@ addMode('overnight', 'Overnight semantic parsing', l(
 
   # Features
   o('FeatureExtractor.featureDomains', 'denotation'), # denotation features from general feature extractor
-  o('FeatureExtractor.featureComputers', 'overnight.OvernightFeatureComputer'), #
+  o('FeatureExtractor.featureComputers', 'overnight.OvernightFeatureComputer'), # 
   o('OvernightFeatureComputer.featureDomains', *overnightFeatureDomains),
   #o('initialization', 'paraphrase :: match,1', 'paraphrase :: size,-0.1', 'paraphrase :: ppdb,0.3',
   #  'paraphrase :: skip-bigram,0.8', 'paraphrase :: skip-ppdb,0.2','denotation :: error,-1000'),
@@ -570,14 +568,14 @@ addMode('overnight', 'Overnight semantic parsing', l(
   o('FloatingParser.maxDepth', 11),
   o('Parser.beamSize', 20),
   letDefault(:alignment, 1),
-  sel(:alignment,
-    o('wordAlignmentPath', lambda { |e| 'lib/data/overnight/' + e[:domain] + '.word_alignments.heuristic' }),
+  sel(:alignment, 
+    o('wordAlignmentPath', lambda { |e| 'lib/data/overnight/' + e[:domain] + '.word_alignments.heuristic' }), 
     o('wordAlignmentPath', lambda { |e| 'lib/data/overnight/' + e[:domain] + '.word_alignments.berkeley' }),
   nil),
   o('phraseAlignmentPath', lambda { |e| 'lib/data/overnight/' + e[:domain] + '.phrase_alignments' }),
   o('PPDBModel.ppdbModelPath', lambda { |e| 'lib/data/overnight/' + e[:domain] + '-ppdb.txt' }),
   o('DerivationPruner.pruningComputers', ['overnight.OvernightDerivationPruningComputer']),
-  o('Dataset.inPaths',
+  o('Dataset.inPaths', 
     lambda { |e| 'train:lib/data/overnight/' + e[:domain] + '.paraphrases.train.examples' },
     lambda { |e| 'test:lib/data/overnight/' + e[:domain] + '.paraphrases.test.examples' }),
   sel(:domain, {
diff --git a/shrdlurn/run b/shrdlurn/run
index 19da503..504920a 100755
--- a/shrdlurn/run
+++ b/shrdlurn/run
@@ -100,6 +100,10 @@ addMode('test', 'Run unit tests for interactive stuff', lambda { |e|
   nil)
 })
 
+addMode('community-dep', 'dependencies for the community server', lambda { |e| l(
+l('python ./community-server/install-deps.py'),
+nil)})
+
 addMode('community', 'start the community server', lambda { |e| l(
 l('python community-server/server.py -- port 8403'),
 nil)})