Repository: systemml
Updated Branches:
  refs/heads/master 44439400c -> 918e57937


[MINOR] Change # of classes in multinomial family scripts


Project: http://git-wip-us.apache.org/repos/asf/systemml/repo
Commit: http://git-wip-us.apache.org/repos/asf/systemml/commit/918e5793
Tree: http://git-wip-us.apache.org/repos/asf/systemml/tree/918e5793
Diff: http://git-wip-us.apache.org/repos/asf/systemml/diff/918e5793

Branch: refs/heads/master
Commit: 918e57937dc6476ae27744a37f400e0a5e0997e6
Parents: 4443940
Author: Arvind Surve <ac...@yahoo.com>
Authored: Mon Sep 11 10:48:12 2017 -0700
Committer: Arvind Surve <ac...@yahoo.com>
Committed: Mon Sep 11 10:48:12 2017 -0700

----------------------------------------------------------------------
 scripts/perftest/genMultinomialData.sh | 40 ++++++++++++++---------------
 scripts/perftest/runAllMultinomial.sh  |  8 +++---
 2 files changed, 24 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/systemml/blob/918e5793/scripts/perftest/genMultinomialData.sh
----------------------------------------------------------------------
diff --git a/scripts/perftest/genMultinomialData.sh 
b/scripts/perftest/genMultinomialData.sh
index 313a32d..bf8ed0c 100755
--- a/scripts/perftest/genMultinomialData.sh
+++ b/scripts/perftest/genMultinomialData.sh
@@ -33,31 +33,31 @@ SPARSE_SP=0.01
 export HADOOP_CLIENT_OPTS="-Xmx2048m -Xms2048m -Xmn256m"
 
 #generate XS scenarios (80MB)
-${CMD} -f ../datagen/genRandData4Multinomial.dml $DASH-args 10000 1000 
$DENSE_SP 150 0 $BASE/X10k_1k_dense_k150 $BASE/y10k_1k_dense_k150 $FORMAT 1
-${CMD} -f ../datagen/genRandData4Multinomial.dml $DASH-args 10000 1000 
$SPARSE_SP 150 0 $BASE/X10k_1k_sparse_k150 $BASE/y10k_1k_sparse_k150 $FORMAT 1
-${CMD} -f extractTestData.dml $DASH-args $BASE/X10k_1k_dense_k150 
$BASE/y10k_1k_dense_k150 $BASE/X10k_1k_dense_k150_test 
$BASE/y10k_1k_dense_k150_test $FORMAT
-${CMD} -f extractTestData.dml $DASH-args $BASE/X10k_1k_sparse_k150 
$BASE/y10k_1k_sparse_k150 $BASE/X10k_1k_sparse_k150_test 
$BASE/y10k_1k_sparse_k150_test $FORMAT
+${CMD} -f ../datagen/genRandData4Multinomial.dml $DASH-args 10000 1000 
$DENSE_SP 5 0 $BASE/X10k_1k_dense_k5 $BASE/y10k_1k_dense_k5 $FORMAT 1
+${CMD} -f ../datagen/genRandData4Multinomial.dml $DASH-args 10000 1000 
$SPARSE_SP 5 0 $BASE/X10k_1k_sparse_k5 $BASE/y10k_1k_sparse_k5 $FORMAT 1
+${CMD} -f extractTestData.dml $DASH-args $BASE/X10k_1k_dense_k5 
$BASE/y10k_1k_dense_k5 $BASE/X10k_1k_dense_k5_test $BASE/y10k_1k_dense_k5_test 
$FORMAT
+${CMD} -f extractTestData.dml $DASH-args $BASE/X10k_1k_sparse_k5 
$BASE/y10k_1k_sparse_k5 $BASE/X10k_1k_sparse_k5_test 
$BASE/y10k_1k_sparse_k5_test $FORMAT
 
 ##generate S scenarios (80MB)
