mahout-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From av...@apache.org
Subject mahout git commit: Squashed commit of the following:
Date Wed, 24 Jun 2015 00:56:21 GMT
Repository: mahout
Updated Branches:
  refs/heads/master bbf4e5a34 -> 2c143fcc0


Squashed commit of the following:

Closes apache/mahout#142

commit 7d4a858874eb079e41824f481b45c7a4802187fb
Author: Anand Avati <avati@redhat.com>
Date:   Tue Jun 23 15:40:45 2015 -0700

    MAHOUT-1737: implement AewUnaryFunc on H2O

    Signed-off-by: Anand Avati <avati@redhat.com>


Project: http://git-wip-us.apache.org/repos/asf/mahout/repo
Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/2c143fcc
Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/2c143fcc
Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/2c143fcc

Branch: refs/heads/master
Commit: 2c143fcc06f0e9cac2e8d62bc1adfde26058b1b8
Parents: bbf4e5a
Author: Anand Avati <avati@redhat.com>
Authored: Tue Jun 23 17:55:49 2015 -0700
Committer: Anand Avati <avati@redhat.com>
Committed: Tue Jun 23 17:55:49 2015 -0700

----------------------------------------------------------------------
 .../apache/mahout/h2obindings/ops/AewUnary.java | 89 ++++++++++++++++++++
 .../apache/mahout/h2obindings/H2OEngine.scala   |  2 +
 2 files changed, 91 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mahout/blob/2c143fcc/h2o/src/main/java/org/apache/mahout/h2obindings/ops/AewUnary.java
----------------------------------------------------------------------
diff --git a/h2o/src/main/java/org/apache/mahout/h2obindings/ops/AewUnary.java b/h2o/src/main/java/org/apache/mahout/h2obindings/ops/AewUnary.java
new file mode 100644
index 0000000..ddeb4ff
--- /dev/null
+++ b/h2o/src/main/java/org/apache/mahout/h2obindings/ops/AewUnary.java
@@ -0,0 +1,89 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.apache.mahout.h2obindings.ops;
+
+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 java.io.Serializable;
+import scala.Function1;
+
+/**
+ * MapBlock operator.
+ */
+public class AewUnary {
+  /**
+   * Execute a UnaryFunc on each element of a DRM. Create a new DRM
+   * with the new values.
+   *
+   * @param drmA DRM representing matrix A.
+   * @param f UnaryFunc f, that accepts and Double and returns a Double.
+   * @param z Whether or not to execute function on zeroes (in case of sparse DRM).
+   * @return new DRM constructed from mapped values of drmA through f.
+   */
+  public static H2ODrm exec(H2ODrm drmA, Object f, final boolean evalZeros) {
+
+    Frame A = drmA.frame;
+    Vec keys = drmA.keys;
+    final int ncol = A.numCols();
+
+    /**
+     * MRTask to execute fn on all elements.
+     */
+    class MRTaskAewUnary extends MRTask<MRTaskAewUnary> {
+      Serializable fn;
+      MRTaskAewUnary(Object _fn) {
+        fn = (Serializable)_fn;
+      }
+      public void map(Chunk chks[], NewChunk ncs[]) {
+        for (int c = 0; c < chks.length; c++) {
+          Chunk chk = chks[c];
+	  Function1 f = (Function1) fn;
+	  int ChunkLen = chk.len();
+
+          if (!evalZeros && chk.isSparse()) {
+            /* sparse and skip zeros */
+            int prev_offset = -1;
+            for (int r = chk.nextNZ(-1); r < ChunkLen; r = chk.nextNZ(prev_offset)) {
+              if (r - prev_offset > 1)
+                ncs[c].addZeros(r - prev_offset - 1);
+              ncs[c].addNum((double)f.apply((java.lang.Double)chk.atd(r)));
+              prev_offset = r;
+            }
+            if (ChunkLen - prev_offset > 1)
+              ncs[c].addZeros(chk._len - prev_offset - 1);
+          } else {
+            /* dense or non-skip zeros */
+            for (int r = 0; r < ChunkLen; r++) {
+              ncs[c].addNum((double)f.apply((java.lang.Double)chk.atd(r)));
+            }
+          }
+        }
+      }
+    }
+
+    Frame fmap = new MRTaskAewUnary(f).doAll(ncol, A).outputFrame(null, null);
+
+    return new H2ODrm(fmap, keys);
+  }
+}

http://git-wip-us.apache.org/repos/asf/mahout/blob/2c143fcc/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 e0ac302..420c22d 100644
--- a/h2o/src/main/scala/org/apache/mahout/h2obindings/H2OEngine.scala
+++ b/h2o/src/main/scala/org/apache/mahout/h2obindings/H2OEngine.scala
@@ -100,6 +100,8 @@ object H2OEngine extends DistributedEngine {
       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@OpAewUnaryFunc(a, f, z) => AewUnary.exec(tr2phys(a)(op.classTagA), op.f,
z)
+      case op@OpAewUnaryFuncFusion(a, f) => AewUnary.exec(tr2phys(a)(op.classTagA), op.f,
op.evalZeros)
       case op@OpAewB(a, b, opId) => AewB.exec(tr2phys(a)(op.classTagA), tr2phys(b)(op.classTagB),
opId)
       case op@OpAewScalar(a, s, opId) => AewScalar.exec(tr2phys(a)(op.classTagA), s, opId)
       case op@OpTimesRightMatrix(a, m) => TimesRightMatrix.exec(tr2phys(a)(op.classTagA),
m)


Mime
View raw message