Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion conf/benchmarks.lst
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@ ml.linear
ml.lda
ml.svm
ml.gmm
ml.xgboost

graph.nweight
graph.nweight
2 changes: 1 addition & 1 deletion conf/workloads/ml/xgboost.conf
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ hibench.xgboost.features ${hibench.xgboost.${hibench.scale.pr
hibench.xgboost.partitions ${hibench.default.map.parallelism}

hibench.xgboost.numClasses 2
hibench.xgboost.maxDepth 30
hibench.xgboost.maxDepth 8
hibench.xgboost.maxBins 32
hibench.xgboost.numIterations 20
hibench.xgboost.learningRate 0.1
Expand Down
11 changes: 11 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,17 @@
<name>Scala-tools Maven 2 Repository</name>
<url>https://oss.sonatype.org/content/groups/scala-tools/</url>
</repository>
<repository>
<id>xgboostrepo</id>
<name>XGBoost Maven Repo</name>
<url>https://s3-us-west-2.amazonaws.com/xgboost-maven-repo/release</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
Expand Down
4 changes: 2 additions & 2 deletions sparkbench/ml/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,12 @@
<dependency>
<groupId>ml.dmlc</groupId>
<artifactId>xgboost4j_${scala.binary.version}</artifactId>
<version>1.0.0</version>
<version>1.1.0</version>
</dependency>
<dependency>
<groupId>ml.dmlc</groupId>
<artifactId>xgboost4j-spark_${scala.binary.version}</artifactId>
<version>1.0.0</version>
<version>1.1.0</version>
</dependency>
</dependencies>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,9 @@
package com.intel.hibench.sparkbench.ml

import org.apache.spark.{SparkConf, SparkContext}
import org.apache.spark.mllib.tree.GradientBoostedTrees
import org.apache.spark.mllib.tree.configuration.BoostingStrategy
import org.apache.spark.mllib.tree.model.GradientBoostedTreesModel
import org.apache.spark.rdd.RDD
import org.apache.spark.mllib.regression.LabeledPoint
import org.apache.spark.ml.Pipeline
import org.apache.spark.ml.feature.{LabeledPoint => NewLabeledPoint}
import ml.dmlc.xgboost4j.scala.spark.XGBoostClassifier
import org.apache.spark.ml.evaluation.MulticlassClassificationEvaluator
Expand All @@ -33,7 +31,7 @@ object XGBoost {

case class Params(
numClasses: Int = 2,
maxDepth: Int = 30,
maxDepth: Int = 8,
maxBins: Int = 32,
numIterations: Int = 20,
learningRate: Double = 0.1,
Expand Down Expand Up @@ -93,7 +91,7 @@ object XGBoost {
val mllibRDD: RDD[LabeledPoint] = sc.objectFile(dataPath)
// Convert to ML LabeledPoint and to DataFrame
val mlRDD: RDD[NewLabeledPoint] = mllibRDD.map { p => NewLabeledPoint(p.label, p.features.asML) }
val data = mlRDD.toDF
val data = mlRDD.toDF("label", "features")

// Split the data into training and test sets (30% held out for testing)
val splits = data.randomSplit(Array(0.7, 0.3))
Expand Down Expand Up @@ -123,7 +121,9 @@ object XGBoost {
setFeaturesCol("features").
setLabelCol("label")

val model = xgbClassifier.fit(trainingData)
val pipeline = new Pipeline().setStages(Array(xgbClassifier))

val model = pipeline.fit(trainingData)

// Make predictions.
val predictions = model.transform(testData)
Expand Down
1 change: 1 addition & 0 deletions travis/benchmarks_ml.lst
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ ml.linear
ml.lda
ml.svm
ml.gmm
ml.xgboost