You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by jk...@apache.org on 2016/06/14 21:08:50 UTC
spark git commit: Revert "[SPARK-15892][ML] Incorrectly merged
AFTAggregator with zero total count"
Repository: spark
Updated Branches:
refs/heads/branch-1.6 be3c41b26 -> 2f3e327c4
Revert "[SPARK-15892][ML] Incorrectly merged AFTAggregator with zero total count"
This reverts commit be3c41b2633215ff6f20885c04f288aab25a1712.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/2f3e327c
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/2f3e327c
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/2f3e327c
Branch: refs/heads/branch-1.6
Commit: 2f3e327c4cbf163d8536c4451b4829ec7d1886a9
Parents: be3c41b
Author: Joseph K. Bradley <jo...@gmail.com>
Authored: Tue Jun 14 14:08:33 2016 -0700
Committer: Joseph K. Bradley <jo...@gmail.com>
Committed: Tue Jun 14 14:08:33 2016 -0700
----------------------------------------------------------------------
.../spark/ml/regression/AFTSurvivalRegression.scala | 2 +-
.../ml/regression/AFTSurvivalRegressionSuite.scala | 12 ------------
2 files changed, 1 insertion(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/2f3e327c/mllib/src/main/scala/org/apache/spark/ml/regression/AFTSurvivalRegression.scala
----------------------------------------------------------------------
diff --git a/mllib/src/main/scala/org/apache/spark/ml/regression/AFTSurvivalRegression.scala b/mllib/src/main/scala/org/apache/spark/ml/regression/AFTSurvivalRegression.scala
index cc1d19e..aedfb48 100644
--- a/mllib/src/main/scala/org/apache/spark/ml/regression/AFTSurvivalRegression.scala
+++ b/mllib/src/main/scala/org/apache/spark/ml/regression/AFTSurvivalRegression.scala
@@ -496,7 +496,7 @@ private class AFTAggregator(parameters: BDV[Double], fitIntercept: Boolean)
* @return This AFTAggregator object.
*/
def merge(other: AFTAggregator): this.type = {
- if (other.count != 0) {
+ if (totalCnt != 0) {
totalCnt += other.totalCnt
lossSum += other.lossSum
http://git-wip-us.apache.org/repos/asf/spark/blob/2f3e327c/mllib/src/test/scala/org/apache/spark/ml/regression/AFTSurvivalRegressionSuite.scala
----------------------------------------------------------------------
diff --git a/mllib/src/test/scala/org/apache/spark/ml/regression/AFTSurvivalRegressionSuite.scala b/mllib/src/test/scala/org/apache/spark/ml/regression/AFTSurvivalRegressionSuite.scala
index e452efb..d718ef6 100644
--- a/mllib/src/test/scala/org/apache/spark/ml/regression/AFTSurvivalRegressionSuite.scala
+++ b/mllib/src/test/scala/org/apache/spark/ml/regression/AFTSurvivalRegressionSuite.scala
@@ -346,18 +346,6 @@ 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 two rows but
- // the parallelism is bigger than that. Because the issue was about `AFTAggregator`s
- // being merged incorrectly when it has an empty partition, running the codes below
- // should not throw an exception.
- val dataset = spark.createDataFrame(
- sc.parallelize(generateAFTInput(
- 1, Array(5.5), Array(0.8), 2, 42, 1.0, 2.0, 2.0), numSlices = 3))
- val trainer = new AFTSurvivalRegression()
- trainer.fit(dataset)
- }
}
object AFTSurvivalRegressionSuite {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org