Skip to content

[SPARK-18613][ML] make spark.mllib LDA dependencies in spark.ml LDA private #16860

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
sueann wants to merge 1 commit into from
Closed

[SPARK-18613][ML] make spark.mllib LDA dependencies in spark.ml LDA private #16860

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions mllib/src/main/scala/org/apache/spark/ml/clustering/LDA.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,11 +418,11 @@ abstract class LDAModel private[ml] (
* If this model was produced by EM, then this local representation may be built lazily.
*/
@Since("1.6.0")
protected def oldLocalModel: OldLocalLDAModel
private[clustering] def oldLocalModel: OldLocalLDAModel

/** Returns underlying spark.mllib model, which may be local or distributed */
@Since("1.6.0")
protected def getModel: OldLDAModel
private[clustering] def getModel: OldLDAModel

private[ml] def getEffectiveDocConcentration: Array[Double] = getModel.docConcentration.toArray

Expand Down Expand Up @@ -563,7 +563,7 @@ abstract class LDAModel private[ml] (
class LocalLDAModel private[ml] (
uid: String,
vocabSize: Int,
@Since("1.6.0") override protected val oldLocalModel: OldLocalLDAModel,
@Since("1.6.0") override private[clustering] val oldLocalModel: OldLocalLDAModel,
sparkSession: SparkSession)
extends LDAModel(uid, vocabSize, sparkSession) {

Expand All @@ -573,7 +573,7 @@ class LocalLDAModel private[ml] (
copyValues(copied, extra).setParent(parent).asInstanceOf[LocalLDAModel]
}

override protected def getModel: OldLDAModel = oldLocalModel
override private[clustering] def getModel: OldLDAModel = oldLocalModel

@Since("1.6.0")
override def isDistributed: Boolean = false
Expand Down Expand Up @@ -656,14 +656,14 @@ class DistributedLDAModel private[ml] (
private var oldLocalModelOption: Option[OldLocalLDAModel])
extends LDAModel(uid, vocabSize, sparkSession) {

override protected def oldLocalModel: OldLocalLDAModel = {
override private[clustering] def oldLocalModel: OldLocalLDAModel = {
if (oldLocalModelOption.isEmpty) {
oldLocalModelOption = Some(oldDistributedModel.toLocal)
}
oldLocalModelOption.get
}

override protected def getModel: OldLDAModel = oldDistributedModel
override private[clustering] def getModel: OldLDAModel = oldDistributedModel

/**
* Convert this distributed model to a local representation. This discards info about the
Expand Down