You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by ak...@apache.org on 2017/04/22 17:48:47 UTC
[2/2] mahout git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/mahout
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/mahout
Project: http://git-wip-us.apache.org/repos/asf/mahout/repo
Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/f2f8cba4
Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/f2f8cba4
Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/f2f8cba4
Branch: refs/heads/master
Commit: f2f8cba4279b86b3a902fcac27e6f5db1d1e49ba
Parents: db5a1d5 4d059f8
Author: Andrew Musselman <ak...@apache.org>
Authored: Sat Apr 22 10:48:32 2017 -0700
Committer: Andrew Musselman <ak...@apache.org>
Committed: Sat Apr 22 10:48:32 2017 -0700
----------------------------------------------------------------------
.gitignore | 6 +-
.travis.yml | 94 +++++++-
README.md | 218 +++++++++++++++++--
bin/mahout | 4 +-
buildtools/pom.xml | 2 +-
distribution/pom.xml | 6 +-
distribution/src/main/assembly/bin.xml | 24 ++
examples/bin/SparseSparseDrmTimer.mscala | 4 +-
examples/bin/classify-wikipedia.sh | 2 +-
examples/pom.xml | 2 +-
flink/pom.xml | 20 +-
h2o/pom.xml | 21 +-
hdfs/pom.xml | 21 +-
integration/pom.xml | 2 +-
math-scala/pom.xml | 23 +-
.../mahout/math/backend/RootSolverFactory.scala | 37 ++--
math/pom.xml | 73 ++++---
mr/pom.xml | 21 +-
pom.xml | 12 +-
runtests.sh | 45 ----
spark/pom.xml | 23 +-
.../apache/mahout/sparkbindings/package.scala | 3 +-
.../mahout/cf/SimilarityAnalysisSuite.scala | 2 +-
viennacl-omp/pom.xml | 28 ++-
.../apache/mahout/viennacl/openmp/OMPMMul.scala | 56 ++---
.../mahout/viennacl/omp/ViennaCLSuiteOMP.scala | 4 +-
viennacl/pom.xml | 25 ++-
.../apache/mahout/viennacl/opencl/GPUMMul.scala | 93 ++++----
28 files changed, 640 insertions(+), 231 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mahout/blob/f2f8cba4/.travis.yml
----------------------------------------------------------------------
diff --cc .travis.yml
index 2006009,835fa37..8135349
--- a/.travis.yml
+++ b/.travis.yml
@@@ -11,8 -28,18 +28,19 @@@ language: jav
branches:
only:
- master
+ - develop
+
+ env:
+ global:
+ - JAVA_OPTS=-Xmx3g
+ - TEST_MODULES="hdfs,math,math-scala,spark"
+ - STANDARD_BUILD_OPTS="-Dmaven.javadoc.skip=true -B -V"
+ - PROFILES="-Phadoop2 -Ptravis"
+ - SPARK_1_6=http://d3kbcqa49mib13.cloudfront.net/spark-1.6.3-bin-hadoop2.6.tgz
+ - SPARK_2_0=http://d3kbcqa49mib13.cloudfront.net/spark-2.0.2-bin-hadoop2.7.tgz
+ - SPARK_2_1=http://d3kbcqa49mib13.cloudfront.net/spark-2.1.0-bin-hadoop2.7.tgz
+
# The file assumes a certain build order for the maven / nightly build deployments.
matrix:
include: