Repository: mahout Updated Branches: refs/heads/master f870a6302 -> c96498680
MAHOUT-1500: H2O Integration - style revisions Project: http://git-wip-us.apache.org/repos/asf/mahout/repo Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/c9649868 Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/c9649868 Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/c9649868 Branch: refs/heads/master Commit: c96498680df551f2cbd2a4735d9408044a0c7bc3 Parents: f870a63 Author: Andrew Palumbo <[email protected]> Authored: Wed Aug 27 15:42:37 2014 -0400 Committer: Andrew Palumbo <[email protected]> Committed: Wed Aug 27 15:42:37 2014 -0400 ---------------------------------------------------------------------- .../org/apache/mahout/h2obindings/H2OHdfs.java | 17 +++++------ .../apache/mahout/h2obindings/H2OHelper.java | 31 +++++++++----------- .../org/apache/mahout/h2obindings/ops/ABt.java | 1 - .../org/apache/mahout/h2obindings/ops/AewB.java | 1 - .../mahout/h2obindings/ops/AewScalar.java | 1 - .../org/apache/mahout/h2obindings/ops/At.java | 3 +- .../org/apache/mahout/h2obindings/ops/AtA.java | 3 +- .../org/apache/mahout/h2obindings/ops/AtB.java | 3 +- .../org/apache/mahout/h2obindings/ops/Atx.java | 4 +-- .../apache/mahout/h2obindings/ops/Cbind.java | 2 -- .../org/apache/mahout/h2obindings/ops/Par.java | 2 +- .../apache/mahout/h2obindings/ops/Rbind.java | 4 +-- .../h2obindings/ops/TimesRightMatrix.java | 1 - .../apache/mahout/h2obindings/H2OEngine.scala | 10 +++---- .../h2obindings/drm/CheckpointedDrmH2O.scala | 4 +-- 15 files changed, 36 insertions(+), 51 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mahout/blob/c9649868/h2o/src/main/java/org/apache/mahout/h2obindings/H2OHdfs.java ---------------------------------------------------------------------- diff --git a/h2o/src/main/java/org/apache/mahout/h2obindings/H2OHdfs.java b/h2o/src/main/java/org/apache/mahout/h2obindings/H2OHdfs.java index d33cb4c..363c2df 100644 --- a/h2o/src/main/java/org/apache/mahout/h2obindings/H2OHdfs.java +++ b/h2o/src/main/java/org/apache/mahout/h2obindings/H2OHdfs.java @@ -17,7 +17,6 @@ package org.apache.mahout.h2obindings; -import java.io.IOException; import java.io.File; import java.net.URI; @@ -48,7 +47,7 @@ import org.apache.hadoop.util.ReflectionUtils; public class H2OHdfs { - public static boolean is_seqfile(String filename) { + public static boolean isSeqfile(String filename) { try { String uri = filename; Configuration conf = new Configuration(); @@ -70,10 +69,10 @@ public class H2OHdfs { } } - public static H2ODrm drm_from_file(String filename, int parMin) { + public static H2ODrm drmFromFile(String filename, int parMin) { try { - if (is_seqfile(filename)) { - return drm_from_seqfile(filename, parMin); + if (isSeqfile(filename)) { + return drmFromSeqfile(filename, parMin); } else { return new H2ODrm(FrameUtils.parseFrame(null,new File(filename))); } @@ -82,7 +81,7 @@ public class H2OHdfs { } } - public static H2ODrm drm_from_seqfile(String filename, int parMin) { + public static H2ODrm drmFromSeqfile(String filename, int parMin) { long rows = 0; int cols = 0; Frame frame = null; @@ -139,7 +138,7 @@ public class H2OHdfs { } reader.seek(start); - frame = H2OHelper.empty_frame(rows, cols, parMin, -1); + frame = H2OHelper.emptyFrame(rows, cols, parMin, -1); writers = new Vec.Writer[cols]; for (int i = 0; i < writers.length; i++) { writers[i] = frame.vecs()[i].open(); @@ -186,7 +185,7 @@ public class H2OHdfs { return new H2ODrm(frame, labels); } - public static void drm_to_file(String filename, H2ODrm Drm) throws java.io.IOException { + public static void drmToFile(String filename, H2ODrm Drm) throws java.io.IOException { Frame frame = Drm.frame; Vec labels = Drm.keys; String uri = filename; @@ -194,7 +193,7 @@ public class H2OHdfs { Path path = new Path(uri); FileSystem fs = FileSystem.get(URI.create(uri), conf); SequenceFile.Writer writer = null; - boolean is_sparse = H2OHelper.is_sparse(frame); + boolean is_sparse = H2OHelper.isSparse(frame); ValueString vstr = new ValueString(); if (labels != null) { http://git-wip-us.apache.org/repos/asf/mahout/blob/c9649868/h2o/src/main/java/org/apache/mahout/h2obindings/H2OHelper.java ---------------------------------------------------------------------- diff --git a/h2o/src/main/java/org/apache/mahout/h2obindings/H2OHelper.java b/h2o/src/main/java/org/apache/mahout/h2obindings/H2OHelper.java index 1b817fc..71d93dc 100644 --- a/h2o/src/main/java/org/apache/mahout/h2obindings/H2OHelper.java +++ b/h2o/src/main/java/org/apache/mahout/h2obindings/H2OHelper.java @@ -31,11 +31,8 @@ import water.fvec.Chunk; import water.parser.ValueString; import water.util.ArrayUtils; -import java.io.File; -import java.io.IOException; import java.util.Map; import java.util.HashMap; -import java.util.Arrays; import org.apache.mahout.h2obindings.drm.H2ODrm; @@ -45,7 +42,7 @@ public class H2OHelper { Is the matrix sparse? If the number of missing elements is 32 x times the number of present elements, treat it as sparse */ - public static boolean is_sparse(Frame frame) { + public static boolean isSparse(Frame frame) { long rows = frame.numRows(); long cols = frame.numCols(); @@ -72,12 +69,12 @@ public class H2OHelper { Dense Matrix depending on number of missing elements in Frame. */ - public static Matrix matrix_from_drm(H2ODrm drm) { + public static Matrix matrixFromDrm(H2ODrm drm) { Frame frame = drm.frame; Vec labels = drm.keys; Matrix m; - if (is_sparse(frame)) { + if (isSparse(frame)) { m = new SparseMatrix((int)frame.numRows(), frame.numCols()); } else { m = new DenseMatrix((int)frame.numRows(), frame.numCols()); @@ -198,7 +195,7 @@ public class H2OHelper { } /* Convert String->Integer map to Integer->String map */ - private static Map<Integer,String> reverse_map(Map<String,Integer> map) { + private static Map<Integer,String> reverseMap(Map<String, Integer> map) { if (map == null) { return null; } @@ -212,7 +209,7 @@ public class H2OHelper { return rmap; } - private static int chunk_size(long nrow, int ncol, int min, int exact) { + private static int chunkSize(long nrow, int ncol, int min, int exact) { int chunk_sz; int parts_hint = Math.max(min, exact); @@ -244,9 +241,9 @@ public class H2OHelper { /* Ingest a Matrix into an H2O Frame. H2O Frame is the "backing" data structure behind CheckpointedDrm. Steps: */ - public static H2ODrm drm_from_matrix(Matrix m, int min_hint, int exact_hint) { + public static H2ODrm drmFromMatrix(Matrix m, int min_hint, int exact_hint) { /* First create an empty (0-filled) frame of the required dimensions */ - Frame frame = empty_frame(m.rowSize(), m.columnSize(), min_hint, exact_hint); + Frame frame = emptyFrame(m.rowSize(), m.columnSize(), min_hint, exact_hint); Vec labels = null; Vec.Writer writers[] = new Vec.Writer[m.columnSize()]; Futures closer = new Futures(); @@ -272,7 +269,7 @@ public class H2OHelper { /* label vector must be similarly partitioned like the Frame */ labels = frame.anyVec().makeZero(); Vec.Writer writer = labels.open(); - Map<Integer,String> rmap = reverse_map(map); + Map<Integer,String> rmap = reverseMap(map); for (long r = 0; r < m.rowSize(); r++) { writer.set(r, rmap.get(r)); @@ -286,14 +283,14 @@ public class H2OHelper { return new H2ODrm(frame, labels); } - public static Frame empty_frame(long nrow, int ncol, int min_hint, int exact_hint) { + public static Frame emptyFrame(long nrow, int ncol, int min_hint, int exact_hint) { Vec.VectorGroup vg = new Vec.VectorGroup(); - return empty_frame(nrow, ncol, min_hint, exact_hint, vg); + return emptyFrame(nrow, ncol, min_hint, exact_hint, vg); } - public static Frame empty_frame(long nrow, int ncol, int min_hint, int exact_hint, Vec.VectorGroup vg) { - int chunk_sz = chunk_size(nrow, ncol, min_hint, exact_hint); + public static Frame emptyFrame(long nrow, int ncol, int min_hint, int exact_hint, Vec.VectorGroup vg) { + int chunk_sz = chunkSize(nrow, ncol, min_hint, exact_hint); int nchunks = (int)((nrow - 1) / chunk_sz) + 1; /* Final number of Chunks per Vec */ long espc[] = new long[nchunks + 1]; final Vec[] vecs = new Vec[ncol]; @@ -310,7 +307,7 @@ public class H2OHelper { return new Frame(vecs); } - public static H2ODrm empty_drm(long nrow, int ncol, int min_hint, int exact_hint) { - return new H2ODrm(empty_frame(nrow, ncol, min_hint, exact_hint)); + public static H2ODrm emptyDrm(long nrow, int ncol, int min_hint, int exact_hint) { + return new H2ODrm(emptyFrame(nrow, ncol, min_hint, exact_hint)); } } http://git-wip-us.apache.org/repos/asf/mahout/blob/c9649868/h2o/src/main/java/org/apache/mahout/h2obindings/ops/ABt.java ---------------------------------------------------------------------- diff --git a/h2o/src/main/java/org/apache/mahout/h2obindings/ops/ABt.java b/h2o/src/main/java/org/apache/mahout/h2obindings/ops/ABt.java index d05013f..b3c1c72 100644 --- a/h2o/src/main/java/org/apache/mahout/h2obindings/ops/ABt.java +++ b/h2o/src/main/java/org/apache/mahout/h2obindings/ops/ABt.java @@ -17,7 +17,6 @@ package org.apache.mahout.h2obindings.ops; -import org.apache.mahout.h2obindings.H2OHelper; import org.apache.mahout.h2obindings.drm.H2ODrm; import water.MRTask; http://git-wip-us.apache.org/repos/asf/mahout/blob/c9649868/h2o/src/main/java/org/apache/mahout/h2obindings/ops/AewB.java ---------------------------------------------------------------------- diff --git a/h2o/src/main/java/org/apache/mahout/h2obindings/ops/AewB.java b/h2o/src/main/java/org/apache/mahout/h2obindings/ops/AewB.java index 2c590bd..ebd3589 100644 --- a/h2o/src/main/java/org/apache/mahout/h2obindings/ops/AewB.java +++ b/h2o/src/main/java/org/apache/mahout/h2obindings/ops/AewB.java @@ -17,7 +17,6 @@ package org.apache.mahout.h2obindings.ops; -import org.apache.mahout.h2obindings.H2OHelper; import org.apache.mahout.h2obindings.drm.H2ODrm; import water.MRTask; http://git-wip-us.apache.org/repos/asf/mahout/blob/c9649868/h2o/src/main/java/org/apache/mahout/h2obindings/ops/AewScalar.java ---------------------------------------------------------------------- diff --git a/h2o/src/main/java/org/apache/mahout/h2obindings/ops/AewScalar.java b/h2o/src/main/java/org/apache/mahout/h2obindings/ops/AewScalar.java index 9b6387d..0995fdd 100644 --- a/h2o/src/main/java/org/apache/mahout/h2obindings/ops/AewScalar.java +++ b/h2o/src/main/java/org/apache/mahout/h2obindings/ops/AewScalar.java @@ -17,7 +17,6 @@ package org.apache.mahout.h2obindings.ops; -import org.apache.mahout.h2obindings.H2OHelper; import org.apache.mahout.h2obindings.drm.H2ODrm; import water.MRTask; http://git-wip-us.apache.org/repos/asf/mahout/blob/c9649868/h2o/src/main/java/org/apache/mahout/h2obindings/ops/At.java ---------------------------------------------------------------------- diff --git a/h2o/src/main/java/org/apache/mahout/h2obindings/ops/At.java b/h2o/src/main/java/org/apache/mahout/h2obindings/ops/At.java index a6698f0..040753f 100644 --- a/h2o/src/main/java/org/apache/mahout/h2obindings/ops/At.java +++ b/h2o/src/main/java/org/apache/mahout/h2obindings/ops/At.java @@ -24,7 +24,6 @@ import water.MRTask; import water.fvec.Frame; import water.fvec.Vec; import water.fvec.Chunk; -import water.fvec.NewChunk; public class At { /* Calculate A' (transpose) */ @@ -33,7 +32,7 @@ public class At { /* First create a new frame of the required dimensions, A.numCols() rows and A.numRows() columns. */ - Frame At = H2OHelper.empty_frame(A.numCols(), (int)A.numRows(), -1, -1); + Frame At = H2OHelper.emptyFrame(A.numCols(), (int) A.numRows(), -1, -1); /* Execute MRTask on the new frame, and fill each cell (initially 0) by pulling in the appropriate value from A. http://git-wip-us.apache.org/repos/asf/mahout/blob/c9649868/h2o/src/main/java/org/apache/mahout/h2obindings/ops/AtA.java ---------------------------------------------------------------------- diff --git a/h2o/src/main/java/org/apache/mahout/h2obindings/ops/AtA.java b/h2o/src/main/java/org/apache/mahout/h2obindings/ops/AtA.java index 58f21bf..d9fc9b2 100644 --- a/h2o/src/main/java/org/apache/mahout/h2obindings/ops/AtA.java +++ b/h2o/src/main/java/org/apache/mahout/h2obindings/ops/AtA.java @@ -24,14 +24,13 @@ import water.MRTask; import water.fvec.Frame; import water.fvec.Vec; import water.fvec.Chunk; -import water.fvec.NewChunk; public class AtA { /* Calculate A'A */ public static H2ODrm AtA(H2ODrm drmA) { final Frame A = drmA.frame; /* First create an empty Frame of the required dimensions */ - Frame AtA = H2OHelper.empty_frame(A.numCols(), A.numCols(), -1, -1); + Frame AtA = H2OHelper.emptyFrame(A.numCols(), A.numCols(), -1, -1); /* Execute MRTask on the new Frame, and fill each cell (initially 0) by computing appropriate values from A. http://git-wip-us.apache.org/repos/asf/mahout/blob/c9649868/h2o/src/main/java/org/apache/mahout/h2obindings/ops/AtB.java ---------------------------------------------------------------------- diff --git a/h2o/src/main/java/org/apache/mahout/h2obindings/ops/AtB.java b/h2o/src/main/java/org/apache/mahout/h2obindings/ops/AtB.java index 3e8cf08..308cbcf 100644 --- a/h2o/src/main/java/org/apache/mahout/h2obindings/ops/AtB.java +++ b/h2o/src/main/java/org/apache/mahout/h2obindings/ops/AtB.java @@ -24,7 +24,6 @@ import water.MRTask; import water.fvec.Frame; import water.fvec.Vec; import water.fvec.Chunk; -import water.fvec.NewChunk; public class AtB { /* Calculate A'B */ @@ -33,7 +32,7 @@ public class AtB { final Frame B = drmB.frame; /* First create an empty frame of the required dimensions */ - Frame AtB = H2OHelper.empty_frame(A.numCols(), B.numCols(), -1, -1); + Frame AtB = H2OHelper.emptyFrame(A.numCols(), B.numCols(), -1, -1); /* Execute MRTask on the new Frame, and fill each cell (initially 0) by computing appropriate values from A and B. http://git-wip-us.apache.org/repos/asf/mahout/blob/c9649868/h2o/src/main/java/org/apache/mahout/h2obindings/ops/Atx.java ---------------------------------------------------------------------- diff --git a/h2o/src/main/java/org/apache/mahout/h2obindings/ops/Atx.java b/h2o/src/main/java/org/apache/mahout/h2obindings/ops/Atx.java index 88465e9..30a7d8f 100644 --- a/h2o/src/main/java/org/apache/mahout/h2obindings/ops/Atx.java +++ b/h2o/src/main/java/org/apache/mahout/h2obindings/ops/Atx.java @@ -27,9 +27,7 @@ import org.apache.mahout.h2obindings.drm.H2ODrm; import water.MRTask; import water.fvec.Frame; -import water.fvec.Vec; import water.fvec.Chunk; -import water.fvec.NewChunk; import water.util.ArrayUtils; public class Atx { @@ -71,6 +69,6 @@ public class Atx { Vector v = new DenseVector(new MRTaskAtx().doAll(A).atx); Matrix m = new DenseMatrix(A.numCols(), 1); m.assignColumn(0, v); - return H2OHelper.drm_from_matrix(m, -1, -1); + return H2OHelper.drmFromMatrix(m, -1, -1); } } http://git-wip-us.apache.org/repos/asf/mahout/blob/c9649868/h2o/src/main/java/org/apache/mahout/h2obindings/ops/Cbind.java ---------------------------------------------------------------------- diff --git a/h2o/src/main/java/org/apache/mahout/h2obindings/ops/Cbind.java b/h2o/src/main/java/org/apache/mahout/h2obindings/ops/Cbind.java index 3871cab..5c0f67b 100644 --- a/h2o/src/main/java/org/apache/mahout/h2obindings/ops/Cbind.java +++ b/h2o/src/main/java/org/apache/mahout/h2obindings/ops/Cbind.java @@ -21,9 +21,7 @@ import water.MRTask; import water.fvec.Frame; import water.fvec.Vec; import water.fvec.Chunk; -import water.fvec.NewChunk; -import org.apache.mahout.h2obindings.H2OHelper; import org.apache.mahout.h2obindings.drm.H2ODrm; public class Cbind { http://git-wip-us.apache.org/repos/asf/mahout/blob/c9649868/h2o/src/main/java/org/apache/mahout/h2obindings/ops/Par.java ---------------------------------------------------------------------- diff --git a/h2o/src/main/java/org/apache/mahout/h2obindings/ops/Par.java b/h2o/src/main/java/org/apache/mahout/h2obindings/ops/Par.java index 27d6733..036bfc6 100644 --- a/h2o/src/main/java/org/apache/mahout/h2obindings/ops/Par.java +++ b/h2o/src/main/java/org/apache/mahout/h2obindings/ops/Par.java @@ -33,7 +33,7 @@ public class Par { final Vec vin = drmA.keys; /* First create a new empty Frame with the required partitioning */ - Frame frout = H2OHelper.empty_frame(frin.numRows(), frin.numCols(), min, exact); + Frame frout = H2OHelper.emptyFrame(frin.numRows(), frin.numCols(), min, exact); Vec vout = null; if (vin != null) { http://git-wip-us.apache.org/repos/asf/mahout/blob/c9649868/h2o/src/main/java/org/apache/mahout/h2obindings/ops/Rbind.java ---------------------------------------------------------------------- diff --git a/h2o/src/main/java/org/apache/mahout/h2obindings/ops/Rbind.java b/h2o/src/main/java/org/apache/mahout/h2obindings/ops/Rbind.java index ed4b0fb..cb0ba12 100644 --- a/h2o/src/main/java/org/apache/mahout/h2obindings/ops/Rbind.java +++ b/h2o/src/main/java/org/apache/mahout/h2obindings/ops/Rbind.java @@ -39,8 +39,8 @@ public class Rbind { Create the frame in the same VectorGroup as A, so A's data does not cross the wire during copy. B's data could potentially cross the wire. */ - Frame frbind = H2OHelper.empty_frame(fra.numRows() + frb.numRows(), fra.numCols(), - -1, -1, fra.anyVec().group()); + Frame frbind = H2OHelper.emptyFrame(fra.numRows() + frb.numRows(), fra.numCols(), + -1, -1, fra.anyVec().group()); Vec keys = null; MRTask task = new MRTask() { http://git-wip-us.apache.org/repos/asf/mahout/blob/c9649868/h2o/src/main/java/org/apache/mahout/h2obindings/ops/TimesRightMatrix.java ---------------------------------------------------------------------- diff --git a/h2o/src/main/java/org/apache/mahout/h2obindings/ops/TimesRightMatrix.java b/h2o/src/main/java/org/apache/mahout/h2obindings/ops/TimesRightMatrix.java index 364f039..4fa81bb 100644 --- a/h2o/src/main/java/org/apache/mahout/h2obindings/ops/TimesRightMatrix.java +++ b/h2o/src/main/java/org/apache/mahout/h2obindings/ops/TimesRightMatrix.java @@ -20,7 +20,6 @@ package org.apache.mahout.h2obindings.ops; import org.apache.mahout.math.Matrix; import org.apache.mahout.math.Vector; import org.apache.mahout.math.DiagonalMatrix; -import org.apache.mahout.h2obindings.H2OHelper; import org.apache.mahout.h2obindings.drm.H2OBCast; import org.apache.mahout.h2obindings.drm.H2ODrm; http://git-wip-us.apache.org/repos/asf/mahout/blob/c9649868/h2o/src/main/scala/org/apache/mahout/h2obindings/H2OEngine.scala ---------------------------------------------------------------------- diff --git a/h2o/src/main/scala/org/apache/mahout/h2obindings/H2OEngine.scala b/h2o/src/main/scala/org/apache/mahout/h2obindings/H2OEngine.scala index 860fb84..5de9caf 100644 --- a/h2o/src/main/scala/org/apache/mahout/h2obindings/H2OEngine.scala +++ b/h2o/src/main/scala/org/apache/mahout/h2obindings/H2OEngine.scala @@ -44,19 +44,19 @@ object H2OEngine extends DistributedEngine { new H2OBCast(v) def drmFromHDFS(path: String, parMin: Int = 0)(implicit dc: DistributedContext): CheckpointedDrm[_] = - new CheckpointedDrmH2O(H2OHdfs.drm_from_file(path, parMin), dc) + new CheckpointedDrmH2O(H2OHdfs.drmFromFile(path, parMin), dc) def drmParallelizeEmpty(nrow: Int, ncol: Int, numPartitions: Int)(implicit dc: DistributedContext): CheckpointedDrm[Int] = - new CheckpointedDrmH2O[Int](H2OHelper.empty_drm(nrow, ncol, numPartitions, -1), dc) + new CheckpointedDrmH2O[Int](H2OHelper.emptyDrm(nrow, ncol, numPartitions, -1), dc) def drmParallelizeEmptyLong(nrow: Long, ncol: Int, numPartitions: Int)(implicit dc: DistributedContext): CheckpointedDrm[Long] = - new CheckpointedDrmH2O[Long](H2OHelper.empty_drm(nrow, ncol, numPartitions, -1), dc) + new CheckpointedDrmH2O[Long](H2OHelper.emptyDrm(nrow, ncol, numPartitions, -1), dc) def drmParallelizeWithRowIndices(m: Matrix, numPartitions: Int)(implicit dc: DistributedContext): CheckpointedDrm[Int] = - new CheckpointedDrmH2O[Int](H2OHelper.drm_from_matrix(m, numPartitions, -1), dc) + new CheckpointedDrmH2O[Int](H2OHelper.drmFromMatrix(m, numPartitions, -1), dc) def drmParallelizeWithRowLabels(m: Matrix, numPartitions: Int)(implicit dc: DistributedContext): CheckpointedDrm[String] = - new CheckpointedDrmH2O[String](H2OHelper.drm_from_matrix(m, numPartitions, -1), dc) + new CheckpointedDrmH2O[String](H2OHelper.drmFromMatrix(m, numPartitions, -1), dc) def toPhysical[K:ClassTag](plan: DrmLike[K], ch: CacheHint.CacheHint): CheckpointedDrm[K] = new CheckpointedDrmH2O[K](tr2phys(plan), plan.context) http://git-wip-us.apache.org/repos/asf/mahout/blob/c9649868/h2o/src/main/scala/org/apache/mahout/h2obindings/drm/CheckpointedDrmH2O.scala ---------------------------------------------------------------------- diff --git a/h2o/src/main/scala/org/apache/mahout/h2obindings/drm/CheckpointedDrmH2O.scala b/h2o/src/main/scala/org/apache/mahout/h2obindings/drm/CheckpointedDrmH2O.scala index 8d10cbc..58a9a79 100644 --- a/h2o/src/main/scala/org/apache/mahout/h2obindings/drm/CheckpointedDrmH2O.scala +++ b/h2o/src/main/scala/org/apache/mahout/h2obindings/drm/CheckpointedDrmH2O.scala @@ -14,11 +14,11 @@ class CheckpointedDrmH2O[K: ClassTag]( val context: DistributedContext ) extends CheckpointedDrm[K] { - def collect: Matrix = H2OHelper.matrix_from_drm(h2odrm) + def collect: Matrix = H2OHelper.matrixFromDrm(h2odrm) /* XXX: call frame.remove */ def uncache(): this.type = this - def writeDRM(path: String): Unit = H2OHdfs.drm_to_file(path, h2odrm) + def writeDRM(path: String): Unit = H2OHdfs.drmToFile(path, h2odrm) def checkpoint(cacheHint: CacheHint.CacheHint): CheckpointedDrm[K] = this
