Skip to content

[SPARK-16245] [ML] model loading backward compatibility for ml.feature.PCA #13937

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

[SPARK-16245] [ML] model loading backward compatibility for ml.feature.PCA #13937

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5246bcf
model loading backward compatibility for ml.feature.PCA
yanboliang Jun 28, 2016
8be63d5
update annotation
yanboliang Jun 28, 2016
ce04e08
fix typos
yanboliang Jun 28, 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
18 changes: 8 additions & 10 deletions mllib/src/main/scala/org/apache/spark/ml/feature/PCA.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,24 +206,22 @@ object PCAModel extends MLReadable[PCAModel] {
override def load(path: String): PCAModel = {
val metadata = DefaultParamsReader.loadMetadata(path, sc, className)

// explainedVariance field is not present in Spark <= 1.6
val versionRegex = "([0-9]+)\\.([0-9]+).*".r
val hasExplainedVariance = metadata.sparkVersion match {
case versionRegex(major, minor) =>
major.toInt >= 2 || (major.toInt == 1 && minor.toInt > 6)
case _ => false
}
val versionRegex = "([0-9]+)\\.(.+)".r
val versionRegex(major, _) = metadata.sparkVersion

val dataPath = new Path(path, "data").toString
val model = if (hasExplainedVariance) {
val model = if (major.toInt >= 2) {
val Row(pc: DenseMatrix, explainedVariance: DenseVector) =
sparkSession.read.parquet(dataPath)
.select("pc", "explainedVariance")
.head()
new PCAModel(metadata.uid, pc, explainedVariance)
} else {
val Row(pc: DenseMatrix) = sparkSession.read.parquet(dataPath).select("pc").head()
new PCAModel(metadata.uid, pc, Vectors.dense(Array.empty[Double]).asInstanceOf[DenseVector])
// pc field is the old matrix format in Spark <= 1.6
// explainedVariance field is not present in Spark <= 1.6
val Row(pc: OldDenseMatrix) = sparkSession.read.parquet(dataPath).select("pc").head()
new PCAModel(metadata.uid, pc.asML,
Vectors.dense(Array.empty[Double]).asInstanceOf[DenseVector])
}
DefaultParamsReader.getAndSetParams(model, metadata)
model
Expand Down