Repository: mahout Updated Branches: refs/heads/master abdfa2e57 -> 5d56be7f3
Implicit checkpoint must not request caching closes apache/mahout#188 Project: http://git-wip-us.apache.org/repos/asf/mahout/repo Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/5d56be7f Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/5d56be7f Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/5d56be7f Branch: refs/heads/master Commit: 5d56be7f31592c73a3363ec6f582fece5ff27be4 Parents: abdfa2e Author: Andrew Palumbo <[email protected]> Authored: Tue Mar 15 12:21:15 2016 -0400 Committer: Andrew Palumbo <[email protected]> Committed: Tue Mar 15 12:21:15 2016 -0400 ---------------------------------------------------------------------- .../org/apache/mahout/math/drm/CheckpointedOps.scala | 2 +- .../scala/org/apache/mahout/math/drm/RLikeDrmOps.scala | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mahout/blob/5d56be7f/math-scala/src/main/scala/org/apache/mahout/math/drm/CheckpointedOps.scala ---------------------------------------------------------------------- diff --git a/math-scala/src/main/scala/org/apache/mahout/math/drm/CheckpointedOps.scala b/math-scala/src/main/scala/org/apache/mahout/math/drm/CheckpointedOps.scala index d44e8fc..37cd981 100644 --- a/math-scala/src/main/scala/org/apache/mahout/math/drm/CheckpointedOps.scala +++ b/math-scala/src/main/scala/org/apache/mahout/math/drm/CheckpointedOps.scala @@ -43,7 +43,7 @@ class CheckpointedOps[K](val drm: CheckpointedDrm[K]) { drm.context.allreduceBlock(drm, bmf, rf) - + /** Second norm */ def norm():Double = drm.context.norm(drm) } http://git-wip-us.apache.org/repos/asf/mahout/blob/5d56be7f/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 54afc0e..8bea741 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 @@ -168,13 +168,5 @@ object RLikeDrmOps { implicit def ops2Drm[K](ops: DrmLikeOps[K]): DrmLike[K] = ops.drm - // Removed in move to 1.2.1 PR #74 https://github.com/apache/mahout/pull/74/files - // Not sure why. - // 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. - */ - implicit def drm2cpops[K](drm: DrmLike[K]): CheckpointedOps[K] = new CheckpointedOps(drm.checkpoint()) + implicit def drm2cpops[K](drm: DrmLike[K]): CheckpointedOps[K] = new CheckpointedOps(drm) }
