Skip to content

[SPARK-15892][ML] Backport correctly merging AFTAggregators to branch 1.6 #13725

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
HyukjinKwon wants to merge 3 commits into from
Closed

[SPARK-15892][ML] Backport correctly merging AFTAggregators to branch 1.6 #13725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c42cc51
Backport correctly merging AFTAggregator to branch 1.6
HyukjinKwon Jun 16, 2016
b0203fc
Update comments
HyukjinKwon Jun 17, 2016
9cf8152
Fix coment
HyukjinKwon Jun 17, 2016
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
2 changes: 1 addition & 1 deletion mllib/src/main/scala/org/apache/spark/ml/regression/AFTSurvivalRegression.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,7 @@ private class AFTAggregator(parameters: BDV[Double], fitIntercept: Boolean)
* @return This AFTAggregator object.
*/
def merge(other: AFTAggregator): this.type = {
if (totalCnt != 0) {
if (other.count != 0) {
totalCnt += other.totalCnt
lossSum += other.lossSum

Expand Down
17 changes: 17 additions & 0 deletions mllib/src/test/scala/org/apache/spark/ml/regression/AFTSurvivalRegressionSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,23 @@ class AFTSurvivalRegressionSuite
testEstimatorAndModelReadWrite(aft, datasetMultivariate,
AFTSurvivalRegressionSuite.allParamSettings, checkModelData)
}

test("SPARK-15892: Incorrectly merged AFTAggregator with zero total count") {
// This `dataset` will contain an empty partition because it has five rows but
// the parallelism is bigger than that. Because the issue was about `AFTAggregator`s
// being merged incorrectly when it has an empty partition, the trained model has
// 1.0 scale from Euler's number for 0.
val points = sc.parallelize(Seq(
AFTPoint(Vectors.dense(1.560, -0.605), 1.218, 1.0),
AFTPoint(Vectors.dense(0.346, 2.158), 2.949, 0.0),
AFTPoint(Vectors.dense(1.380, 0.231), 3.627, 0.0),
AFTPoint(Vectors.dense(0.520, 1.151), 0.273, 1.0),
AFTPoint(Vectors.dense(0.795, -0.226), 4.199, 0.0)), numSlices = 6)
val dataset = sqlContext.createDataFrame(points)
val trainer = new AFTSurvivalRegression()
val model = trainer.fit(dataset)
assert(model.scale != 1)
}
}

object AFTSurvivalRegressionSuite {
Expand Down