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/07/17 00:52:48 UTC
git commit: NOJIRA: distributed context property must really be
public for engine-agnostic consumers
Repository: mahout
Updated Branches:
refs/heads/master 25a6fc096 -> 272b16153
NOJIRA: distributed context property must really be public for engine-agnostic consumers
Project: http://git-wip-us.apache.org/repos/asf/mahout/repo
Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/272b1615
Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/272b1615
Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/272b1615
Branch: refs/heads/master
Commit: 272b1615311c551def0a686a75cc64591b01007e
Parents: 25a6fc0
Author: Dmitriy Lyubimov <dl...@apache.org>
Authored: Wed Jul 16 15:51:27 2014 -0700
Committer: Dmitriy Lyubimov <dl...@apache.org>
Committed: Wed Jul 16 15:51:27 2014 -0700
----------------------------------------------------------------------
.../src/main/scala/org/apache/mahout/math/drm/DrmLike.scala | 7 +++++--
.../org/apache/mahout/math/drm/logical/AbstractBinaryOp.scala | 2 +-
.../org/apache/mahout/math/drm/logical/AbstractUnaryOp.scala | 2 +-
.../mahout/sparkbindings/drm/CheckpointedDrmSpark.scala | 2 +-
4 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mahout/blob/272b1615/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 7fbfc12..995c873 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
@@ -30,8 +30,11 @@ trait DrmLike[K] {
protected[mahout] def partitioningTag: Long
- protected[mahout] val context:DistributedContext
-
+ /**
+ * Distributed context, can be implicitly converted to operations on [[org.apache.mahout.math.drm.
+ * DistributedEngine]].
+ */
+ val context:DistributedContext
/** R-like syntax for number of rows. */
def nrow: Long
http://git-wip-us.apache.org/repos/asf/mahout/blob/272b1615/math-scala/src/main/scala/org/apache/mahout/math/drm/logical/AbstractBinaryOp.scala
----------------------------------------------------------------------
diff --git a/math-scala/src/main/scala/org/apache/mahout/math/drm/logical/AbstractBinaryOp.scala b/math-scala/src/main/scala/org/apache/mahout/math/drm/logical/AbstractBinaryOp.scala
index efd60ab..7863526 100644
--- a/math-scala/src/main/scala/org/apache/mahout/math/drm/logical/AbstractBinaryOp.scala
+++ b/math-scala/src/main/scala/org/apache/mahout/math/drm/logical/AbstractBinaryOp.scala
@@ -40,7 +40,7 @@ abstract class AbstractBinaryOp[A: ClassTag, B: ClassTag, K: ClassTag]
protected[drm] var A: DrmLike[A]
protected[drm] var B: DrmLike[B]
- protected[mahout] lazy val context: DistributedContext = A.context
+ lazy val context: DistributedContext = A.context
// These are explicit evidence export. Sometimes scala falls over to figure that on its own.
def classTagA: ClassTag[A] = implicitly[ClassTag[A]]
http://git-wip-us.apache.org/repos/asf/mahout/blob/272b1615/math-scala/src/main/scala/org/apache/mahout/math/drm/logical/AbstractUnaryOp.scala
----------------------------------------------------------------------
diff --git a/math-scala/src/main/scala/org/apache/mahout/math/drm/logical/AbstractUnaryOp.scala b/math-scala/src/main/scala/org/apache/mahout/math/drm/logical/AbstractUnaryOp.scala
index eb5ef9a..92abdb4 100644
--- a/math-scala/src/main/scala/org/apache/mahout/math/drm/logical/AbstractUnaryOp.scala
+++ b/math-scala/src/main/scala/org/apache/mahout/math/drm/logical/AbstractUnaryOp.scala
@@ -26,7 +26,7 @@ abstract class AbstractUnaryOp[A: ClassTag, K: ClassTag]
protected[drm] var A: DrmLike[A]
- protected[mahout] lazy val context: DistributedContext = A.context
+ lazy val context: DistributedContext = A.context
def classTagA: ClassTag[A] = implicitly[ClassTag[A]]
http://git-wip-us.apache.org/repos/asf/mahout/blob/272b1615/spark/src/main/scala/org/apache/mahout/sparkbindings/drm/CheckpointedDrmSpark.scala
----------------------------------------------------------------------
diff --git a/spark/src/main/scala/org/apache/mahout/sparkbindings/drm/CheckpointedDrmSpark.scala b/spark/src/main/scala/org/apache/mahout/sparkbindings/drm/CheckpointedDrmSpark.scala
index 1e2028d..674ff0a 100644
--- a/spark/src/main/scala/org/apache/mahout/sparkbindings/drm/CheckpointedDrmSpark.scala
+++ b/spark/src/main/scala/org/apache/mahout/sparkbindings/drm/CheckpointedDrmSpark.scala
@@ -44,7 +44,7 @@ class CheckpointedDrmSpark[K: ClassTag](
lazy val ncol = if (_ncol >= 0) _ncol else computeNCol
private var cached: Boolean = false
- override protected[mahout] val context: DistributedContext = rdd.context
+ override val context: DistributedContext = rdd.context
/**