Merging branch flink-binding to master

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

Branch: refs/heads/master
Commit: f115633fd4de83afd1be1cc8ced61580cc426604
Parents: eccbc4e c5659b5
Author: smarthi <[email protected]>
Authored: Mon Apr 11 04:08:31 2016 -0400
Committer: smarthi <[email protected]>
Committed: Mon Apr 11 04:08:31 2016 -0400

----------------------------------------------------------------------
 .gitignore                                      |     1 +
 NOTICE.txt                                      |    10 +-
 buildtools/pom.xml                              |     2 +-
 conf/flink-config.yaml                          |    67 +
 distribution/pom.xml                            |     6 +-
 distribution/src/main/assembly/bin.xml          |    17 +
 examples/bin/classify-wikipedia.sh              |     6 +-
 examples/bin/resources/bank-full.csv            | 45212 +++++++++++++++++
 examples/bin/resources/cf-data-purchase.txt     |     7 +
 examples/bin/resources/cf-data-view.txt         |    12 +
 examples/bin/resources/donut-test.csv           |    41 +
 examples/bin/resources/donut.csv                |    41 +
 examples/bin/resources/test-data.csv            |    61 +
 examples/pom.xml                                |     2 +-
 flink/pom.xml                                   |   191 +
 flink/src/main/resources/log4j.properties       |     8 +
 .../mahout/flinkbindings/FlinkByteBCast.scala   |    90 +
 .../flinkbindings/FlinkDistributedContext.scala |    50 +
 .../mahout/flinkbindings/FlinkEngine.scala      |   397 +
 .../mahout/flinkbindings/blas/FlinkOpAewB.scala |    60 +
 .../flinkbindings/blas/FlinkOpAewScalar.scala   |   106 +
 .../mahout/flinkbindings/blas/FlinkOpAt.scala   |    72 +
 .../mahout/flinkbindings/blas/FlinkOpAtA.scala  |   222 +
 .../mahout/flinkbindings/blas/FlinkOpAtB.scala  |    88 +
 .../mahout/flinkbindings/blas/FlinkOpAx.scala   |    96 +
 .../flinkbindings/blas/FlinkOpCBind.scala       |   117 +
 .../flinkbindings/blas/FlinkOpMapBlock.scala    |    47 +
 .../flinkbindings/blas/FlinkOpRBind.scala       |    41 +
 .../flinkbindings/blas/FlinkOpRowRange.scala    |    46 +
 .../blas/FlinkOpTimesRightMatrix.scala          |    81 +
 .../mahout/flinkbindings/blas/package.scala     |   148 +
 .../drm/CheckpointedFlinkDrm.scala              |   302 +
 .../drm/CheckpointedFlinkDrmOps.scala           |    34 +
 .../mahout/flinkbindings/drm/FlinkDrm.scala     |   108 +
 .../mahout/flinkbindings/io/DrmMetadata.scala   |    71 +
 .../flinkbindings/io/HDFSPathSearch.scala       |    82 +
 .../mahout/flinkbindings/io/HDFSUtil.scala      |    33 +
 .../flinkbindings/io/Hadoop2HDFSUtil.scala      |    89 +
 .../apache/mahout/flinkbindings/package.scala   |   114 +
 .../flinkbindings/DistributedFlinkSuite.scala   |    74 +
 .../mahout/flinkbindings/DrmLikeOpsSuite.scala  |    73 +
 .../flinkbindings/FlinkByteBCastSuite.scala     |    38 +
 .../mahout/flinkbindings/RLikeOpsSuite.scala    |   326 +
 .../mahout/flinkbindings/UseCasesSuite.scala    |   141 +
 .../mahout/flinkbindings/blas/LATestSuite.scala |   211 +
 .../flinkbindings/examples/ReadCsvExample.scala |    39 +
 .../standard/DrmLikeOpsSuite.scala              |    28 +
 .../flinkbindings/standard/DrmLikeSuite.scala   |    28 +
 .../FlinkDistributedDecompositionsSuite.scala   |   221 +
 .../standard/NaiveBayesTestSuite.scala          |    29 +
 .../standard/RLikeDrmOpsSuite.scala             |    28 +
 h2o/pom.xml                                     |     2 +-
 .../org/apache/mahout/h2obindings/ops/Atx.java  |     2 +-
 .../h2obindings/drm/CheckpointedDrmH2O.scala    |     5 +-
 hdfs/pom.xml                                    |     2 +-
 integration/pom.xml                             |     2 +-
 math-scala/pom.xml                              |     8 +-
 .../common/io/GenericMatrixKryoSerializer.scala |   188 +
 .../mahout/common/io/VectorKryoSerializer.scala |   248 +
 .../mahout/math/drm/DistributedContext.scala    |     2 +-
 .../math/drm/logical/OpTimesLeftMatrix.scala    |     2 +-
 .../org/apache/mahout/math/drm/package.scala    |     4 +-
 .../apache/mahout/math/scalabindings/MMul.scala |    45 +-
 .../mahout/math/scalabindings/RLikeOps.scala    |     2 +-
 .../DistributedDecompositionsSuiteBase.scala    |     4 +-
 .../mahout/math/drm/RLikeDrmOpsSuiteBase.scala  |     3 +
 .../apache/mahout/nlp/tfidf/TFIDFtestBase.scala |     2 +-
 math/pom.xml                                    |     2 +-
 mr/pom.xml                                      |     2 +-
 pom.xml                                         |    14 +-
 spark-shell/pom.xml                             |     2 +-
 .../sparkbindings/shell/MahoutSparkILoop.scala  |     4 +-
 spark/pom.xml                                   |     2 +-
 .../apache/mahout/common/Hadoop1HDFSUtil.scala  |     8 +-
 .../drivers/MahoutSparkOptionParser.scala       |     6 +-
 .../mahout/drivers/RowSimilarityDriver.scala    |     5 +-
 .../drivers/TextDelimitedReaderWriter.scala     |    10 +-
 .../apache/mahout/drivers/TrainNBDriver.scala   |    21 +-
 .../sparkbindings/SparkDistributedContext.scala |     2 +-
 .../mahout/sparkbindings/SparkEngine.scala      |     2 +-
 .../apache/mahout/sparkbindings/blas/ABt.scala  |    10 +-
 .../apache/mahout/sparkbindings/blas/AewB.scala |    12 +-
 .../mahout/sparkbindings/blas/AinCoreB.scala    |     4 +-
 .../apache/mahout/sparkbindings/blas/At.scala   |     2 +-
 .../apache/mahout/sparkbindings/blas/AtA.scala  |    14 +-
 .../apache/mahout/sparkbindings/blas/AtB.scala  |    12 +-
 .../apache/mahout/sparkbindings/blas/Ax.scala   |     4 +-
 .../mahout/sparkbindings/blas/CbindAB.scala     |     6 +-
 .../mahout/sparkbindings/blas/MapBlock.scala    |     2 +-
 .../apache/mahout/sparkbindings/blas/Par.scala  |     9 +-
 .../mahout/sparkbindings/blas/RbindAB.scala     |     8 +-
 .../mahout/sparkbindings/blas/Slicing.scala     |     2 +-
 .../mahout/sparkbindings/blas/package.scala     |     5 +-
 .../drm/CheckpointedDrmSpark.scala              |    20 +-
 .../drm/CheckpointedDrmSparkOps.scala           |     2 +-
 .../mahout/sparkbindings/drm/DrmRddInput.scala  |     4 +-
 .../io/GenericMatrixKryoSerializer.scala        |   189 -
 .../io/MahoutKryoRegistrator.scala              |     1 +
 .../sparkbindings/io/VectorKryoSerializer.scala |   252 -
 .../apache/mahout/sparkbindings/package.scala   |     2 +-
 .../sparkbindings/SparkBindingsSuite.scala      |     6 +-
 .../test/DistributedSparkSuite.scala            |     4 +-
 102 files changed, 49987 insertions(+), 598 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mahout/blob/f115633f/NOTICE.txt
----------------------------------------------------------------------
diff --cc NOTICE.txt
index ab74f0b,3b9e0a0..29cb479
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@@ -17,7 -17,7 +17,7 @@@ including, but not limited to
  
  This product includes software from the SLF4J project
    http://www.slf4j.org/
-   Copyright (c) 2004-2013 QOS.ch
 -  Copyright (c) 2004-2008 QOS.ch
++  Copyright (c) 2004-2016 QOS.ch
  
  This product includes software developed by the Indiana University
    Extreme! Lab (http://www.extreme.indiana.edu/).

http://git-wip-us.apache.org/repos/asf/mahout/blob/f115633f/distribution/src/main/assembly/bin.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/mahout/blob/f115633f/math-scala/src/main/scala/org/apache/mahout/math/drm/package.scala
----------------------------------------------------------------------

Reply via email to