-#${CMD} -f ../datagen/genRandData4Multinomial.dml $DASH-args 100000 1000 
$DENSE_SP 150 0 $BASE/X100k_1k_dense_k150 $BASE/y100k_1k_dense_k150 $FORMAT 1
-#${CMD} -f ../datagen/genRandData4Multinomial.dml $DASH-args 100000 1000 
$SPARSE_SP 150 0 $BASE/X100k_1k_sparse_k150 $BASE/y100k_1k_sparse_k150 $FORMAT 1
-#${CMD} -f extractTestData.dml $DASH-args $BASE/X100k_1k_dense_k150 
$BASE/y100k_1k_dense_k150 $BASE/X100k_1k_dense_k150_test 
$BASE/y100k_1k_dense_k150_test $FORMAT
-#${CMD} -f extractTestData.dml $DASH-args $BASE/X100k_1k_sparse_k150 
$BASE/y100k_1k_sparse_k150 $BASE/X100k_1k_sparse_k150_test 
$BASE/y100k_1k_sparse_k150_test $FORMAT
+#${CMD} -f ../datagen/genRandData4Multinomial.dml $DASH-args 100000 1000 
$DENSE_SP 5 0 $BASE/X100k_1k_dense_k5 $BASE/y100k_1k_dense_k5 $FORMAT 1
+#${CMD} -f ../datagen/genRandData4Multinomial.dml $DASH-args 100000 1000 
$SPARSE_SP 5 0 $BASE/X100k_1k_sparse_k5 $BASE/y100k_1k_sparse_k5 $FORMAT 1
+#${CMD} -f extractTestData.dml $DASH-args $BASE/X100k_1k_dense_k5 
$BASE/y100k_1k_dense_k5 $BASE/X100k_1k_dense_k5_test 
$BASE/y100k_1k_dense_k5_test $FORMAT
+#${CMD} -f extractTestData.dml $DASH-args $BASE/X100k_1k_sparse_k5 
$BASE/y100k_1k_sparse_k5 $BASE/X100k_1k_sparse_k5_test 
$BASE/y100k_1k_sparse_k5_test $FORMAT
 #
 ##generate M scenarios (8GB)
-#${CMD} -f ../datagen/genRandData4Multinomial.dml $DASH-args 1000000 1000 
$DENSE_SP 150 0 $BASE/X1M_1k_dense_k150 $BASE/y1M_1k_dense_k150 $FORMAT 1
-#${CMD} -f ../datagen/genRandData4Multinomial.dml $DASH-args 1000000 1000 
$SPARSE_SP 150 0 $BASE/X1M_1k_sparse_k150 $BASE/y1M_1k_sparse_k150 $FORMAT 1
-#${CMD} -f extractTestData.dml $DASH-args $BASE/X1M_1k_dense_k150 
$BASE/y1M_1k_dense_k150 $BASE/X1M_1k_dense_k150_test 
$BASE/y1M_1k_dense_k150_test $FORMAT
-#${CMD} -f extractTestData.dml $DASH-args $BASE/X1M_1k_sparse_k150 
$BASE/y1M_1k_sparse_k150 $BASE/X1M_1k_sparse_k150_test 
$BASE/y1M_1k_sparse_k150_test $FORMAT
+#${CMD} -f ../datagen/genRandData4Multinomial.dml $DASH-args 1000000 1000 
$DENSE_SP 5 0 $BASE/X1M_1k_dense_k5 $BASE/y1M_1k_dense_k5 $FORMAT 1
+#${CMD} -f ../datagen/genRandData4Multinomial.dml $DASH-args 1000000 1000 
$SPARSE_SP 5 0 $BASE/X1M_1k_sparse_k5 $BASE/y1M_1k_sparse_k5 $FORMAT 1
+#${CMD} -f extractTestData.dml $DASH-args $BASE/X1M_1k_dense_k5 
$BASE/y1M_1k_dense_k5 $BASE/X1M_1k_dense_k5_test $BASE/y1M_1k_dense_k5_test 
$FORMAT
+#${CMD} -f extractTestData.dml $DASH-args $BASE/X1M_1k_sparse_k5 
$BASE/y1M_1k_sparse_k5 $BASE/X1M_1k_sparse_k5_test $BASE/y1M_1k_sparse_k5_test 
$FORMAT
 #
 ##generate L scenarios (80GB)
-#${CMD} -f ../datagen/genRandData4Multinomial.dml $DASH-args 10000000 1000 
$DENSE_SP 150 0 $BASE/X10M_1k_dense_k150 $BASE/y10M_1k_dense_k150 $FORMAT 1
-#${CMD} -f ../datagen/genRandData4Multinomial.dml $DASH-args 10000000 1000 
$SPARSE_SP 150 0 $BASE/X10M_1k_sparse_k150 $BASE/y10M_1k_sparse_k150 $FORMAT 1
-#${CMD} -f extractTestData.dml $DASH-args $BASE/X10M_1k_dense_k150 
$BASE/y10M_1k_dense_k150 $BASE/X10M_1k_dense_k150_test 
$BASE/y10M_1k_dense_k150_test $FORMAT
-#${CMD} -f extractTestData.dml $DASH-args $BASE/X10M_1k_sparse_k150 
$BASE/y10M_1k_sparse_k150 $BASE/X10M_1k_sparse_k150_test 
$BASE/y10M_1k_sparse_k150_test $FORMAT
+#${CMD} -f ../datagen/genRandData4Multinomial.dml $DASH-args 10000000 1000 
$DENSE_SP 5 0 $BASE/X10M_1k_dense_k5 $BASE/y10M_1k_dense_k5 $FORMAT 1
+#${CMD} -f ../datagen/genRandData4Multinomial.dml $DASH-args 10000000 1000 
$SPARSE_SP 5 0 $BASE/X10M_1k_sparse_k5 $BASE/y10M_1k_sparse_k5 $FORMAT 1
+#${CMD} -f extractTestData.dml $DASH-args $BASE/X10M_1k_dense_k5 
$BASE/y10M_1k_dense_k5 $BASE/X10M_1k_dense_k5_test $BASE/y10M_1k_dense_k5_test 
$FORMAT
+#${CMD} -f extractTestData.dml $DASH-args $BASE/X10M_1k_sparse_k5 
$BASE/y10M_1k_sparse_k5 $BASE/X10M_1k_sparse_k5_test 
$BASE/y10M_1k_sparse_k5_test $FORMAT
 #
 ##generate LARGE scenarios (800GB)
