forked from apache/spark
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[SPARK-1390] Refactoring of matrices backed by RDDs
This is to refactor interfaces for matrices backed by RDDs. It would be better if we have a clear separation of local matrices and those backed by RDDs. Right now, we have 1. `org.apache.spark.mllib.linalg.SparseMatrix`, which is a wrapper over an RDD of matrix entries, i.e., coordinate list format. 2. `org.apache.spark.mllib.linalg.TallSkinnyDenseMatrix`, which is a wrapper over RDD[Array[Double]], i.e. row-oriented format. We will see naming collision when we introduce local `SparseMatrix`, and the name `TallSkinnyDenseMatrix` is not exact if we switch to `RDD[Vector]` from `RDD[Array[Double]]`. It would be better to have "RDD" in the class name to suggest that operations may trigger jobs. The proposed names are (all under `org.apache.spark.mllib.linalg.rdd`): 1. `RDDMatrix`: trait for matrices backed by one or more RDDs 2. `CoordinateRDDMatrix`: wrapper of `RDD[(Long, Long, Double)]` 3. `RowRDDMatrix`: wrapper of `RDD[Vector]` whose rows do not have special ordering 4. `IndexedRowRDDMatrix`: wrapper of `RDD[(Long, Vector)]` whose rows are associated with indices The current code also introduces local matrices. Author: Xiangrui Meng <[email protected]> Closes apache#296 from mengxr/mat and squashes the following commits: 24d8294 [Xiangrui Meng] fix for groupBy returning Iterable bfc2b26 [Xiangrui Meng] merge master 8e4f1f5 [Xiangrui Meng] Merge branch 'master' into mat 0135193 [Xiangrui Meng] address Reza's comments 03cd7e1 [Xiangrui Meng] add pca/gram to IndexedRowMatrix add toBreeze to DistributedMatrix for test simplify tests b177ff1 [Xiangrui Meng] address Matei's comments be119fe [Xiangrui Meng] rename m/n to numRows/numCols for local matrix add tests for matrices b881506 [Xiangrui Meng] rename SparkPCA/SVD to TallSkinnyPCA/SVD e7d0d4a [Xiangrui Meng] move IndexedRDDMatrixRow to IndexedRowRDDMatrix 0d1491c [Xiangrui Meng] fix test errors a85262a [Xiangrui Meng] rename RDDMatrixRow to IndexedRDDMatrixRow b8b6ac3 [Xiangrui Meng] Remove old code 4cf679c [Xiangrui Meng] port pca to RowRDDMatrix, and add multiply and covariance 7836e2f [Xiangrui Meng] initial refactoring of matrices backed by RDDs
- Loading branch information
Showing
22 changed files
with
1,280 additions
and
1,102 deletions.
There are no files selected for viewing
51 changes: 0 additions & 51 deletions
51
examples/src/main/scala/org/apache/spark/examples/mllib/SparkPCA.scala
This file was deleted.
Oops, something went wrong.
59 changes: 0 additions & 59 deletions
59
examples/src/main/scala/org/apache/spark/examples/mllib/SparkSVD.scala
This file was deleted.
Oops, something went wrong.
64 changes: 64 additions & 0 deletions
64
examples/src/main/scala/org/apache/spark/examples/mllib/TallSkinnyPCA.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,64 @@ | ||
/* | ||
* 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.examples.mllib | ||
|
||
import org.apache.spark.{SparkConf, SparkContext} | ||
import org.apache.spark.mllib.linalg.distributed.RowMatrix | ||
import org.apache.spark.mllib.linalg.Vectors | ||
|
||
/** | ||
* Compute the principal components of a tall-and-skinny matrix, whose rows are observations. | ||
* | ||
* The input matrix must be stored in row-oriented dense format, one line per row with its entries | ||
* separated by space. For example, | ||
* {{{ | ||
* 0.5 1.0 | ||
* 2.0 3.0 | ||
* 4.0 5.0 | ||
* }}} | ||
* represents a 3-by-2 matrix, whose first row is (0.5, 1.0). | ||
*/ | ||
object TallSkinnyPCA { | ||
def main(args: Array[String]) { | ||
if (args.length != 2) { | ||
System.err.println("Usage: TallSkinnyPCA <master> <file>") | ||
System.exit(1) | ||
} | ||
|
||
val conf = new SparkConf() | ||
.setMaster(args(0)) | ||
.setAppName("TallSkinnyPCA") | ||
.setSparkHome(System.getenv("SPARK_HOME")) | ||
.setJars(SparkContext.jarOfClass(this.getClass)) | ||
val sc = new SparkContext(conf) | ||
|
||
// Load and parse the data file. | ||
val rows = sc.textFile(args(1)).map { line => | ||
val values = line.split(' ').map(_.toDouble) | ||
Vectors.dense(values) | ||
} | ||
val mat = new RowMatrix(rows) | ||
|
||
// Compute principal components. | ||
val pc = mat.computePrincipalComponents(mat.numCols().toInt) | ||
|
||
println("Principal components are:\n" + pc) | ||
|
||
sc.stop() | ||
} | ||
} |
64 changes: 64 additions & 0 deletions
64
examples/src/main/scala/org/apache/spark/examples/mllib/TallSkinnySVD.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,64 @@ | ||
/* | ||
* 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.examples.mllib | ||
|
||
import org.apache.spark.{SparkConf, SparkContext} | ||
import org.apache.spark.mllib.linalg.distributed.RowMatrix | ||
import org.apache.spark.mllib.linalg.Vectors | ||
|
||
/** | ||
* Compute the singular value decomposition (SVD) of a tall-and-skinny matrix. | ||
* | ||
* The input matrix must be stored in row-oriented dense format, one line per row with its entries | ||
* separated by space. For example, | ||
* {{{ | ||
* 0.5 1.0 | ||
* 2.0 3.0 | ||
* 4.0 5.0 | ||
* }}} | ||
* represents a 3-by-2 matrix, whose first row is (0.5, 1.0). | ||
*/ | ||
object TallSkinnySVD { | ||
def main(args: Array[String]) { | ||
if (args.length != 2) { | ||
System.err.println("Usage: TallSkinnySVD <master> <file>") | ||
System.exit(1) | ||
} | ||
|
||
val conf = new SparkConf() | ||
.setMaster(args(0)) | ||
.setAppName("TallSkinnySVD") | ||
.setSparkHome(System.getenv("SPARK_HOME")) | ||
.setJars(SparkContext.jarOfClass(this.getClass)) | ||
val sc = new SparkContext(conf) | ||
|
||
// Load and parse the data file. | ||
val rows = sc.textFile(args(1)).map { line => | ||
val values = line.split(' ').map(_.toDouble) | ||
Vectors.dense(values) | ||
} | ||
val mat = new RowMatrix(rows) | ||
|
||
// Compute SVD. | ||
val svd = mat.computeSVD(mat.numCols().toInt) | ||
|
||
println("Singular values are " + svd.s) | ||
|
||
sc.stop() | ||
} | ||
} |
101 changes: 101 additions & 0 deletions
101
mllib/src/main/scala/org/apache/spark/mllib/linalg/Matrices.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,101 @@ | ||
/* | ||
* 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.mllib.linalg | ||
|
||
import breeze.linalg.{Matrix => BM, DenseMatrix => BDM} | ||
|
||
/** | ||
* Trait for a local matrix. | ||
*/ | ||
trait Matrix extends Serializable { | ||
|
||
/** Number of rows. */ | ||
def numRows: Int | ||
|
||
/** Number of columns. */ | ||
def numCols: Int | ||
|
||
/** Converts to a dense array in column major. */ | ||
def toArray: Array[Double] | ||
|
||
/** Converts to a breeze matrix. */ | ||
private[mllib] def toBreeze: BM[Double] | ||
|
||
/** Gets the (i, j)-th element. */ | ||
private[mllib] def apply(i: Int, j: Int): Double = toBreeze(i, j) | ||
|
||
override def toString: String = toBreeze.toString() | ||
} | ||
|
||
/** | ||
* Column-majored dense matrix. | ||
* The entry values are stored in a single array of doubles with columns listed in sequence. | ||
* For example, the following matrix | ||
* {{{ | ||
* 1.0 2.0 | ||
* 3.0 4.0 | ||
* 5.0 6.0 | ||
* }}} | ||
* is stored as `[1.0, 3.0, 5.0, 2.0, 4.0, 6.0]`. | ||
* | ||
* @param numRows number of rows | ||
* @param numCols number of columns | ||
* @param values matrix entries in column major | ||
*/ | ||
class DenseMatrix(val numRows: Int, val numCols: Int, val values: Array[Double]) extends Matrix { | ||
|
||
require(values.length == numRows * numCols) | ||
|
||
override def toArray: Array[Double] = values | ||
|
||
private[mllib] override def toBreeze: BM[Double] = new BDM[Double](numRows, numCols, values) | ||
} | ||
|
||
/** | ||
* Factory methods for [[org.apache.spark.mllib.linalg.Matrix]]. | ||
*/ | ||
object Matrices { | ||
|
||
/** | ||
* Creates a column-majored dense matrix. | ||
* | ||
* @param numRows number of rows | ||
* @param numCols number of columns | ||
* @param values matrix entries in column major | ||
*/ | ||
def dense(numRows: Int, numCols: Int, values: Array[Double]): Matrix = { | ||
new DenseMatrix(numRows, numCols, values) | ||
} | ||
|
||
/** | ||
* Creates a Matrix instance from a breeze matrix. | ||
* @param breeze a breeze matrix | ||
* @return a Matrix instance | ||
*/ | ||
private[mllib] def fromBreeze(breeze: BM[Double]): Matrix = { | ||
breeze match { | ||
case dm: BDM[Double] => | ||
require(dm.majorStride == dm.rows, | ||
"Do not support stride size different from the number of rows.") | ||
new DenseMatrix(dm.rows, dm.cols, dm.data) | ||
case _ => | ||
throw new UnsupportedOperationException( | ||
s"Do not support conversion from type ${breeze.getClass.getName}.") | ||
} | ||
} | ||
} |
29 changes: 0 additions & 29 deletions
29
mllib/src/main/scala/org/apache/spark/mllib/linalg/MatrixSVD.scala
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.