Merge pull request #514 from starsblinking/ALSrun

AlSrun

Author: Meng, Peng

bin/functions/hibench_prop_env_mapping.py

@@ -103,9 +103,11 @@
     IMPLICITPREFS_ALS="hibench.als.implicitprefs",
     RANK_ALS="hibench.als.rank",
     NUM_RECOMMENDS_ALS="hibench.als.recommends",
-    NUM_ITERATIONS_ALS="hibench.als.num_iterations",
+    NUM_ITERATIONS_ALS="hibench.als.numIterations",
     LAMBDA_ALS="hibench.als.Lambda",
     KYRO_ALS="hibench.als.kyro",
+    USERBLOCKS_ALS="hibench.als.numUserBlocks",
+    PRODUCTBLOCKS_ALS="hibench.als.numProductBlocks",
     # For PCA
     NUM_EXAMPLES_PCA="hibench.pca.examples",
     NUM_FEATURES_PCA="hibench.pca.features",

bin/workloads/ml/als/spark/run.sh

@@ -27,8 +27,17 @@ rmr_hdfs $OUTPUT_HDFS || true
 
 SIZE=`dir_size $INPUT_HDFS`
 START_TIME=`timestamp`
-
-run_spark_job com.intel.hibench.sparkbench.ml.ALSExample --numUsers $NUM_USERS_ALS --numProducts $NUM_PRODUCTS_ALS --rank $RANK_ALS --numRecommends $NUM_RECOMMENDS_ALS --numIterations $NUM_ITERATIONS_ALS --lambda $LAMBDA_ALS --kryo $KYRO_ALS --implicitPrefs $IMPLICITPREFS_ALS $INPUT_HDFS
+OPTION="--numUsers $NUM_USERS_ALS \
+        --numProducts $NUM_PRODUCTS_ALS \
+        --rank $RANK_ALS \
+        --numRecommends $NUM_RECOMMENDS_ALS \
+        --numIterations $NUM_ITERATIONS_ALS \
+        --kryo $KYRO_ALS \
+        --implicitPrefs $IMPLICITPREFS_ALS \
+        --numProductBlocks $PRODUCTBLOCKS_ALS \
+        --numUserBlocks $USERBLOCKS_ALS \
+        --lambda $LAMBDA_ALS"
+run_spark_job com.intel.hibench.sparkbench.ml.ALSExample $OPTION $INPUT_HDFS
 END_TIME=`timestamp`
 
 gen_report ${START_TIME} ${END_TIME} ${SIZE}

conf/workloads/ml/als.conf

@@ -32,9 +32,11 @@ hibench.als.partitions                  ${hibench.default.map.parallelism}
 
 hibench.als.rank                        10
 hibench.als.recommends                  20
-hibench.als.num_iterations              20
+hibench.als.numIterations               20
 hibench.als.Lambda                      1.0
 hibench.als.kyro                        false
+hibench.als.numUserBlocks               -1
+hibench.als.numProductBlocks            -1
 
 hibench.workload.input                  ${hibench.hdfs.data.dir}/ALS/Input
 hibench.workload.output                 ${hibench.hdfs.data.dir}/ALS/Output

sparkbench/ml/src/main/scala/com/intel/sparkbench/ml/ALSExample.scala

@@ -70,10 +70,10 @@ object ALSExample {
         .text("Kryo serialization, default: ${defaultParams.kryo}")
         .action((x, c) => c.copy(kryo = x))
       opt[Int]("numUserBlocks")
-        .text(s"number of user blocks, default: ${defaultParams.numUserBlocks} (auto)")
+        .text(s"number of user blocks, default: ${defaultParams.numUserBlocks}")
         .action((x, c) => c.copy(numUserBlocks = x))
       opt[Int]("numProductBlocks")
-        .text(s"number of product blocks, default: ${defaultParams.numProductBlocks} (auto)")
+        .text(s"number of product blocks, default: ${defaultParams.numProductBlocks}")
         .action((x, c) => c.copy(numProductBlocks = x))
       opt[Boolean]("implicitPrefs")
         .text("implicit preference, default: ${defaultParams.implicitPrefs}")