Permalink
Browse files

Use cvlm-lbfgs in more Makefiles/scripts

Updated the ESTIMATOR* variables to use cvlm-lbfgs.

Thanks to Marten Van Schijndel for pointing this out!
  • Loading branch information...
1 parent b6834a0 commit 0de2d1038798b8e1dbf7a577650d7ec64d2235fc @dmcc dmcc committed Mar 15, 2014
Showing with 24 additions and 12 deletions.
  1. +1 −1 Makefile
  2. +2 −2 Makefile.splh
  3. +7 −3 eval-reranker.sh
  4. +7 −3 nfeatures-train-eval-reranker.sh
  5. +7 −3 train-eval-reranker.sh
View
@@ -198,7 +198,7 @@ ESTIMATORFLAGS=-l 1 -c 10 -F 1 -n -1 -p 2
# ESTIMATORNICKNAME is used to name the feature weights file
#
-ESTIMATORNICKNAME=cvlm-lbfgs
+ESTIMATORNICKNAME=lbfgs-l1c10F1n1p2
# ESTIMATORSTACKSIZE is the size (in KB) of the per-thread stacks
# used during estimation
View
@@ -169,15 +169,15 @@ FEATURESNICKNAME=splh
# 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-lbfgs
# ESTIMATORFLAGS are flags given to the estimator
#
ESTIMATORFLAGS=-l 1 -c0 10 -Pyx_factor 1 -debug 10 -ns -1
# ESTIMATORNICKNAME
#
-ESTIMATORNICKNAME=cvlm-l1c10P1
+ESTIMATORNICKNAME=lbfgs-l1c10F1n1p2
########################################################################
#
View
@@ -30,13 +30,17 @@ FEATUREEXTRACTOR=second-stage/programs/features/extract-nfeatures
FEATUREEXTRACTORFLAGS="-l -c -i -s 5 -f splh"
FEATURESNICKNAME=splh
+ESTIMATOR=second-stage/programs/wlle/cvlm-lbfgs
+ESTIMATORFLAGS=-l 1 -c 10 -F 1 -n -1 -p 2
+ESTIMATORNICKNAME=lbfgs-l1c10F1n1p2
+
# ESTIMATOR=second-stage/programs/wlle/cvlm
# ESTIMATORFLAGS="-l 1 -c0 10 -Pyx_factor 1 -debug 10 -ns -1"
# ESTIMATORNICKNAME=cvlm-l1c10P1-openmp
-ESTIMATOR=second-stage/programs/wlle/cvlm-owlqn
-ESTIMATORFLAGS="-l 1 -c 10 -F 1 -d 10 -n -1 -t 1e-7"
-ESTIMATORNICKNAME=owlqn-l1c10t1e-7
+# ESTIMATOR=second-stage/programs/wlle/cvlm-owlqn
+# ESTIMATORFLAGS="-l 1 -c 10 -F 1 -d 10 -n -1 -t 1e-7"
+# ESTIMATORNICKNAME=owlqn-l1c10t1e-7
# ESTIMATOR=second-stage/programs/wlle/cvlm-owlqn
# ESTIMATORFLAGS="-l 1 -p 1 -c 10 -F 1 -d 10 -n -1 -t 1e-7"
@@ -26,11 +26,15 @@ FEATUREEXTRACTOR=second-stage/programs/features/extract-nfeatures
FEATUREEXTRACTORFLAGS="-l -c -i -s 5 -f splhnn"
FEATURESNICKNAME=splhnn
-ESTIMATOR=second-stage/programs/wlle/cvlm
+ESTIMATOR=second-stage/programs/wlle/cvlm-lbfgs
+ESTIMATORFLAGS=-l 1 -c 10 -F 1 -n -1 -p 2
+ESTIMATORNICKNAME=lbfgs-l1c10F1n1p2
+
+# ESTIMATOR=second-stage/programs/wlle/cvlm
# ESTIMATORFLAGS="-l 1 -c0 10 -Pyx_factor 1 -debug 10 -ns -1"
# ESTIMATORNICKNAME=cvlm-l1c10P1
-ESTIMATORFLAGS="-l 2 -c0 10 -Pyx_factor 1 -debug 10 -ns -1"
-ESTIMATORNICKNAME=cvlm-l2c10P1
+# ESTIMATORFLAGS="-l 2 -c0 10 -Pyx_factor 1 -debug 10 -ns -1"
+# ESTIMATORNICKNAME=cvlm-l2c10P1
# ESTIMATOR=second-stage/programs/wlle/cvlm-owlqn
# ESTIMATORFLAGS="-l 1 -c 10 -F 1 -d 10 -n -1 -p 1 -t 1e-7"
View
@@ -26,9 +26,13 @@ FEATURESNICKNAME=spnn
FEATUREEXTRACTOR=second-stage/programs/features/extract-spfeatures
FEATUREEXTRACTORFLAGS="-l -c -i -s 5 -f $FEATURESNICKNAME"
-ESTIMATOR=second-stage/programs/wlle/cvlm
-ESTIMATORFLAGS="-l 1 -c0 10 -Pyx_factor 1 -debug 10 -ns -1"
-ESTIMATORNICKNAME=cvlm-l1c10P1
+ESTIMATOR=second-stage/programs/wlle/cvlm-lbfgs
+ESTIMATORFLAGS=-l 1 -c 10 -F 1 -n -1 -p 2
+ESTIMATORNICKNAME=lbfgs-l1c10F1n1p2
+
+# ESTIMATOR=second-stage/programs/wlle/cvlm
+# ESTIMATORFLAGS="-l 1 -c0 10 -Pyx_factor 1 -debug 10 -ns -1"
+# ESTIMATORNICKNAME=cvlm-l1c10P1
# ESTIMATOR=second-stage/programs/wlle/cvlm-owlqn
# ESTIMATORFLAGS="-l 1 -c 10 -F 1 -d 10 -n -1 -p 1 -t 1e-7"

0 comments on commit 0de2d10

Please sign in to comment.