You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by ap...@apache.org on 2014/08/28 22:06:30 UTC
git commit: MAHOUT-1500: H2O Integration - more style revisions
closes apache/mahout#48
Repository: mahout
Updated Branches:
refs/heads/master 149c98592 -> 03a5bb61e
MAHOUT-1500: H2O Integration - more style revisions closes apache/mahout#48
Project: http://git-wip-us.apache.org/repos/asf/mahout/repo
Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/03a5bb61
Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/03a5bb61
Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/03a5bb61
Branch: refs/heads/master
Commit: 03a5bb61ed56daccd207d7a255956e21612cf995
Parents: 149c985
Author: Andrew Palumbo <ap...@outlook.com>
Authored: Thu Aug 28 16:03:39 2014 -0400
Committer: Andrew Palumbo <ap...@outlook.com>
Committed: Thu Aug 28 16:03:39 2014 -0400
----------------------------------------------------------------------
.../org/apache/mahout/h2obindings/ops/ABt.java | 2 +-
.../org/apache/mahout/h2obindings/ops/AewB.java | 2 +-
.../mahout/h2obindings/ops/AewScalar.java | 2 +-
.../org/apache/mahout/h2obindings/ops/At.java | 2 +-
.../org/apache/mahout/h2obindings/ops/AtA.java | 2 +-
.../org/apache/mahout/h2obindings/ops/AtB.java | 2 +-
.../org/apache/mahout/h2obindings/ops/Atx.java | 2 +-
.../org/apache/mahout/h2obindings/ops/Ax.java | 2 +-
.../apache/mahout/h2obindings/ops/Cbind.java | 2 +-
.../apache/mahout/h2obindings/ops/Rbind.java | 2 +-
.../apache/mahout/h2obindings/ops/RowRange.java | 2 +-
.../h2obindings/ops/TimesRightMatrix.java | 10 ++++----
.../apache/mahout/h2obindings/H2OEngine.scala | 24 ++++++++++----------
13 files changed, 28 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mahout/blob/03a5bb61/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 b3c1c72..1e91ace 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
@@ -27,7 +27,7 @@ import water.fvec.NewChunk;
public class ABt {
/* Calculate AB' */
- public static H2ODrm ABt(H2ODrm drmA, H2ODrm drmB) {
+ public static H2ODrm exec(H2ODrm drmA, H2ODrm drmB) {
Frame A = drmA.frame;
Vec keys = drmA.keys;
final Frame B = drmB.frame;
http://git-wip-us.apache.org/repos/asf/mahout/blob/03a5bb61/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 ebd3589..20d6a6d 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
@@ -27,7 +27,7 @@ import water.fvec.NewChunk;
public class AewB {
/* Element-wise DRM-DRM operations */
- public static H2ODrm AewB(H2ODrm drmA, H2ODrm drmB, final String op) {
+ public static H2ODrm exec(H2ODrm drmA, H2ODrm drmB, final String op) {
final Frame A = drmA.frame;
final Frame B = drmB.frame;
Vec keys = drmA.keys;
http://git-wip-us.apache.org/repos/asf/mahout/blob/03a5bb61/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 0995fdd..41182d7 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
@@ -27,7 +27,7 @@ import water.fvec.NewChunk;
public class AewScalar {
/* Element-wise DRM-DRM operations */
- public static H2ODrm AewScalar(H2ODrm drmA, final double s, final String op) {
+ public static H2ODrm exec(H2ODrm drmA, final double s, final String op) {
Frame A = drmA.frame;
Vec keys = drmA.keys;
int AewScalar_cols = A.numCols();
http://git-wip-us.apache.org/repos/asf/mahout/blob/03a5bb61/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 040753f..4e8d17d 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
@@ -27,7 +27,7 @@ import water.fvec.Chunk;
public class At {
/* Calculate A' (transpose) */
- public static H2ODrm At(H2ODrm drmA) {
+ public static H2ODrm exec(H2ODrm drmA) {
final Frame A = drmA.frame;
/* First create a new frame of the required dimensions, A.numCols() rows
and A.numRows() columns.
http://git-wip-us.apache.org/repos/asf/mahout/blob/03a5bb61/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 d9fc9b2..6ffcfc0 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
@@ -27,7 +27,7 @@ import water.fvec.Chunk;
public class AtA {
/* Calculate A'A */
- public static H2ODrm AtA(H2ODrm drmA) {
+ public static H2ODrm exec(H2ODrm drmA) {
final Frame A = drmA.frame;
/* First create an empty Frame of the required dimensions */
Frame AtA = H2OHelper.emptyFrame(A.numCols(), A.numCols(), -1, -1);
http://git-wip-us.apache.org/repos/asf/mahout/blob/03a5bb61/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 308cbcf..72de4d1 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
@@ -27,7 +27,7 @@ import water.fvec.Chunk;
public class AtB {
/* Calculate A'B */
- public static H2ODrm AtB(H2ODrm drmA, H2ODrm drmB) {
+ public static H2ODrm exec(H2ODrm drmA, H2ODrm drmB) {
final Frame A = drmA.frame;
final Frame B = drmB.frame;
http://git-wip-us.apache.org/repos/asf/mahout/blob/03a5bb61/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 30a7d8f..306d1ac 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
@@ -32,7 +32,7 @@ import water.util.ArrayUtils;
public class Atx {
/* Calculate A'x (where x is an in-core Vector) */
- public static H2ODrm Atx(H2ODrm drmA, Vector x) {
+ public static H2ODrm exec(H2ODrm drmA, Vector x) {
Frame A = drmA.frame;
final H2OBCast<Vector> bx = new H2OBCast<Vector>(x);
http://git-wip-us.apache.org/repos/asf/mahout/blob/03a5bb61/h2o/src/main/java/org/apache/mahout/h2obindings/ops/Ax.java
----------------------------------------------------------------------
diff --git a/h2o/src/main/java/org/apache/mahout/h2obindings/ops/Ax.java b/h2o/src/main/java/org/apache/mahout/h2obindings/ops/Ax.java
index 2d9c0d0..c93d487 100644
--- a/h2o/src/main/java/org/apache/mahout/h2obindings/ops/Ax.java
+++ b/h2o/src/main/java/org/apache/mahout/h2obindings/ops/Ax.java
@@ -30,7 +30,7 @@ import water.fvec.NewChunk;
public class Ax {
/* Calculate Ax (where x is an in-core Vector) */
- public static H2ODrm Ax(H2ODrm drmA, Vector x) {
+ public static H2ODrm exec(H2ODrm drmA, Vector x) {
Frame A = drmA.frame;
Vec keys = drmA.keys;
final H2OBCast<Vector> bx = new H2OBCast<Vector>(x);
http://git-wip-us.apache.org/repos/asf/mahout/blob/03a5bb61/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 5c0f67b..cb8a0b9 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
@@ -26,7 +26,7 @@ import org.apache.mahout.h2obindings.drm.H2ODrm;
public class Cbind {
/* R's cbind like operator, on DrmA and DrmB */
- public static H2ODrm Cbind(H2ODrm drmA, H2ODrm drmB) {
+ public static H2ODrm exec(H2ODrm drmA, H2ODrm drmB) {
Frame fra = drmA.frame;
Vec keysa = drmA.keys;
Frame frb = drmB.frame;
http://git-wip-us.apache.org/repos/asf/mahout/blob/03a5bb61/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 cb0ba12..4ee5fc9 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
@@ -29,7 +29,7 @@ import org.apache.mahout.h2obindings.drm.H2ODrm;
public class Rbind {
/* R's rbind like operator, on DrmA and DrmB */
- public static H2ODrm Rbind(H2ODrm drmA, H2ODrm drmB) {
+ public static H2ODrm exec(H2ODrm drmA, H2ODrm drmB) {
final Frame fra = drmA.frame;
final Vec keysa = drmA.keys;
final Frame frb = drmB.frame;
http://git-wip-us.apache.org/repos/asf/mahout/blob/03a5bb61/h2o/src/main/java/org/apache/mahout/h2obindings/ops/RowRange.java
----------------------------------------------------------------------
diff --git a/h2o/src/main/java/org/apache/mahout/h2obindings/ops/RowRange.java b/h2o/src/main/java/org/apache/mahout/h2obindings/ops/RowRange.java
index 5ce7732..9af5feb 100644
--- a/h2o/src/main/java/org/apache/mahout/h2obindings/ops/RowRange.java
+++ b/h2o/src/main/java/org/apache/mahout/h2obindings/ops/RowRange.java
@@ -30,7 +30,7 @@ import org.apache.mahout.h2obindings.drm.H2ODrm;
public class RowRange {
/* Filter operation */
- public static H2ODrm RowRange(H2ODrm drmA, final Range R) {
+ public static H2ODrm exec(H2ODrm drmA, final Range R) {
Frame A = drmA.frame;
Vec keys = drmA.keys;
http://git-wip-us.apache.org/repos/asf/mahout/blob/03a5bb61/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 4fa81bb..ab185d8 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
@@ -31,15 +31,15 @@ import water.fvec.NewChunk;
public class TimesRightMatrix {
/* Multiple with in-core Matrix */
- public static H2ODrm TimesRightMatrix(H2ODrm drmA, Matrix B) {
+ public static H2ODrm exec(H2ODrm drmA, Matrix B) {
Frame A = drmA.frame;
Vec keys = drmA.keys;
Frame AinCoreB = null;
if (B instanceof DiagonalMatrix) {
- AinCoreB = AinCoreB_diagonal(A, B.viewDiagonal());
+ AinCoreB = execDiagonal(A, B.viewDiagonal());
} else {
- AinCoreB = AinCoreB_common(A, B);
+ AinCoreB = execCommon(A, B);
}
return new H2ODrm(AinCoreB, keys);
@@ -50,7 +50,7 @@ public class TimesRightMatrix {
A.numCols() == d.size()
*/
- private static Frame AinCoreB_diagonal(final Frame A, Vector d) {
+ private static Frame execDiagonal(final Frame A, Vector d) {
final H2OBCast<Vector> bd = new H2OBCast<Vector>(d);
return new MRTask() {
@@ -73,7 +73,7 @@ public class TimesRightMatrix {
A.numCols() == b.rowSize()
*/
- private static Frame AinCoreB_common(final Frame A, Matrix b) {
+ private static Frame execCommon(final Frame A, Matrix b) {
final H2OBCast<Matrix> bb = new H2OBCast<Matrix>(b);
return new MRTask() {
http://git-wip-us.apache.org/repos/asf/mahout/blob/03a5bb61/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 5de9caf..a8485af 100644
--- a/h2o/src/main/scala/org/apache/mahout/h2obindings/H2OEngine.scala
+++ b/h2o/src/main/scala/org/apache/mahout/h2obindings/H2OEngine.scala
@@ -67,19 +67,19 @@ object H2OEngine extends DistributedEngine {
oper match {
case OpAtAnyKey(_) =>
throw new IllegalArgumentException("\"A\" must be Int-keyed in this A.t expression.")
- case op@OpAt(a) => At.At(tr2phys(a)(op.classTagA))
- case op@OpABt(a, b) => ABt.ABt(tr2phys(a)(op.classTagA), tr2phys(b)(op.classTagB))
- case op@OpAtB(a, b) => AtB.AtB(tr2phys(a)(op.classTagA), tr2phys(b)(op.classTagB))
- case op@OpAtA(a) => AtA.AtA(tr2phys(a)(op.classTagA))
- case op@OpAx(a, v) => Ax.Ax(tr2phys(a)(op.classTagA), v)
- case op@OpAtx(a, v) => Atx.Atx(tr2phys(a)(op.classTagA), v)
- case op@OpAewB(a, b, opId) => AewB.AewB(tr2phys(a)(op.classTagA), tr2phys(b)(op.classTagB), opId)
+ case op@OpAt(a) => At.exec(tr2phys(a)(op.classTagA))
+ case op@OpABt(a, b) => ABt.exec(tr2phys(a)(op.classTagA), tr2phys(b)(op.classTagB))
+ case op@OpAtB(a, b) => AtB.exec(tr2phys(a)(op.classTagA), tr2phys(b)(op.classTagB))
+ case op@OpAtA(a) => AtA.exec(tr2phys(a)(op.classTagA))
+ case op@OpAx(a, v) => Ax.exec(tr2phys(a)(op.classTagA), v)
+ case op@OpAtx(a, v) => Atx.exec(tr2phys(a)(op.classTagA), v)
+ case op@OpAewB(a, b, opId) => AewB.exec(tr2phys(a)(op.classTagA), tr2phys(b)(op.classTagB), opId)
// Non arithmetic
- case op@OpCbind(a, b) => Cbind.Cbind(tr2phys(a)(op.classTagA), tr2phys(b)(op.classTagB))
- case op@OpRbind(a, b) => Rbind.Rbind(tr2phys(a)(op.classTagA), tr2phys(b)(op.classTagB))
- case op@OpAewScalar(a, s, opId) => AewScalar.AewScalar(tr2phys(a)(op.classTagA), s, opId)
- case op@OpRowRange(a, r) => RowRange.RowRange(tr2phys(a)(op.classTagA), r)
- case op@OpTimesRightMatrix(a, m) => TimesRightMatrix.TimesRightMatrix(tr2phys(a)(op.classTagA), m)
+ case op@OpCbind(a, b) => Cbind.exec(tr2phys(a)(op.classTagA), tr2phys(b)(op.classTagB))
+ case op@OpRbind(a, b) => Rbind.exec(tr2phys(a)(op.classTagA), tr2phys(b)(op.classTagB))
+ case op@OpAewScalar(a, s, opId) => AewScalar.exec(tr2phys(a)(op.classTagA), s, opId)
+ case op@OpRowRange(a, r) => RowRange.exec(tr2phys(a)(op.classTagA), r)
+ case op@OpTimesRightMatrix(a, m) => TimesRightMatrix.exec(tr2phys(a)(op.classTagA), m)
// Custom operators, we just execute them
case blockOp: OpMapBlock[K, _] => MapBlock.exec(tr2phys(blockOp.A)(blockOp.classTagA), blockOp.ncol, blockOp.bmf,
(blockOp.classTagK == implicitly[ClassTag[String]]), blockOp.classTagA, blockOp.classTagK)