-#${CMD} -f ../datagen/genRandData4Multinomial.dml $DASH-args 100000000 1000 
$DENSE_SP 150 0 $BASE/X100M_1k_dense_k150 $BASE/y100M_1k_dense_k150 $FORMAT 1
-#${CMD} -f ../datagen/genRandData4Multinomial.dml $DASH-args 100000000 1000 
$SPARSE_SP 150 0 $BASE/X100M_1k_sparse_k150 $BASE/y100M_1k_sparse_k150 $FORMAT 1
-#${CMD} -f extractTestData.dml $DASH-args $BASE/X100M_1k_dense_k150 
$BASE/y100M_1k_dense_k150 $BASE/X100M_1k_dense_k150_test 
$BASE/y100M_1k_dense_k150_test $FORMAT
-#${CMD} -f extractTestData.dml $DASH-args $BASE/X100M_1k_sparse_k150 
$BASE/y100M_1k_sparse_k150 $BASE/X100M_1k_sparse_k150_test 
$BASE/y100M_1k_sparse_k150_test $FORMAT
+#${CMD} -f ../datagen/genRandData4Multinomial.dml $DASH-args 100000000 1000 
$DENSE_SP 5 0 $BASE/X100M_1k_dense_k5 $BASE/y100M_1k_dense_k5 $FORMAT 1
+#${CMD} -f ../datagen/genRandData4Multinomial.dml $DASH-args 100000000 1000 
$SPARSE_SP 5 0 $BASE/X100M_1k_sparse_k5 $BASE/y100M_1k_sparse_k5 $FORMAT 1
+#${CMD} -f extractTestData.dml $DASH-args $BASE/X100M_1k_dense_k5 
$BASE/y100M_1k_dense_k5 $BASE/X100M_1k_dense_k5_test 
$BASE/y100M_1k_dense_k5_test $FORMAT
+#${CMD} -f extractTestData.dml $DASH-args $BASE/X100M_1k_sparse_k5 
$BASE/y100M_1k_sparse_k5 $BASE/X100M_1k_sparse_k5_test 
$BASE/y100M_1k_sparse_k5_test $FORMAT

http://git-wip-us.apache.org/repos/asf/systemml/blob/918e5793/scripts/perftest/runAllMultinomial.sh
----------------------------------------------------------------------
diff --git a/scripts/perftest/runAllMultinomial.sh 
b/scripts/perftest/runAllMultinomial.sh
index c7cc76e..7a32cb5 100755
--- a/scripts/perftest/runAllMultinomial.sh
+++ b/scripts/perftest/runAllMultinomial.sh
@@ -47,18 +47,18 @@ do
    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;       
+      ./${f}.sh ${BASE}/X${d}_k5 ${BASE}/y${d}_k5 5 ${BASE} $2 &> 
logs/${f}_${d}_k5.out;       
    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;       
+      ./${f}.sh ${BASE}/X${d}_k5 ${BASE}/y${d}_k5 5 ${BASE} $2 ${MAXITR} &> 
logs/${f}_${d}_k5.out;       
    done
 done
 
 #run KDD only on naive bayes (see binomial for the others)
-#./runNaiveBayes.sh ${BASE0}/X_KDD_k150 ${BASE}/y_KDD_k150 150 &> 
logs/runNaiveBayes__KDD_k150.out;       
-#./runNaiveBayes.sh ${BASE0}/X_KDD ${BASE}/y_KDD 150 &> 
logs/runNaiveBayes__KDD_k150.out;       
+#./runNaiveBayes.sh ${BASE0}/X_KDD_k5 ${BASE}/y_KDD_k5 5 &> 
logs/runNaiveBayes__KDD_k5.out;       
+#./runNaiveBayes.sh ${BASE0}/X_KDD ${BASE}/y_KDD 5 &> 
logs/runNaiveBayes__KDD_k5.out;       
    

Reply via email to