-
Notifications
You must be signed in to change notification settings - Fork 29k
[SPARK-17748][ML] One pass solver for Weighted Least Squares with ElasticNet #15394
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.
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
Changes from 1 commit
c562823
4f4e32d
9742e7d
c105c05
cf3407b
28f8c2f
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -422,4 +422,37 @@ class BLASSuite extends SparkMLFunSuite { | |
| assert(dATT.multiply(sx) ~== expected absTol 1e-15) | ||
| assert(sATT.multiply(sx) ~== expected absTol 1e-15) | ||
| } | ||
|
|
||
| test("spmv") { | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. dspmv
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. the naming conventions for the other BLAS tests is not to use the "d" or "s" prefix - for example the test for "gemm" and "syr" (not "dgemm" or "dsyr"). I think this is correct given the other test names. |
||
| /* | ||
| A = [[3.0, -2.0, 2.0, -4.0], | ||
| [-2.0, -8.0, 4.0, 7.0], | ||
| [2.0, 4.0, -3.0, -3.0], | ||
| [-4.0, 7.0, -3.0, 0.0]] | ||
| x = [5.0, 2.0, 1.0, 9.0] | ||
| Ax = [ 45., -93., 48., -3.] | ||
| */ | ||
| val A = new DenseVector(Array(3.0, -2.0, -8.0, 2.0, 4.0, -3.0, -4.0, 7.0, -3.0, 0.0)) | ||
| val x = new DenseVector(Array(5.0, 2.0, -1.0, -9.0)) | ||
| val n = 4 | ||
|
|
||
| val y1 = new DenseVector(Array(-3.0, 6.0, -8.0, -3.0)) | ||
| val y2 = y1.copy | ||
| val y3 = y1.copy | ||
| val y4 = y1.copy | ||
|
|
||
| val expected1 = new DenseVector(Array(42.0, -87.0, 40.0, -6.0)) | ||
| val expected2 = new DenseVector(Array(19.5, -40.5, 16.0, -4.5)) | ||
| val expected3 = new DenseVector(Array(-25.5, 52.5, -32.0, -1.5)) | ||
| val expected4 = new DenseVector(Array(-3.0, 6.0, -8.0, -3.0)) | ||
|
|
||
| dspmv(n, 1.0, A, x, y1) | ||
| dspmv(n, 0.5, A, x, y2) | ||
| dspmv(n, -0.5, A, x, y3) | ||
| dspmv(n, 0.0, A, x, y4) | ||
| assert(y1 ~== expected1 absTol 1e-8) | ||
| assert(y2 ~== expected2 absTol 1e-8) | ||
| assert(y3 ~== expected3 absTol 1e-8) | ||
| assert(y4 ~== expected4 absTol 1e-8) | ||
| } | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,165 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.spark.ml.optim | ||
|
|
||
| import breeze.linalg.{DenseVector => BDV} | ||
| import breeze.optimize.{CachedDiffFunction, DiffFunction, LBFGS => BreezeLBFGS, OWLQN => BreezeOWLQN} | ||
| import scala.collection.mutable | ||
|
|
||
| import org.apache.spark.ml.linalg.{BLAS, DenseVector, Vectors} | ||
| import org.apache.spark.mllib.linalg.CholeskyDecomposition | ||
|
|
||
| private[ml] class NormalEquationSolution( | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Add document for all params, and clarify the last element of coefficients is intercept if fit with intercept.
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done. |
||
| val fitIntercept: Boolean, | ||
| private val _coefficients: Array[Double], | ||
| val aaInv: Option[DenseVector], | ||
|
||
| val objectiveHistory: Option[Array[Double]]) { | ||
|
|
||
| def coefficients: DenseVector = { | ||
| if (fitIntercept) { | ||
| new DenseVector(_coefficients.slice(0, _coefficients.length - 1)) | ||
| } else { | ||
| new DenseVector(_coefficients) | ||
| } | ||
| } | ||
|
|
||
| def intercept: Double = if (fitIntercept) _coefficients.last else 0.0 | ||
| } | ||
|
|
||
| /** | ||
| * Interface for classes that solve the normal equations locally. | ||
| */ | ||
| private[ml] sealed trait NormalEquationSolver { | ||
|
|
||
| /** Solve the normal equations from summary statistics. */ | ||
| def solve( | ||
| bBar: Double, | ||
| bbBar: Double, | ||
| abBar: DenseVector, | ||
| aaBar: DenseVector, | ||
| aBar: DenseVector): NormalEquationSolution | ||
| } | ||
|
|
||
| /** | ||
| * A class that solves the normal equations directly, using Cholesky decomposition. | ||
| */ | ||
| private[ml] class CholeskySolver(val fitIntercept: Boolean) extends NormalEquationSolver { | ||
|
||
|
|
||
| def solve( | ||
| bBar: Double, | ||
| bbBar: Double, | ||
| abBar: DenseVector, | ||
| aaBar: DenseVector, | ||
| aBar: DenseVector): NormalEquationSolution = { | ||
| val k = abBar.size | ||
| val x = CholeskyDecomposition.solve(aaBar.values, abBar.values) | ||
| val aaInv = CholeskyDecomposition.inverse(aaBar.values, k) | ||
|
|
||
| new NormalEquationSolution(fitIntercept, x, Some(new DenseVector(aaInv)), None) | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * A class for solving the normal equations using Quasi-Newton optimization methods. | ||
| */ | ||
| private[ml] class QuasiNewtonSolver( | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. should
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think the fact that it extends
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. That's OK. We can change it later if necessary, it's private. |
||
| val fitIntercept: Boolean, | ||
|
||
| maxIter: Int, | ||
| tol: Double, | ||
| l1RegFunc: Option[(Int) => Double]) extends NormalEquationSolver { | ||
|
|
||
| def solve( | ||
| bBar: Double, | ||
| bbBar: Double, | ||
| abBar: DenseVector, | ||
| aaBar: DenseVector, | ||
| aBar: DenseVector): NormalEquationSolution = { | ||
| val numFeatures = aBar.size | ||
| val numFeaturesPlusIntercept = if (fitIntercept) numFeatures + 1 else numFeatures | ||
| val initialCoefficientsWithIntercept = new Array[Double](numFeaturesPlusIntercept) | ||
| if (fitIntercept) { | ||
| initialCoefficientsWithIntercept(numFeaturesPlusIntercept - 1) = bBar | ||
| } | ||
|
|
||
| val costFun = | ||
| new NormalEquationCostFun(bBar, bbBar, abBar, aaBar, aBar, fitIntercept, numFeatures) | ||
| val optimizer = l1RegFunc.map { func => | ||
| new BreezeOWLQN[Int, BDV[Double]](maxIter, 10, func, tol) | ||
| }.getOrElse(new BreezeLBFGS[BDV[Double]](maxIter, 10, tol)) | ||
|
|
||
| val states = optimizer.iterations(new CachedDiffFunction(costFun), | ||
| new BDV[Double](initialCoefficientsWithIntercept)) | ||
|
|
||
| val arrayBuilder = mutable.ArrayBuilder.make[Double] | ||
| var state: optimizer.State = null | ||
| while (states.hasNext) { | ||
| state = states.next() | ||
| arrayBuilder += state.adjustedValue | ||
| } | ||
| val x = state.x.toArray.clone() | ||
| new NormalEquationSolution(fitIntercept, x, None, Some(arrayBuilder.result())) | ||
| } | ||
|
|
||
| /** | ||
| * NormalEquationCostFun implements Breeze's DiffFunction[T] for the normal equation. | ||
| * It returns the loss and gradient with L2 regularization at a particular point (coefficients). | ||
| * It's used in Breeze's convex optimization routines. | ||
| */ | ||
| private class NormalEquationCostFun( | ||
| bBar: Double, | ||
| bbBar: Double, | ||
| ab: DenseVector, | ||
| aa: DenseVector, | ||
| aBar: DenseVector, | ||
| fitIntercept: Boolean, | ||
| numFeatures: Int) extends DiffFunction[BDV[Double]] { | ||
|
|
||
| private val numFeaturesPlusIntercept = if (fitIntercept) numFeatures + 1 else numFeatures | ||
|
|
||
| override def calculate(coefficients: BDV[Double]): (Double, BDV[Double]) = { | ||
| val coef = Vectors.fromBreeze(coefficients).toDense | ||
| if (fitIntercept) { | ||
| var j = 0 | ||
| var dotProd = 0.0 | ||
| val coefValues = coef.values | ||
| val aBarValues = aBar.values | ||
| while (j < numFeatures) { | ||
| dotProd += coefValues(j) * aBarValues(j) | ||
| j += 1 | ||
| } | ||
| coefValues(numFeatures) = bBar - dotProd | ||
| } | ||
| val xxb = new DenseVector(new Array[Double](numFeaturesPlusIntercept)) | ||
| BLAS.dspmv(numFeaturesPlusIntercept, 1.0, aa, coef, xxb) | ||
| // loss = 1/2 (Y^T W Y - 2 beta^T X^T W Y + beta^T X^T W X beta) | ||
|
||
| val loss = 0.5 * bbBar - BLAS.dot(ab, coef) + 0.5 * BLAS.dot(coef, xxb) | ||
| // -gradient = X^T W X beta - X^T W Y | ||
| BLAS.axpy(-1.0, ab, xxb) | ||
| (loss, xxb.asBreeze.toDenseVector) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Exception thrown when solving a linear system Ax = b for which the matrix A is non-invertible | ||
| * (singular). | ||
| */ | ||
| class SingularMatrixException(message: String, cause: Throwable) | ||
| extends IllegalArgumentException(message, cause) { | ||
|
|
||
| def this(message: String) = this(message, null) | ||
| } | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually BLAS DSPMV performs matrix-vector operation
y := alpha*A*x + beta*y, should we provide the same function as original BLAS? Since it would be used by other MLlib function in the future.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I exposed it in this simplified form for now since it's all I needed. I think it's ok to leave it and add the other functionality when we need it in the future. But I can change it if you think it's best.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, I think developers will check linalg.BLAS to find functions satisfy their requirements. The annotation will tell them how these functions can do, so they may overlook this function if they need to calculate
y := alpha*A*x + beta*y. So I think it's better to use the complete formula.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
updated it and added some tests