Skip to content
Closed
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
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,14 @@ final class OneVsRestModel private[ml] (
val numFeatures: Int = models.head.numFeatures

private[spark] override def estimatedSize: Long = {
estimateMatadataSize + SizeEstimator.estimate(labelMetadata) +
models.iterator.map(_.estimatedSize).sum
var size = estimateMatadataSize(excluded = Seq(
// classifier: Param[ClassifierType]
classifier))
// labelMetadata: Metadata
size += SizeEstimator.estimate(labelMetadata)
// models: Array[_ <: ClassificationModel[_, _]]
size += models.iterator.map(_.estimatedSize).sum
size
}

/** @group setParam */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ class OneVsRestSuite extends MLTest with DefaultReadWriteTest {
ParamsSuite.checkParams(model)
}

test("SPARK-58250: OneVsRestModel estimated size") {
test("SPARK-58250 and SPARK-58509: OneVsRestModel estimated size") {
val trainingData = Seq(
(0.0, Vectors.dense(0.0, 0.0)),
(0.0, Vectors.dense(0.0, 1.0)),
Expand All @@ -77,13 +77,16 @@ class OneVsRestSuite extends MLTest with DefaultReadWriteTest {
(2.0, Vectors.dense(2.0, 0.0)),
(2.0, Vectors.dense(2.0, 1.0))).toDF("label", "features")

val classifier = new LogisticRegression().setMaxIter(1)
// Initialize the classifier's logger before retaining it in the OneVsRestModel.
classifier.fit(trainingData)
val model = new OneVsRest()
.setClassifier(new LogisticRegression().setMaxIter(1))
.setClassifier(classifier)
.fit(trainingData)

val maxSize = 32 * 1024
assert(model.estimatedSize < maxSize,
s"Estimation (${model.estimatedSize}) should be less than $maxSize")
s"Estimation (${model.estimatedSize}) should not include shared runtime state")
}

test("one-vs-rest: default params") {
Expand Down