diff options
| author | Xiangrui Meng <meng@databricks.com> | 2015-03-12 01:39:04 -0700 |
|---|---|---|
| committer | Xiangrui Meng <meng@databricks.com> | 2015-03-12 01:39:04 -0700 |
| commit | 0cba802adf15f5ab8da24dd1e8a5e7214cc4e148 (patch) | |
| tree | a5dc95dc4f0fbf156cacffc6af130666711b3f98 /graphx/src/test | |
| parent | 712679a7b447346a365b38574d7a86d56a93f767 (diff) | |
| download | spark-0cba802adf15f5ab8da24dd1e8a5e7214cc4e148.tar.gz spark-0cba802adf15f5ab8da24dd1e8a5e7214cc4e148.tar.bz2 spark-0cba802adf15f5ab8da24dd1e8a5e7214cc4e148.zip | |
[SPARK-5814][MLLIB][GRAPHX] Remove JBLAS from runtime
The issue is discussed in https://issues.apache.org/jira/browse/SPARK-5669. Replacing all JBLAS usage by netlib-java gives us a simpler dependency tree and less license issues to worry about. I didn't touch the test scope in this PR. The user guide is not modified to avoid merge conflicts with branch-1.3. srowen ankurdave pwendell
Author: Xiangrui Meng <meng@databricks.com>
Closes #4699 from mengxr/SPARK-5814 and squashes the following commits:
48635c6 [Xiangrui Meng] move netlib-java version to parent pom
ca21c74 [Xiangrui Meng] remove jblas from ml-guide
5f7767a [Xiangrui Meng] Merge remote-tracking branch 'apache/master' into SPARK-5814
c5c4183 [Xiangrui Meng] merge master
0f20cad [Xiangrui Meng] add mima excludes
e53e9f4 [Xiangrui Meng] remove jblas from mllib runtime
ceaa14d [Xiangrui Meng] replace jblas by netlib-java in graphx
fa7c2ca [Xiangrui Meng] move jblas to test scope
Diffstat (limited to 'graphx/src/test')
| -rw-r--r-- | graphx/src/test/scala/org/apache/spark/graphx/lib/SVDPlusPlusSuite.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/graphx/src/test/scala/org/apache/spark/graphx/lib/SVDPlusPlusSuite.scala b/graphx/src/test/scala/org/apache/spark/graphx/lib/SVDPlusPlusSuite.scala index 9987a4b1a3..7bd6b7f3c4 100644 --- a/graphx/src/test/scala/org/apache/spark/graphx/lib/SVDPlusPlusSuite.scala +++ b/graphx/src/test/scala/org/apache/spark/graphx/lib/SVDPlusPlusSuite.scala @@ -32,11 +32,11 @@ class SVDPlusPlusSuite extends FunSuite with LocalSparkContext { Edge(fields(0).toLong * 2, fields(1).toLong * 2 + 1, fields(2).toDouble) } val conf = new SVDPlusPlus.Conf(10, 2, 0.0, 5.0, 0.007, 0.007, 0.005, 0.015) // 2 iterations - var (graph, u) = SVDPlusPlus.runSVDPlusPlus(edges, conf) + val (graph, _) = SVDPlusPlus.run(edges, conf) graph.cache() - val err = graph.vertices.collect().map{ case (vid, vd) => + val err = graph.vertices.map { case (vid, vd) => if (vid % 2 == 1) vd._4 else 0.0 - }.reduce(_ + _) / graph.triplets.collect().size + }.reduce(_ + _) / graph.numEdges assert(err <= svdppErr) } } |