aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXiangrui Meng <meng@databricks.com>2015-03-03 23:52:02 -0800
committerXiangrui Meng <meng@databricks.com>2015-03-03 23:52:10 -0800
commit9f249779ffe65131d1b9b95154a8ccd3a89fe022 (patch)
treed6efc3b812e0563876d93aa04a2e8b7e9b88981c
parent9a0b75cdd85c1933c590480dd233b1803726ed71 (diff)
downloadspark-9f249779ffe65131d1b9b95154a8ccd3a89fe022.tar.gz
spark-9f249779ffe65131d1b9b95154a8ccd3a89fe022.tar.bz2
spark-9f249779ffe65131d1b9b95154a8ccd3a89fe022.zip
[SPARK-6141][MLlib] Upgrade Breeze from 0.10 to 0.11 to fix convergence bug
LBFGS and OWLQN in Breeze 0.10 has convergence check bug. This is fixed in 0.11, see the description in Breeze project for detail: https://github.com/scalanlp/breeze/pull/373#issuecomment-76879760 Author: Xiangrui Meng <meng@databricks.com> Author: DB Tsai <dbtsai@alpinenow.com> Author: DB Tsai <dbtsai@dbtsai.com> Closes #4879 from dbtsai/breeze and squashes the following commits: d848f65 [DB Tsai] Merge pull request #1 from mengxr/AlpineNow-breeze c2ca6ac [Xiangrui Meng] upgrade to breeze-0.11.1 35c2f26 [Xiangrui Meng] fix LRSuite 397a208 [DB Tsai] upgrade breeze (cherry picked from commit 76e20a0a03cf2c02db35e00271924efb070eaaa5) Signed-off-by: Xiangrui Meng <meng@databricks.com>
-rw-r--r--mllib/pom.xml2
-rw-r--r--mllib/src/test/scala/org/apache/spark/mllib/classification/LogisticRegressionSuite.scala4
2 files changed, 5 insertions, 1 deletions
diff --git a/mllib/pom.xml b/mllib/pom.xml
index 32e9847d15..48c9d060fd 100644
--- a/mllib/pom.xml
+++ b/mllib/pom.xml
@@ -63,7 +63,7 @@
<dependency>
<groupId>org.scalanlp</groupId>
<artifactId>breeze_${scala.binary.version}</artifactId>
- <version>0.10</version>
+ <version>0.11.1</version>
<exclusions>
<!-- This is included as a compile-scoped dependency by jtransforms, which is
a dependency of breeze. -->
diff --git a/mllib/src/test/scala/org/apache/spark/mllib/classification/LogisticRegressionSuite.scala b/mllib/src/test/scala/org/apache/spark/mllib/classification/LogisticRegressionSuite.scala
index d2b40f2cae..aaa81da9e2 100644
--- a/mllib/src/test/scala/org/apache/spark/mllib/classification/LogisticRegressionSuite.scala
+++ b/mllib/src/test/scala/org/apache/spark/mllib/classification/LogisticRegressionSuite.scala
@@ -372,8 +372,12 @@ class LogisticRegressionSuite extends FunSuite with MLlibTestSparkContext with M
testRDD2.cache()
testRDD3.cache()
+ val numIteration = 10
+
val lrA = new LogisticRegressionWithLBFGS().setIntercept(true)
+ lrA.optimizer.setNumIterations(numIteration)
val lrB = new LogisticRegressionWithLBFGS().setIntercept(true).setFeatureScaling(false)
+ lrB.optimizer.setNumIterations(numIteration)
val modelA1 = lrA.run(testRDD1, initialWeights)
val modelA2 = lrA.run(testRDD2, initialWeights)