You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by dl...@apache.org on 2014/08/05 00:02:20 UTC

git commit: Initial migration.

Repository: mahout
Updated Branches:
  refs/heads/spark-1.0.x [created] 13e909b58


Initial migration.


Project: http://git-wip-us.apache.org/repos/asf/mahout/repo
Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/13e909b5
Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/13e909b5
Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/13e909b5

Branch: refs/heads/spark-1.0.x
Commit: 13e909b58eaa89e212415318655dbe82ef982323
Parents: 66f1640
Author: Dmitriy Lyubimov <dl...@apache.org>
Authored: Mon Aug 4 15:00:59 2014 -0700
Committer: Dmitriy Lyubimov <dl...@apache.org>
Committed: Mon Aug 4 15:00:59 2014 -0700

----------------------------------------------------------------------
 pom.xml                                                            | 2 +-
 .../main/scala/org/apache/mahout/sparkbindings/SparkEngine.scala   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mahout/blob/13e909b5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 809421b..67fa964 100644
--- a/pom.xml
+++ b/pom.xml
@@ -109,7 +109,7 @@
     <slf4j.version>1.7.5</slf4j.version>
     <scala.major>2.10</scala.major>
     <scala.version>2.10.3</scala.version>
-    <spark.version>0.9.1</spark.version>
+    <spark.version>1.0.1</spark.version>
   </properties>
   <issueManagement>
     <system>Jira</system>

http://git-wip-us.apache.org/repos/asf/mahout/blob/13e909b5/spark/src/main/scala/org/apache/mahout/sparkbindings/SparkEngine.scala
----------------------------------------------------------------------
diff --git a/spark/src/main/scala/org/apache/mahout/sparkbindings/SparkEngine.scala b/spark/src/main/scala/org/apache/mahout/sparkbindings/SparkEngine.scala
index 36223fc..dedb279 100644
--- a/spark/src/main/scala/org/apache/mahout/sparkbindings/SparkEngine.scala
+++ b/spark/src/main/scala/org/apache/mahout/sparkbindings/SparkEngine.scala
@@ -127,7 +127,7 @@ object SparkEngine extends DistributedEngine {
    */
   def drmFromHDFS (path: String, parMin:Int = 0)(implicit sc: DistributedContext): CheckpointedDrm[_] = {
 
-    val rdd = sc.sequenceFile(path, classOf[Writable], classOf[VectorWritable], minSplits = parMin)
+    val rdd = sc.sequenceFile(path, classOf[Writable], classOf[VectorWritable], minPartitions = parMin)
         // Get rid of VectorWritable
         .map(t => (t._1, t._2.get()))