You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by ss...@apache.org on 2015/03/26 17:11:50 UTC
mahout git commit: MAHOUT-1590 Upgraded h2o from 0.1.16 to 0.1.25;
0.1.16 had a bug fixe din 0.1.19, bug which was causing our tests to
fail with NoClassDefFoundError for org.apache.hadoop.fs.s3.S3Exception class
Repository: mahout
Updated Branches:
refs/heads/master 9f4abbd96 -> f5f54a156
MAHOUT-1590 Upgraded h2o from 0.1.16 to 0.1.25; 0.1.16 had a bug fixe din 0.1.19, bug which was causing our tests to fail with NoClassDefFoundError for org.apache.hadoop.fs.s3.S3Exception class
Project: http://git-wip-us.apache.org/repos/asf/mahout/repo
Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/f5f54a15
Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/f5f54a15
Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/f5f54a15
Branch: refs/heads/master
Commit: f5f54a1560c708913c30d460bec361eb71ab0bd7
Parents: 9f4abbd
Author: Stevo Slavic <ss...@gmail.com>
Authored: Thu Mar 26 17:11:41 2015 +0100
Committer: Stevo Slavic <ss...@gmail.com>
Committed: Thu Mar 26 17:11:41 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/mahout/h2obindings/H2OBlockMatrix.java | 4 ++--
h2o/src/main/java/org/apache/mahout/h2obindings/H2OHelper.java | 6 +++---
h2o/src/main/java/org/apache/mahout/h2obindings/ops/ABt.java | 2 +-
h2o/src/main/java/org/apache/mahout/h2obindings/ops/AewB.java | 2 +-
.../main/java/org/apache/mahout/h2obindings/ops/AewScalar.java | 2 +-
h2o/src/main/java/org/apache/mahout/h2obindings/ops/At.java | 2 +-
h2o/src/main/java/org/apache/mahout/h2obindings/ops/AtA.java | 2 +-
h2o/src/main/java/org/apache/mahout/h2obindings/ops/AtB.java | 2 +-
h2o/src/main/java/org/apache/mahout/h2obindings/ops/Atx.java | 2 +-
h2o/src/main/java/org/apache/mahout/h2obindings/ops/Ax.java | 3 +--
h2o/src/main/java/org/apache/mahout/h2obindings/ops/Cbind.java | 2 +-
h2o/src/main/java/org/apache/mahout/h2obindings/ops/Par.java | 4 ++--
h2o/src/main/java/org/apache/mahout/h2obindings/ops/Rbind.java | 4 ++--
.../main/java/org/apache/mahout/h2obindings/ops/RowRange.java | 4 ++--
.../org/apache/mahout/h2obindings/ops/TimesRightMatrix.java | 4 ++--
.../apache/mahout/h2obindings/test/DistributedH2OSuite.scala | 2 +-
pom.xml | 2 +-
17 files changed, 24 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mahout/blob/f5f54a15/h2o/src/main/java/org/apache/mahout/h2obindings/H2OBlockMatrix.java
----------------------------------------------------------------------
diff --git a/h2o/src/main/java/org/apache/mahout/h2obindings/H2OBlockMatrix.java b/h2o/src/main/java/org/apache/mahout/h2obindings/H2OBlockMatrix.java
index 35ddb39..a073e73 100644
--- a/h2o/src/main/java/org/apache/mahout/h2obindings/H2OBlockMatrix.java
+++ b/h2o/src/main/java/org/apache/mahout/h2obindings/H2OBlockMatrix.java
@@ -68,7 +68,7 @@ public class H2OBlockMatrix extends AbstractMatrix {
for (int c = 0; c < chks.length; c++) {
for (int r = 0; r < chks[0].len(); r++) {
- cow.setQuick(r, c, chks[c].at0(r));
+ cow.setQuick(r, c, chks[c].atd(r));
}
}
}
@@ -102,7 +102,7 @@ public class H2OBlockMatrix extends AbstractMatrix {
if (cow != null) {
return cow.getQuick(row, col);
} else {
- return chks[col].at0(row);
+ return chks[col].atd(row);
}
}
http://git-wip-us.apache.org/repos/asf/mahout/blob/f5f54a15/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 d2f0de3..2ede8cf 100644
--- a/h2o/src/main/java/org/apache/mahout/h2obindings/H2OHelper.java
+++ b/h2o/src/main/java/org/apache/mahout/h2obindings/H2OHelper.java
@@ -156,7 +156,7 @@ public class H2OHelper {
for (int c = 0; c < chks.length; c++) {
for (int r = 0; r < chks[c].len(); r++) {
- sums[c] += chks[c].at0(r);
+ sums[c] += chks[c].atd(r);
}
}
}
@@ -187,7 +187,7 @@ public class H2OHelper {
public void map(Chunk chks[]) {
for (int c = 0; c < chks.length; c++) {
for (int r = 0; r < chks[c].len(); r++) {
- sumSqr += (chks[c].at0(r) * chks[c].at0(r));
+ sumSqr += (chks[c].atd(r) * chks[c].atd(r));
}
}
}
@@ -219,7 +219,7 @@ public class H2OHelper {
for (int c = 0; c < chks.length; c++) {
for (int r = 0; r < chks[c].len(); r++) {
- if ((long)chks[c].at0(r) != 0) {
+ if ((long)chks[c].atd(r) != 0) {
sums[c] ++;
}
}
http://git-wip-us.apache.org/repos/asf/mahout/blob/f5f54a15/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 c713e27..89085de 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
@@ -56,7 +56,7 @@ public class ABt {
for (int r = 0; r < chunkSize; r++) {
double v = 0;
for (int i = 0; i < chks.length; i++) {
- v += (chks[i].at0(r) * B_vecs[i].at(c));
+ v += (chks[i].atd(r) * B_vecs[i].at(c));
}
ncs[c].addNum(v);
}
http://git-wip-us.apache.org/repos/asf/mahout/blob/f5f54a15/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 ed4e6eb..3708af6 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
@@ -72,7 +72,7 @@ public class AewB {
for (int c = 0; c < chks.length; c++) {
for (int r = 0; r < chunkSize; r++) {
- ncs[c].addNum(opfn(op, chks[c].at0(r), B_vecs[c].at(start + r)));
+ ncs[c].addNum(opfn(op, chks[c].atd(r), B_vecs[c].at(start + r)));
}
}
}
http://git-wip-us.apache.org/repos/asf/mahout/blob/f5f54a15/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 0680169..323296a 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
@@ -66,7 +66,7 @@ public class AewScalar {
for (int c = 0; c < chks.length; c++) {
for (int r = 0; r < chunkSize; r++) {
- ncs[c].addNum(opfn(op, chks[c].at0(r), s));
+ ncs[c].addNum(opfn(op, chks[c].atd(r), s));
}
}
}
http://git-wip-us.apache.org/repos/asf/mahout/blob/f5f54a15/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 e3ee36a..21882cc 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
@@ -51,7 +51,7 @@ public class At {
for (int c = 0; c < chks.length; c++) {
for (int r = 0; r < chunkSize; r++) {
- chks[c].set0(r, A_vecs[(int)(start + r)].at(c));
+ chks[c].set(r, A_vecs[(int)(start + r)].at(c));
}
}
}
http://git-wip-us.apache.org/repos/asf/mahout/blob/f5f54a15/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 818837e..8493327 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
@@ -57,7 +57,7 @@ public class AtA {
for (long i = 0; i < A_rows; i++) {
v += (A_vecs[(int)(start + r)].at(i) * A_vecs[c].at(i));
}
- chks[c].set0(r, v);
+ chks[c].set(r, v);
}
}
}
http://git-wip-us.apache.org/repos/asf/mahout/blob/f5f54a15/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 1c4275e..7276134 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
@@ -61,7 +61,7 @@ public class AtB {
for (long i = 0; i < A_rows; i++) {
v += (A_vecs[(int)(start + r)].at(i) * B_vecs[c].at(i));
}
- chks[c].set0(r, v);
+ chks[c].set(r, v);
}
}
}
http://git-wip-us.apache.org/repos/asf/mahout/blob/f5f54a15/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 fb954df..3775708 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
@@ -61,7 +61,7 @@ public class Atx {
for (int r = 0; r < chunkSize; r++) {
double d = x.getQuick((int)start + r);
for (int c = 0; c < chks.length; c++) {
- atx[c] += (chks[c].at0(r) * d);
+ atx[c] += (chks[c].atd(r) * d);
}
}
}
http://git-wip-us.apache.org/repos/asf/mahout/blob/f5f54a15/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 548b39a..f732460 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
@@ -18,7 +18,6 @@
package org.apache.mahout.h2obindings.ops;
import org.apache.mahout.math.Vector;
-import org.apache.mahout.h2obindings.H2OHelper;
import org.apache.mahout.h2obindings.drm.H2OBCast;
import org.apache.mahout.h2obindings.drm.H2ODrm;
@@ -56,7 +55,7 @@ public class Ax {
for (int r = 0; r < chunkSize; r++) {
double v = 0;
for (int c = 0; c < chks.length; c++) {
- v += (chks[c].at0(r) * x.getQuick(c));
+ v += (chks[c].atd(r) * x.getQuick(c));
}
nc.addNum(v);
}
http://git-wip-us.apache.org/repos/asf/mahout/blob/f5f54a15/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 8656ca5..03e3793 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
@@ -91,7 +91,7 @@ public class Cbind {
for (int r = 0; r < chunkSize; r++) {
for (int c = 0; c < chks.length; c++) {
// assert va.atStr(start+r) == vb.atStr(start+r)
- chks[c].set0(r, vecs[c].at(start + r));
+ chks[c].set(r, vecs[c].at(start + r));
}
}
}
http://git-wip-us.apache.org/repos/asf/mahout/blob/f5f54a15/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 54db5a1..57eee22 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
@@ -64,7 +64,7 @@ public class Par {
for (int r = 0; r < chunkSize; r++) {
for (int c = 0; c < chks.length; c++) {
- chks[c].set0(r, vins[c].at(start + r));
+ chks[c].set(r, vins[c].at(start + r));
}
nc.addStr(vin.atStr(vstr, start + r));
}
@@ -81,7 +81,7 @@ public class Par {
for (int r = 0; r < chunkSize; r++) {
for (int c = 0; c < chks.length; c++) {
- chks[c].set0(r, vins[c].at(start + r));
+ chks[c].set(r, vins[c].at(start + r));
}
}
}
http://git-wip-us.apache.org/repos/asf/mahout/blob/f5f54a15/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 57eb560..c4f9490 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
@@ -64,12 +64,12 @@ public class Rbind {
for (int r = 0; r < chunkSize; r++) {
for (int c = 0; c < chks.length; c++) {
if (r + start < A_rows) {
- chks[c].set0(r, A_vecs[c].at(r + start));
+ chks[c].set(r, A_vecs[c].at(r + start));
if (keysa != null) {
nc.addStr(keysa.atStr(vstr, r + start));
}
} else {
- chks[c].set0(r, B_vecs[c].at(r + start - A_rows));
+ chks[c].set(r, B_vecs[c].at(r + start - A_rows));
if (keysb != null) {
nc.addStr(keysb.atStr(vstr, r + start - A_rows));
}
http://git-wip-us.apache.org/repos/asf/mahout/blob/f5f54a15/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 e6bb778..43cc024 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
@@ -62,7 +62,7 @@ public class RowRange {
}
for (int c = 0; c < chks.length; c++) {
- ncs[c].addNum(chks[c].at0(r));
+ ncs[c].addNum(chks[c].atd(r));
}
}
}
@@ -85,7 +85,7 @@ public class RowRange {
continue;
}
- nc.addStr(chk.atStr0(vstr, r));
+ nc.addStr(chk.atStr(vstr, r));
}
}
}.doAll(1, keys).outputFrame(null, null).anyVec();
http://git-wip-us.apache.org/repos/asf/mahout/blob/f5f54a15/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 6d96586..e7b74a8 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
@@ -69,7 +69,7 @@ public class TimesRightMatrix {
for (int c = 0; c < ncs.length; c++) {
for (int r = 0; r < chunkSize; r++) {
- double v = (chks[c].at0(r) * D.getQuick(c));
+ double v = (chks[c].atd(r) * D.getQuick(c));
ncs[c].addNum(v);
}
}
@@ -94,7 +94,7 @@ public class TimesRightMatrix {
for (int r = 0; r < chunkSize; r++) {
double v = 0;
for (int i = 0; i < chks.length; i++) {
- v += (chks[i].at0(r) * B.getQuick(i, c));
+ v += (chks[i].atd(r) * B.getQuick(i, c));
}
ncs[c].addNum(v);
}
http://git-wip-us.apache.org/repos/asf/mahout/blob/f5f54a15/h2o/src/test/scala/org/apache/mahout/h2obindings/test/DistributedH2OSuite.scala
----------------------------------------------------------------------
diff --git a/h2o/src/test/scala/org/apache/mahout/h2obindings/test/DistributedH2OSuite.scala b/h2o/src/test/scala/org/apache/mahout/h2obindings/test/DistributedH2OSuite.scala
index 4568fad..45c77a5 100644
--- a/h2o/src/test/scala/org/apache/mahout/h2obindings/test/DistributedH2OSuite.scala
+++ b/h2o/src/test/scala/org/apache/mahout/h2obindings/test/DistributedH2OSuite.scala
@@ -19,7 +19,7 @@ package org.apache.mahout.h2obindings.test
import org.scalatest.Suite
import org.apache.mahout.h2obindings._
-import org.apache.mahout.test.{DistributedMahoutSuite,MahoutSuite}
+import org.apache.mahout.test.DistributedMahoutSuite
import org.apache.mahout.math.drm.DistributedContext
trait DistributedH2OSuite extends DistributedMahoutSuite with LoggerConfiguration {
http://git-wip-us.apache.org/repos/asf/mahout/blob/f5f54a15/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 601345a..ee1dbba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -112,7 +112,7 @@
<scala.major>2.10</scala.major>
<scala.version>2.10.4</scala.version>
<spark.version>1.1.1</spark.version>
- <h2o.version>0.1.16</h2o.version>
+ <h2o.version>0.1.25</h2o.version>
</properties>
<issueManagement>
<system>Jira</system>