Repository: mahout Updated Branches: refs/heads/master c113a8c93 -> 126c165ca
MAHOUT-1784:Remove Spark specific comment in generic drm javadoc and comments, this closes apache/mahout#171 Project: http://git-wip-us.apache.org/repos/asf/mahout/repo Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/126c165c Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/126c165c Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/126c165c Branch: refs/heads/master Commit: 126c165ca09cf3b0f85f6a83fb080e8283c1fed0 Parents: c113a8c Author: smarthi <[email protected]> Authored: Thu Nov 5 18:15:51 2015 -0500 Committer: smarthi <[email protected]> Committed: Thu Nov 5 18:15:51 2015 -0500 ---------------------------------------------------------------------- .../scala/org/apache/mahout/math/drm/DistributedEngine.scala | 6 +++--- .../src/main/scala/org/apache/mahout/math/drm/DrmLike.scala | 5 +---- .../src/main/scala/org/apache/mahout/math/drm/package.scala | 4 ++-- 3 files changed, 6 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mahout/blob/126c165c/math-scala/src/main/scala/org/apache/mahout/math/drm/DistributedEngine.scala ---------------------------------------------------------------------- diff --git a/math-scala/src/main/scala/org/apache/mahout/math/drm/DistributedEngine.scala b/math-scala/src/main/scala/org/apache/mahout/math/drm/DistributedEngine.scala index 519a127..9ea90a1 100644 --- a/math-scala/src/main/scala/org/apache/mahout/math/drm/DistributedEngine.scala +++ b/math-scala/src/main/scala/org/apache/mahout/math/drm/DistributedEngine.scala @@ -74,11 +74,11 @@ trait DistributedEngine { */ def drmDfsRead(path: String, parMin: Int = 0)(implicit sc: DistributedContext): CheckpointedDrm[_] - /** Parallelize in-core matrix as spark distributed matrix, using row ordinal indices as data set keys. */ + /** Parallelize in-core matrix as the backend engine distributed matrix, using row ordinal indices as data set keys. */ def drmParallelizeWithRowIndices(m: Matrix, numPartitions: Int = 1)(implicit sc: DistributedContext): CheckpointedDrm[Int] - /** Parallelize in-core matrix as spark distributed matrix, using row labels as a data set keys. */ + /** Parallelize in-core matrix as the backend engine distributed matrix, using row labels as a data set keys. */ def drmParallelizeWithRowLabels(m: Matrix, numPartitions: Int = 1)(implicit sc: DistributedContext): CheckpointedDrm[String] @@ -142,7 +142,7 @@ object DistributedEngine { action match { // self element-wise rewrite - case OpAewB(a, b, op) if (a == b) => { + case OpAewB(a, b, op) if a == b => { op match { case "*" â OpAewUnaryFunc(pass1(a), (x) â x * x) case "/" â OpAewUnaryFunc(pass1(a), (x) â x / x) http://git-wip-us.apache.org/repos/asf/mahout/blob/126c165c/math-scala/src/main/scala/org/apache/mahout/math/drm/DrmLike.scala ---------------------------------------------------------------------- diff --git a/math-scala/src/main/scala/org/apache/mahout/math/drm/DrmLike.scala b/math-scala/src/main/scala/org/apache/mahout/math/drm/DrmLike.scala index b9c50b0..8c615bf 100644 --- a/math-scala/src/main/scala/org/apache/mahout/math/drm/DrmLike.scala +++ b/math-scala/src/main/scala/org/apache/mahout/math/drm/DrmLike.scala @@ -17,12 +17,9 @@ package org.apache.mahout.math.drm -import scala.reflect.ClassTag - - /** * - * Basic spark DRM trait. + * Basic DRM trait. * * Since we already call the package "sparkbindings", I will not use stem "spark" with classes in * this package. Spark backing is already implied. http://git-wip-us.apache.org/repos/asf/mahout/blob/126c165c/math-scala/src/main/scala/org/apache/mahout/math/drm/package.scala ---------------------------------------------------------------------- diff --git a/math-scala/src/main/scala/org/apache/mahout/math/drm/package.scala b/math-scala/src/main/scala/org/apache/mahout/math/drm/package.scala index e972dd8..6d62ff1 100644 --- a/math-scala/src/main/scala/org/apache/mahout/math/drm/package.scala +++ b/math-scala/src/main/scala/org/apache/mahout/math/drm/package.scala @@ -63,11 +63,11 @@ package object drm { def drmParallelize(m: Matrix, numPartitions: Int = 1) (implicit sc: DistributedContext): CheckpointedDrm[Int] = drmParallelizeWithRowIndices(m, numPartitions)(sc) - /** Parallelize in-core matrix as spark distributed matrix, using row ordinal indices as data set keys. */ + /** Parallelize in-core matrix as a distributed matrix, using row ordinal indices as data set keys. */ def drmParallelizeWithRowIndices(m: Matrix, numPartitions: Int = 1) (implicit ctx: DistributedContext): CheckpointedDrm[Int] = ctx.drmParallelizeWithRowIndices(m, numPartitions) - /** Parallelize in-core matrix as spark distributed matrix, using row labels as a data set keys. */ + /** Parallelize in-core matrix as a distributed matrix, using row labels as a data set keys. */ def drmParallelizeWithRowLabels(m: Matrix, numPartitions: Int = 1) (implicit ctx: DistributedContext): CheckpointedDrm[String] = ctx.drmParallelizeWithRowLabels(m, numPartitions)
