You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by sr...@apache.org on 2015/02/16 18:04:36 UTC
spark git commit: SPARK-5815 [MLLIB] Part 2. Deprecate SVDPlusPlus
APIs that expose DoubleMatrix from JBLAS
Repository: spark
Updated Branches:
refs/heads/master 1115e8e73 -> a3afa4a1b
SPARK-5815 [MLLIB] Part 2. Deprecate SVDPlusPlus APIs that expose DoubleMatrix from JBLAS
Now, deprecated runSVDPlusPlus and update run, for 1.4.0 / master only
Author: Sean Owen <so...@cloudera.com>
Closes #4625 from srowen/SPARK-5815.2 and squashes the following commits:
6fd2ca5 [Sean Owen] Now, deprecated runSVDPlusPlus and update run, for 1.4.0 / master only
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/a3afa4a1
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/a3afa4a1
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/a3afa4a1
Branch: refs/heads/master
Commit: a3afa4a1bff88c4d8a5228fcf1e0cfc132541a22
Parents: 1115e8e
Author: Sean Owen <so...@cloudera.com>
Authored: Mon Feb 16 17:04:30 2015 +0000
Committer: Sean Owen <so...@cloudera.com>
Committed: Mon Feb 16 17:04:30 2015 +0000
----------------------------------------------------------------------
.../apache/spark/graphx/lib/SVDPlusPlus.scala | 42 +++++++-------------
1 file changed, 15 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/a3afa4a1/graphx/src/main/scala/org/apache/spark/graphx/lib/SVDPlusPlus.scala
----------------------------------------------------------------------
diff --git a/graphx/src/main/scala/org/apache/spark/graphx/lib/SVDPlusPlus.scala b/graphx/src/main/scala/org/apache/spark/graphx/lib/SVDPlusPlus.scala
index fc84cfb..3e4157a 100644
--- a/graphx/src/main/scala/org/apache/spark/graphx/lib/SVDPlusPlus.scala
+++ b/graphx/src/main/scala/org/apache/spark/graphx/lib/SVDPlusPlus.scala
@@ -17,8 +17,6 @@
package org.apache.spark.graphx.lib
-import org.apache.spark.annotation.Experimental
-
import scala.util.Random
import org.jblas.DoubleMatrix
import org.apache.spark.rdd._
@@ -40,8 +38,17 @@ object SVDPlusPlus {
extends Serializable
/**
- * :: Experimental ::
- *
+ * This method is now replaced by the updated version of `run()` and returns exactly
+ * the same result.
+ */
+ @deprecated("Call run()", "1.4.0")
+ def runSVDPlusPlus(edges: RDD[Edge[Double]], conf: Conf)
+ : (Graph[(Array[Double], Array[Double], Double, Double), Double], Double) =
+ {
+ run(edges, conf)
+ }
+
+ /**
* Implement SVD++ based on "Factorization Meets the Neighborhood:
* a Multifaceted Collaborative Filtering Model",
* available at [[http://public.research.att.com/~volinsky/netflix/kdd08koren.pdf]].
@@ -49,35 +56,14 @@ object SVDPlusPlus {
* The prediction rule is rui = u + bu + bi + qi*(pu + |N(u)|^(-0.5)*sum(y)),
* see the details on page 6.
*
- * This method temporarily replaces `run()`, and replaces `DoubleMatrix` in `run()`'s return
- * value with `Array[Double]`. In 1.4.0, this method will be deprecated, but will be copied
- * to replace `run()`, which will then be undeprecated.
- *
* @param edges edges for constructing the graph
*
* @param conf SVDPlusPlus parameters
*
* @return a graph with vertex attributes containing the trained model
*/
- @Experimental
- def runSVDPlusPlus(edges: RDD[Edge[Double]], conf: Conf)
- : (Graph[(Array[Double], Array[Double], Double, Double), Double], Double) =
- {
- val (graph, u) = run(edges, conf)
- // Convert DoubleMatrix to Array[Double]:
- val newVertices = graph.vertices.mapValues(v => (v._1.toArray, v._2.toArray, v._3, v._4))
- (Graph(newVertices, graph.edges), u)
- }
-
- /**
- * This method is deprecated in favor of `runSVDPlusPlus()`, which replaces `DoubleMatrix`
- * with `Array[Double]` in its return value. This method is deprecated. It will effectively
- * be removed in 1.4.0 when `runSVDPlusPlus()` is copied to replace `run()`, and hence the
- * return type of this method changes.
- */
- @deprecated("Call runSVDPlusPlus", "1.3.0")
def run(edges: RDD[Edge[Double]], conf: Conf)
- : (Graph[(DoubleMatrix, DoubleMatrix, Double, Double), Double], Double) =
+ : (Graph[(Array[Double], Array[Double], Double, Double), Double], Double) =
{
// Generate default vertex attribute
def defaultF(rank: Int): (DoubleMatrix, DoubleMatrix, Double, Double) = {
@@ -194,7 +180,9 @@ object SVDPlusPlus {
g.unpersist()
g = gJoinT3
- (g, u)
+ // Convert DoubleMatrix to Array[Double]:
+ val newVertices = g.vertices.mapValues(v => (v._1.toArray, v._2.toArray, v._3, v._4))
+ (Graph(newVertices, g.edges), u)
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org