Repository: mahout Updated Branches: refs/heads/master 1ca1ef324 -> 0c672bbcd
NOJIRA: Spark migration to 1.2.1, minor unit test bug fixes Erlend Hamnaberg via @dlyubimov This closes mahout#74 Squashed commit of the following: commit 6f20f383740bddd2d0f62431e704c4465e729c5c Author: Erlend Hamnaberg <[email protected]> Date: Fri Feb 13 23:45:38 2015 +0100 Change which duplicate implicit that gets removed. commit 78f9c36b54764aa4b36660ed7c25e94c847372c4 Author: Erlend Hamnaberg <[email protected]> Date: Tue Feb 10 23:27:56 2015 +0100 Spark 1.2.1 upgrade o Bumped some versions to get ready for Scala 2.11. o Changed some references to include scala.major so we can upgrade easier o Removed a duplicated implicit so we dont get errors in 2.11 o Fixed cleanup of tests. Project: http://git-wip-us.apache.org/repos/asf/mahout/repo Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/0c672bbc Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/0c672bbc Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/0c672bbc Branch: refs/heads/master Commit: 0c672bbcd95b8f757d7faccc09d980c62576f41c Parents: 1ca1ef3 Author: Dmitriy Lyubimov <[email protected]> Authored: Fri Feb 20 11:39:23 2015 -0800 Committer: Dmitriy Lyubimov <[email protected]> Committed: Fri Feb 20 11:51:43 2015 -0800 ---------------------------------------------------------------------- h2o/pom.xml | 8 ++++---- math-scala/pom.xml | 4 ++-- .../main/scala/org/apache/mahout/math/drm/RLikeDrmOps.scala | 2 -- pom.xml | 2 +- spark-shell/pom.xml | 4 ++-- spark/pom.xml | 6 +++--- .../mahout/sparkbindings/test/DistributedSparkSuite.scala | 5 +++++ 7 files changed, 17 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mahout/blob/0c672bbc/h2o/pom.xml ---------------------------------------------------------------------- diff --git a/h2o/pom.xml b/h2o/pom.xml index aa333e1..0789adf 100644 --- a/h2o/pom.xml +++ b/h2o/pom.xml @@ -206,7 +206,7 @@ <dependency> <groupId>org.apache.mahout</groupId> - <artifactId>mahout-math-scala_2.10</artifactId> + <artifactId>mahout-math-scala_${scala.major}</artifactId> <version>${project.version}</version> </dependency> @@ -219,7 +219,7 @@ <dependency> <groupId>org.apache.mahout</groupId> - <artifactId>mahout-math-scala_2.10</artifactId> + <artifactId>mahout-math-scala_${scala.major}</artifactId> <classifier>tests</classifier> <scope>test</scope> </dependency> @@ -249,8 +249,8 @@ <!-- scala stuff --> <dependency> <groupId>org.scalatest</groupId> - <artifactId>scalatest_2.10</artifactId> - <version>2.0</version> + <artifactId>scalatest_${scala.major}</artifactId> + <version>2.2.4</version> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/mahout/blob/0c672bbc/math-scala/pom.xml ---------------------------------------------------------------------- diff --git a/math-scala/pom.xml b/math-scala/pom.xml index 66309d6..9ca1d05 100644 --- a/math-scala/pom.xml +++ b/math-scala/pom.xml @@ -175,7 +175,7 @@ <dependency> <groupId>com.github.scopt</groupId> - <artifactId>scopt_2.10</artifactId> + <artifactId>scopt_${scala.major}</artifactId> <version>3.2.0</version> </dependency> @@ -189,7 +189,7 @@ <dependency> <groupId>org.scalatest</groupId> <artifactId>scalatest_${scala.major}</artifactId> - <version>2.0</version> + <version>2.2.4</version> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/mahout/blob/0c672bbc/math-scala/src/main/scala/org/apache/mahout/math/drm/RLikeDrmOps.scala ---------------------------------------------------------------------- diff --git a/math-scala/src/main/scala/org/apache/mahout/math/drm/RLikeDrmOps.scala b/math-scala/src/main/scala/org/apache/mahout/math/drm/RLikeDrmOps.scala index d8d04e2..3f35602 100644 --- a/math-scala/src/main/scala/org/apache/mahout/math/drm/RLikeDrmOps.scala +++ b/math-scala/src/main/scala/org/apache/mahout/math/drm/RLikeDrmOps.scala @@ -134,8 +134,6 @@ object RLikeDrmOps { implicit def ops2Drm[K: ClassTag](ops: DrmLikeOps[K]): DrmLike[K] = ops.drm - implicit def cp2cpops[K: ClassTag](cp: CheckpointedDrm[K]): CheckpointedOps[K] = new CheckpointedOps(cp) - /** * This is probably dangerous since it triggers implicit checkpointing with default storage level * setting. http://git-wip-us.apache.org/repos/asf/mahout/blob/0c672bbc/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index ca66522..c5a1141 100644 --- a/pom.xml +++ b/pom.xml @@ -111,7 +111,7 @@ <slf4j.version>1.7.5</slf4j.version> <scala.major>2.10</scala.major> <scala.version>2.10.4</scala.version> - <spark.version>1.1.0</spark.version> + <spark.version>1.2.1</spark.version> <h2o.version>0.1.16</h2o.version> </properties> <issueManagement> http://git-wip-us.apache.org/repos/asf/mahout/blob/0c672bbc/spark-shell/pom.xml ---------------------------------------------------------------------- diff --git a/spark-shell/pom.xml b/spark-shell/pom.xml index 65df401..003c2a7 100644 --- a/spark-shell/pom.xml +++ b/spark-shell/pom.xml @@ -188,8 +188,8 @@ <!-- scala stuff --> <dependency> <groupId>org.scalatest</groupId> - <artifactId>scalatest_2.10</artifactId> - <version>2.0</version> + <artifactId>scalatest_${scala.major}</artifactId> + <version>2.2.4</version> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/mahout/blob/0c672bbc/spark/pom.xml ---------------------------------------------------------------------- diff --git a/spark/pom.xml b/spark/pom.xml index f61f988..2622e58 100644 --- a/spark/pom.xml +++ b/spark/pom.xml @@ -321,8 +321,8 @@ <dependency> <groupId>com.github.scopt</groupId> - <artifactId>scopt_2.10</artifactId> - <version>3.2.0</version> + <artifactId>scopt_${scala.major}</artifactId> + <version>3.3.0</version> </dependency> <!-- scala stuff --> @@ -330,7 +330,7 @@ <dependency> <groupId>org.scalatest</groupId> <artifactId>scalatest_${scala.major}</artifactId> - <version>2.0</version> + <version>2.2.4</version> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/mahout/blob/0c672bbc/spark/src/test/scala/org/apache/mahout/sparkbindings/test/DistributedSparkSuite.scala ---------------------------------------------------------------------- diff --git a/spark/src/test/scala/org/apache/mahout/sparkbindings/test/DistributedSparkSuite.scala b/spark/src/test/scala/org/apache/mahout/sparkbindings/test/DistributedSparkSuite.scala index 29c8bea..f40bcb7 100644 --- a/spark/src/test/scala/org/apache/mahout/sparkbindings/test/DistributedSparkSuite.scala +++ b/spark/src/test/scala/org/apache/mahout/sparkbindings/test/DistributedSparkSuite.scala @@ -58,6 +58,11 @@ trait DistributedSparkSuite extends DistributedMahoutSuite with LoggerConfigurat } + override protected def afterAll(configMap: ConfigMap): Unit = { + super.afterAll(configMap) + resetContext() + } + override protected def beforeAll(configMap: ConfigMap): Unit = { super.beforeAll(configMap) initContext()
