Skip to content

[SPARK-9612][ML] Add instance weight support for GBTs #25926

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
zhengruifeng wants to merge 9 commits into from
Closed

[SPARK-9612][ML] Add instance weight support for GBTs #25926

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
68a3169
init
zhengruifeng Sep 5, 2019
fc9c6cc
update
zhengruifeng Sep 12, 2019
51f9b99
update
zhengruifeng Sep 25, 2019
d4a7a15
update test
zhengruifeng Sep 25, 2019
7ec15ed
nit: mappartitions -> map
zhengruifeng Sep 26, 2019
8e5fc7b
address some comments
zhengruifeng Oct 8, 2019
e3c9372
revert err msg in testsuite
zhengruifeng Oct 8, 2019
23f27a5
update Instance scope
zhengruifeng Oct 8, 2019
3000397
address comments
zhengruifeng Oct 16, 2019
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
Prev Previous commit
Next Next commit
update Instance scope
  • Loading branch information
@zhengruifeng
zhengruifeng committed Oct 23, 2019
commit 23f27a55b1cfbef6342745268f4eb5008d3010be
2 changes: 1 addition & 1 deletion mllib/src/main/scala/org/apache/spark/ml/feature/Instance.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import org.apache.spark.ml.linalg.Vector
* @param weight The weight of this instance.
* @param features The vector of features for this data point.
*/
private[ml] case class Instance(label: Double, weight: Double, features: Vector)
private[spark] case class Instance(label: Double, weight: Double, features: Vector)

/**
* Case class that represents an instance of data point with
Expand Down
14 changes: 9 additions & 5 deletions mllib/src/test/scala/org/apache/spark/ml/classification/GBTClassifierSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import com.github.fommil.netlib.BLAS

import org.apache.spark.{SparkException, SparkFunSuite}
import org.apache.spark.ml.classification.LinearSVCSuite.generateSVMInput
import org.apache.spark.ml.feature.LabeledPoint
import org.apache.spark.ml.feature.{Instance, LabeledPoint}
import org.apache.spark.ml.linalg.{Vector, Vectors}
import org.apache.spark.ml.param.ParamsSuite
import org.apache.spark.ml.regression.DecisionTreeRegressionModel
Expand Down Expand Up @@ -401,8 +401,10 @@ class GBTClassifierSuite extends MLTest with DefaultReadWriteTest {
model3.trees.take(2), model3.treeWeights.take(2), model3.numFeatures, model3.numClasses)

val evalArr = model3.evaluateEachIteration(validationData.toDF)
val remappedValidationData = validationData.map(
x => LabeledPoint((x.label * 2) - 1, x.features).toInstance)
val remappedValidationData = validationData.map {
case LabeledPoint(label, features) =>
Instance(label * 2 - 1, 1.0, features)
}
val lossErr1 = GradientBoostedTrees.computeError(remappedValidationData,
model1.trees, model1.treeWeights, model1.getOldLossType)
val lossErr2 = GradientBoostedTrees.computeError(remappedValidationData,
Expand Down Expand Up @@ -437,8 +439,10 @@ class GBTClassifierSuite extends MLTest with DefaultReadWriteTest {
assert(modelWithValidation.numTrees < numIter)

val (errorWithoutValidation, errorWithValidation) = {
val remappedRdd = validationData.map(x =>
LabeledPoint(2 * x.label - 1, x.features).toInstance)
val remappedRdd = validationData.map {
case LabeledPoint(label, features) =>
Instance(label * 2 - 1, 1.0, features)
}
(GradientBoostedTrees.computeError(remappedRdd, modelWithoutValidation.trees,
modelWithoutValidation.treeWeights, modelWithoutValidation.getOldLossType),
GradientBoostedTrees.computeError(remappedRdd, modelWithValidation.trees,
Expand Down