You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by sm...@apache.org on 2016/05/12 11:46:27 UTC
mahout git commit: 1. Upgrade to Flink 1.0.3 2. Minor fixes in code
Repository: mahout
Updated Branches:
refs/heads/master 6ab5a8d64 -> 79a70dff9
1. Upgrade to Flink 1.0.3
2. Minor fixes in code
Project: http://git-wip-us.apache.org/repos/asf/mahout/repo
Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/79a70dff
Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/79a70dff
Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/79a70dff
Branch: refs/heads/master
Commit: 79a70dff924d30e634672e58ecc6cfac3265f82e
Parents: 6ab5a8d
Author: smarthi <sm...@apache.org>
Authored: Thu May 12 04:46:00 2016 -0700
Committer: smarthi <sm...@apache.org>
Committed: Thu May 12 04:46:00 2016 -0700
----------------------------------------------------------------------
.../apache/mahout/flinkbindings/blas/FlinkOpCBind.scala | 2 +-
.../java/org/apache/mahout/math/flavor/MatrixFlavor.java | 10 +++++-----
pom.xml | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mahout/blob/79a70dff/flink/src/main/scala/org/apache/mahout/flinkbindings/blas/FlinkOpCBind.scala
----------------------------------------------------------------------
diff --git a/flink/src/main/scala/org/apache/mahout/flinkbindings/blas/FlinkOpCBind.scala b/flink/src/main/scala/org/apache/mahout/flinkbindings/blas/FlinkOpCBind.scala
index 17927a4..0e16fa8 100644
--- a/flink/src/main/scala/org/apache/mahout/flinkbindings/blas/FlinkOpCBind.scala
+++ b/flink/src/main/scala/org/apache/mahout/flinkbindings/blas/FlinkOpCBind.scala
@@ -101,7 +101,7 @@ object FlinkOpCBind {
} else {
newMat.zip(mat).foreach { case (newVec, origVec) =>
newVec(ncol) = x
- newVec(0 to (ncol - 1)) := origVec
+ newVec(0 until ncol) := origVec
}
}
http://git-wip-us.apache.org/repos/asf/mahout/blob/79a70dff/math/src/main/java/org/apache/mahout/math/flavor/MatrixFlavor.java
----------------------------------------------------------------------
diff --git a/math/src/main/java/org/apache/mahout/math/flavor/MatrixFlavor.java b/math/src/main/java/org/apache/mahout/math/flavor/MatrixFlavor.java
index 2b5c444..e1d93f2 100644
--- a/math/src/main/java/org/apache/mahout/math/flavor/MatrixFlavor.java
+++ b/math/src/main/java/org/apache/mahout/math/flavor/MatrixFlavor.java
@@ -35,24 +35,24 @@ public interface MatrixFlavor {
/**
* This default for {@link org.apache.mahout.math.DenseMatrix}-like structures
*/
- static final MatrixFlavor DENSELIKE = new FlavorImpl(BackEnum.JVMMEM, TraversingStructureEnum.ROWWISE, true);
+ MatrixFlavor DENSELIKE = new FlavorImpl(BackEnum.JVMMEM, TraversingStructureEnum.ROWWISE, true);
/**
* This is default flavor for {@link org.apache.mahout.math.SparseRowMatrix}-like.
*/
- static final MatrixFlavor SPARSELIKE = new FlavorImpl(BackEnum.JVMMEM, TraversingStructureEnum.ROWWISE, false);
+ MatrixFlavor SPARSELIKE = new FlavorImpl(BackEnum.JVMMEM, TraversingStructureEnum.ROWWISE, false);
/**
* This is default flavor for {@link org.apache.mahout.math.SparseMatrix}-like structures, i.e. sparse matrix blocks,
* where few, perhaps most, rows may be missing entirely.
*/
- static final MatrixFlavor SPARSEROWLIKE = new FlavorImpl(BackEnum.JVMMEM, TraversingStructureEnum.SPARSEROWWISE, false);
+ MatrixFlavor SPARSEROWLIKE = new FlavorImpl(BackEnum.JVMMEM, TraversingStructureEnum.SPARSEROWWISE, false);
/**
* This is default flavor for {@link org.apache.mahout.math.DiagonalMatrix} and the likes.
*/
- static final MatrixFlavor DIAGONALLIKE = new FlavorImpl(BackEnum.JVMMEM, TraversingStructureEnum.VECTORBACKED, false);
+ MatrixFlavor DIAGONALLIKE = new FlavorImpl(BackEnum.JVMMEM, TraversingStructureEnum.VECTORBACKED, false);
- static final class FlavorImpl implements MatrixFlavor {
+ final class FlavorImpl implements MatrixFlavor {
private BackEnum pBacking;
private TraversingStructureEnum pStructure;
private boolean pDense;
http://git-wip-us.apache.org/repos/asf/mahout/blob/79a70dff/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c669467..64c17f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -122,7 +122,7 @@
<scala.compat.version>2.10</scala.compat.version>
<scala.version>2.10.4</scala.version>
<spark.version>1.5.2</spark.version>
- <flink.version>1.0.2</flink.version>
+ <flink.version>1.0.3</flink.version>
<h2o.version>0.1.25</h2o.version>
<jackson.version>2.7.2</jackson.version>
</properties>