You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@systemml.apache.org by du...@apache.org on 2016/05/05 18:49:23 UTC
incubator-systemml git commit: [SYSTEMML-265] Update All Performance
Tests to Use More Iterations.
Repository: incubator-systemml
Updated Branches:
refs/heads/master 0678ecfc1 -> 4a5129308
[SYSTEMML-265] Update All Performance Tests to Use More Iterations.
This change consistently updates the number of max iterations for the performance tests to 20, which fixes previous issues.
Closes #114.
Project: http://git-wip-us.apache.org/repos/asf/incubator-systemml/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-systemml/commit/4a512930
Tree: http://git-wip-us.apache.org/repos/asf/incubator-systemml/tree/4a512930
Diff: http://git-wip-us.apache.org/repos/asf/incubator-systemml/diff/4a512930
Branch: refs/heads/master
Commit: 4a5129308a44f1427ebaed692864f932671f01ee
Parents: 0678ecf
Author: Tatsuya.Nishiyama <ni...@gmail.com>
Authored: Thu May 5 11:48:39 2016 -0700
Committer: Mike Dusenberry <mw...@us.ibm.com>
Committed: Thu May 5 11:48:39 2016 -0700
----------------------------------------------------------------------
scripts/perftest/runAllBinomial.sh | 3 ++-
scripts/perftest/runAllClustering.sh | 3 ++-
scripts/perftest/runAllMultinomial.sh | 12 ++++++++++--
scripts/perftest/runAllRegression.sh | 14 +++++++++++---
scripts/perftest/runGLM_binomial_probit.sh | 2 +-
scripts/perftest/runGLM_gamma_log.sh | 2 +-
scripts/perftest/runGLM_poisson_log.sh | 2 +-
scripts/perftest/runL2SVM.sh | 2 +-
scripts/perftest/runLinearRegCG.sh | 2 +-
scripts/perftest/runMSVM.sh | 2 +-
scripts/perftest/runMultiLogReg.sh | 2 +-
11 files changed, 32 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/4a512930/scripts/perftest/runAllBinomial.sh
----------------------------------------------------------------------
diff --git a/scripts/perftest/runAllBinomial.sh b/scripts/perftest/runAllBinomial.sh
index 968b1de..5bd973f 100755
--- a/scripts/perftest/runAllBinomial.sh
+++ b/scripts/perftest/runAllBinomial.sh
@@ -39,11 +39,12 @@ echo $2"-- Generating binomial data: " >> times.txt;
./genBinomialData.sh $1 $2 &>> logs/genBinomialData.out
# run all classifiers with binomial labels on all datasets
+MAXITR=20
for d in "10k_1k_dense" "10k_1k_sparse" # "100k_1k_dense" "100k_1k_sparse" "1M_1k_dense" "1M_1k_sparse" "10M_1k_dense" "10M_1k_sparse" #"_KDD" "100M_1k_dense" "100M_1k_sparse"
do
for f in "runMultiLogReg" "runL2SVM" "runMSVM"
do
echo "-- Running "$f" on "$d" (all configs): " >> times.txt;
- ./${f}.sh ${BASE}/X${d} ${BASE}/y${d} 2 ${BASE} $2 &> logs/${f}_${d}.out;
+ ./${f}.sh ${BASE}/X${d} ${BASE}/y${d} 2 ${BASE} $2 ${MAXITR} &> logs/${f}_${d}.out;
done
done
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/4a512930/scripts/perftest/runAllClustering.sh
----------------------------------------------------------------------
diff --git a/scripts/perftest/runAllClustering.sh b/scripts/perftest/runAllClustering.sh
index ea97a53..0d5a533 100755
--- a/scripts/perftest/runAllClustering.sh
+++ b/scripts/perftest/runAllClustering.sh
@@ -39,9 +39,10 @@ echo "-- Using cluster data." >> times.txt;
./genClusteringData.sh $1 $2 &>> logs/genClusteringData.out
# run all clustering algorithms on all datasets
+MAXITR=20
for d in "10k_1k_dense" #"100k_1k_dense" "1M_1k_dense" #"10M_1k_dense" #"100M_1k_dense"
do
echo "-- Running Kmeans on "$d >> times.txt;
- ./runKmeans.sh ${BASE}/X${d} 3 ${BASE} $2 &> logs/runKmeans_${d}.out;
+ ./runKmeans.sh ${BASE}/X${d} ${MAXITR} ${BASE} $2 &> logs/runKmeans_${d}.out;
done
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/4a512930/scripts/perftest/runAllMultinomial.sh
----------------------------------------------------------------------
diff --git a/scripts/perftest/runAllMultinomial.sh b/scripts/perftest/runAllMultinomial.sh
index 3c60c84..c7cc76e 100755
--- a/scripts/perftest/runAllMultinomial.sh
+++ b/scripts/perftest/runAllMultinomial.sh
@@ -41,13 +41,21 @@ echo "-- Generating multinomial data." >> times.txt;
./genMultinomialData.sh $1 $2 &>> logs/genMultinomialData.out
# run all classifiers with binomial labels on all datasets
+MAXITR=20
for d in "10k_1k_dense" "10k_1k_sparse" # "100k_1k_dense" "100k_1k_sparse" "1M_1k_dense" "1M_1k_sparse" "10M_1k_dense" "10M_1k_sparse" "100M_1k_dense" "100M_1k_sparse"
do
- for f in "runMultiLogReg" "runMSVM" "runNaiveBayes"
+ for f in "runNaiveBayes"
do
echo "-- Running "$f" on "$d" (all configs)" >> times.txt;
./${f}.sh ${BASE}/X${d}_k150 ${BASE}/y${d}_k150 150 ${BASE} $2 &> logs/${f}_${d}_k150.out;
- done
+ done
+
+ # run with the parameter setting maximum of iterations
+ for f in "runMultiLogReg" "runMSVM"
+ do
+ echo "-- Running "$f" on "$d" (all configs)" >> times.txt;
+ ./${f}.sh ${BASE}/X${d}_k150 ${BASE}/y${d}_k150 150 ${BASE} $2 ${MAXITR} &> logs/${f}_${d}_k150.out;
+ done
done
#run KDD only on naive bayes (see binomial for the others)
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/4a512930/scripts/perftest/runAllRegression.sh
----------------------------------------------------------------------
diff --git a/scripts/perftest/runAllRegression.sh b/scripts/perftest/runAllRegression.sh
index 5f5bdf9..2ec0a30 100755
--- a/scripts/perftest/runAllRegression.sh
+++ b/scripts/perftest/runAllRegression.sh
@@ -39,11 +39,19 @@ echo $2"-- Using binomial data: " >> times.txt;
./genBinomialData.sh $1 $2 &>> logs/genBinomialData.out
# run all regression algorithms with binomial labels on all datasets
+MAXITR=20
for d in "10k_1k_dense" "10k_1k_sparse" # "100k_1k_dense" "100k_1k_sparse" "1M_1k_dense" "1M_1k_sparse" "10M_1k_dense" "10M_1k_sparse" #"_KDD" "100M_1k_dense" "100M_1k_sparse"
-do
- for f in "runLinearRegDS" "runLinearRegCG" "runGLM_poisson_log" "runGLM_gamma_log" "runGLM_binomial_probit"
+do
+ for f in "runLinearRegDS"
+ do
+ echo "-- Running "$f" on "$d" (all configs)" >> times.txt;
+ ./${f}.sh ${BASE}/X${d} ${BASE}/y${d} ${BASE} $2 &> logs/${f}_${d}.out;
+ done
+
+ # run with the parameter setting maximum of iterations
+ for f in "runLinearRegCG" "runGLM_poisson_log" "runGLM_gamma_log" "runGLM_binomial_probit"
do
echo "-- Running "$f" on "$d" (all configs)" >> times.txt;
- ./${f}.sh ${BASE}/X${d} ${BASE}/y${d} ${BASE} $2 &> logs/${f}_${d}.out;
+ ./${f}.sh ${BASE}/X${d} ${BASE}/y${d} ${BASE} $2 ${MAXITR} &> logs/${f}_${d}.out;
done
done
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/4a512930/scripts/perftest/runGLM_binomial_probit.sh
----------------------------------------------------------------------
diff --git a/scripts/perftest/runGLM_binomial_probit.sh b/scripts/perftest/runGLM_binomial_probit.sh
index 316e245..c644c0a 100755
--- a/scripts/perftest/runGLM_binomial_probit.sh
+++ b/scripts/perftest/runGLM_binomial_probit.sh
@@ -34,7 +34,7 @@ do
#training
tstart=$SECONDS
- ${CMD} -f ../algorithms/GLM.dml $DASH-explain $DASH-stats $DASH-nvargs X=$1 Y=$2 B=${BASE}/b icpt=${i} fmt="csv" moi=3 mii=5 dfam=2 link=3 yneg=2 tol=0.0001 reg=0.01
+ ${CMD} -f ../algorithms/GLM.dml $DASH-explain $DASH-stats $DASH-nvargs X=$1 Y=$2 B=${BASE}/b icpt=${i} fmt="csv" moi=$5 mii=5 dfam=2 link=3 yneg=2 tol=0.0001 reg=0.01
ttrain=$(($SECONDS - $tstart - 3))
echo "GLM_binomial_probit train ict="$i" on "$1": "$ttrain >> times.txt
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/4a512930/scripts/perftest/runGLM_gamma_log.sh
----------------------------------------------------------------------
diff --git a/scripts/perftest/runGLM_gamma_log.sh b/scripts/perftest/runGLM_gamma_log.sh
index 099851c..9d920f7 100755
--- a/scripts/perftest/runGLM_gamma_log.sh
+++ b/scripts/perftest/runGLM_gamma_log.sh
@@ -34,7 +34,7 @@ do
#training
tstart=$SECONDS
- ${CMD} -f ../algorithms/GLM.dml $DASH-explain $DASH-stats $DASH-nvargs X=$1 Y=$2 B=${BASE}/b icpt=${i} fmt="csv" moi=3 mii=5 dfam=1 vpow=2.0 link=1 lpow=0.0 tol=0.0001 reg=0.01
+ ${CMD} -f ../algorithms/GLM.dml $DASH-explain $DASH-stats $DASH-nvargs X=$1 Y=$2 B=${BASE}/b icpt=${i} fmt="csv" moi=$5 mii=5 dfam=1 vpow=2.0 link=1 lpow=0.0 tol=0.0001 reg=0.01
ttrain=$(($SECONDS - $tstart - 3))
echo "GLM_gamma_log train ict="$i" on "$1": "$ttrain >> times.txt
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/4a512930/scripts/perftest/runGLM_poisson_log.sh
----------------------------------------------------------------------
diff --git a/scripts/perftest/runGLM_poisson_log.sh b/scripts/perftest/runGLM_poisson_log.sh
index f59d3d1..8c32fee 100755
--- a/scripts/perftest/runGLM_poisson_log.sh
+++ b/scripts/perftest/runGLM_poisson_log.sh
@@ -34,7 +34,7 @@ do
#training
tstart=$SECONDS
- ${CMD} -f ../algorithms/GLM.dml $DASH-explain $DASH-stats $DASH-nvargs X=$1 Y=$2 B=${BASE}/b icpt=${i} fmt="csv" moi=3 mii=5 dfam=1 vpow=1.0 link=1 lpow=0.0 tol=0.0001 reg=0.01
+ ${CMD} -f ../algorithms/GLM.dml $DASH-explain $DASH-stats $DASH-nvargs X=$1 Y=$2 B=${BASE}/b icpt=${i} fmt="csv" moi=$5 mii=5 dfam=1 vpow=1.0 link=1 lpow=0.0 tol=0.0001 reg=0.01
ttrain=$(($SECONDS - $tstart - 3))
echo "GLM_poisson_log train ict="$i" on "$1": "$ttrain >> times.txt
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/4a512930/scripts/perftest/runL2SVM.sh
----------------------------------------------------------------------
diff --git a/scripts/perftest/runL2SVM.sh b/scripts/perftest/runL2SVM.sh
index b55931e..8417624 100755
--- a/scripts/perftest/runL2SVM.sh
+++ b/scripts/perftest/runL2SVM.sh
@@ -32,7 +32,7 @@ for i in 0 1
do
#training
tstart=$SECONDS
- ${CMD} -f ../algorithms/l2-svm.dml $DASH-explain $DASH-stats $DASH-nvargs X=$1 Y=$2 icpt=$i tol=0.0001 reg=0.01 maxiter=3 model=${BASE}/b Log=${BASE}/debug_output fmt="csv"
+ ${CMD} -f ../algorithms/l2-svm.dml $DASH-explain $DASH-stats $DASH-nvargs X=$1 Y=$2 icpt=$i tol=0.0001 reg=0.01 maxiter=$6 model=${BASE}/b Log=${BASE}/debug_output fmt="csv"
ttrain=$(($SECONDS - $tstart - 3))
echo "L2SVM train ict="$i" on "$1": "$ttrain >> times.txt
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/4a512930/scripts/perftest/runLinearRegCG.sh
----------------------------------------------------------------------
diff --git a/scripts/perftest/runLinearRegCG.sh b/scripts/perftest/runLinearRegCG.sh
index e11a078..87bc1a0 100755
--- a/scripts/perftest/runLinearRegCG.sh
+++ b/scripts/perftest/runLinearRegCG.sh
@@ -34,7 +34,7 @@ do
#training
tstart=$SECONDS
- ${CMD} -f ../algorithms/LinearRegCG.dml $DASH-explain $DASH-stats $DASH-nvargs X=$1 Y=$2 B=${BASE}/b icpt=${i} fmt="csv" maxi=3 tol=0.0001 reg=0.01
+ ${CMD} -f ../algorithms/LinearRegCG.dml $DASH-explain $DASH-stats $DASH-nvargs X=$1 Y=$2 B=${BASE}/b icpt=${i} fmt="csv" maxi=$5 tol=0.0001 reg=0.01
ttrain=$(($SECONDS - $tstart - 3))
echo "LinRegCG train ict="$i" on "$1": "$ttrain >> times.txt
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/4a512930/scripts/perftest/runMSVM.sh
----------------------------------------------------------------------
diff --git a/scripts/perftest/runMSVM.sh b/scripts/perftest/runMSVM.sh
index 079cd5c..30b550b 100755
--- a/scripts/perftest/runMSVM.sh
+++ b/scripts/perftest/runMSVM.sh
@@ -32,7 +32,7 @@ for i in 0 1
do
#training
tstart=$SECONDS
- ${CMD} -f ../algorithms/m-svm.dml $DASH-explain $DASH-stats $DASH-nvargs X=$1 Y=$2 icpt=$i classes=$3 tol=0.0001 reg=0.01 maxiter=3 model=${BASE}/w Log=${BASE}/debug_output fmt="csv"
+ ${CMD} -f ../algorithms/m-svm.dml $DASH-explain $DASH-stats $DASH-nvargs X=$1 Y=$2 icpt=$i classes=$3 tol=0.0001 reg=0.01 maxiter=$6 model=${BASE}/w Log=${BASE}/debug_output fmt="csv"
ttrain=$(($SECONDS - $tstart - 3))
echo "MSVM train ict="$i" on "$1": "$ttrain >> times.txt
http://git-wip-us.apache.org/repos/asf/incubator-systemml/blob/4a512930/scripts/perftest/runMultiLogReg.sh
----------------------------------------------------------------------
diff --git a/scripts/perftest/runMultiLogReg.sh b/scripts/perftest/runMultiLogReg.sh
index 17afde7..4e007bb 100755
--- a/scripts/perftest/runMultiLogReg.sh
+++ b/scripts/perftest/runMultiLogReg.sh
@@ -38,7 +38,7 @@ for i in 0 1 2
do
#training
tstart=$SECONDS
- ${CMD} -f ../algorithms/MultiLogReg.dml $DASH-explain $DASH-stats $DASH-nvargs icpt=$i reg=0.01 tol=0.0001 moi=3 mii=5 X=$1 Y=$2 B=${BASE}/b
+ ${CMD} -f ../algorithms/MultiLogReg.dml $DASH-explain $DASH-stats $DASH-nvargs icpt=$i reg=0.01 tol=0.0001 moi=$6 mii=5 X=$1 Y=$2 B=${BASE}/b
ttrain=$(($SECONDS - $tstart - 3))
echo "MultiLogReg train ict="$i" on "$1": "$ttrain >> times.txt