Permalink
Browse files

Make cvlm-owlqn the default estimator. As a result, README now says t…

…hat Petsc/Tao are optional.
  • Loading branch information...
1 parent c672258 commit 7dd3f425f936f9fef32c672e35632706b8fac41a @dmcc dmcc committed Apr 2, 2012
Showing with 15 additions and 9 deletions.
  1. +5 −2 Makefile
  2. +10 −7 README
View
@@ -169,11 +169,14 @@ FEATURESNICKNAME=sp
# perceptron). If you decide to use a different feature weight
# estimator you should also change ESTIMATORNICKNAME below.
#
-ESTIMATOR=second-stage/programs/wlle/cvlm
+ESTIMATOR=second-stage/programs/wlle/cvlm-owlqn
# ESTIMATORFLAGS are flags given to the estimator
#
-ESTIMATORFLAGS=-l 1 -c0 10 -Pyx_factor 1 -debug 10 -ns -1
+# These flags are for cvlm-owlqn:
+ESTIMATORFLAGS=-l 1 -c 10 -F 1 -d 10 -n -1
+# The equivalent ESTIMATORFLAGS for cvlm:
+# ESTIMATORFLAGS=-l 1 -c0 10 -Pyx_factor 1 -debug 10 -ns -1
# ESTIMATORNICKNAME is used to name the feature weights file
#
View
17 README
@@ -84,11 +84,13 @@ machine this is:
PENNWSJTREEBANK=/usr/local/data/Penn3/parsed/mrg/wsj/
-You'll also need the Boost C++ and the Petsc/Tao C++ libraries in
-order to retrain the reranker. The environment variables PETSC_DIR
-and TAO_DIR should all point to the installation directories of this
-software. I define these variables in my .login file as follows on my
-machine.
+If you're using cvlm as your estimator (note that this is no longer the
+default), you'll also need the Boost C++ and the Petsc/Tao C++ libraries
+in order to retrain the reranker. If you're using cvlm-owlqn as your
+estimator, you can ignore these steps. Install instructions for Petsc/Tao
+are given later in this document. The environment variables PETSC_DIR and
+TAO_DIR should all point to the installation directories of this software.
+I define these variables in my .login file as follows on my machine.
setenv PETSC_DIR /usr/local/share/petsc
setenv TAO_DIR /usr/local/share/tao
@@ -199,8 +201,9 @@ Then run oparse.sh, rather than parse.sh.
INSTALLING PETSC AND TAO
========================
-You'll need to have PETSc and Tao installed in order to
-retrain the reranker.
+If you're using cvlm as your estimator, you'll need to have PETSc and
+Tao installed in order to retrain the reranker. Otherwise, you can
+safely ignore this section.
These installation instructions work for gcc version 4.2.1 (you also
need g++ and gfortran).

0 comments on commit 7dd3f42

Please sign in to comment.