You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by yw...@apache.org on 2015/08/21 03:02:20 UTC
bigtop git commit: BIGTOP-1963. Upgrade Mahout to 0.11.0
Repository: bigtop
Updated Branches:
refs/heads/master 31d4c2839 -> b1c1e72f5
BIGTOP-1963. Upgrade Mahout to 0.11.0
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/b1c1e72f
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/b1c1e72f
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/b1c1e72f
Branch: refs/heads/master
Commit: b1c1e72f5c2db05b4b156473cb22ba7e5acbd4e0
Parents: 31d4c28
Author: YoungWoo Kim <yw...@apache.org>
Authored: Mon Jun 1 16:49:50 2015 +0900
Committer: YoungWoo Kim <yw...@apache.org>
Committed: Fri Aug 21 10:01:45 2015 +0900
----------------------------------------------------------------------
bigtop-packages/src/common/mahout/do-component-build | 5 ++---
bigtop-packages/src/common/mahout/install_mahout.sh | 6 ++++--
bigtop-packages/src/rpm/mahout/SPECS/mahout.spec | 4 ++--
.../apache/bigtop/itest/mahout/smoke/TestMahoutExamples.groovy | 2 +-
bigtop.mk | 6 +++---
5 files changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/b1c1e72f/bigtop-packages/src/common/mahout/do-component-build
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/mahout/do-component-build b/bigtop-packages/src/common/mahout/do-component-build
index 06b6380..fd1e33f 100644
--- a/bigtop-packages/src/common/mahout/do-component-build
+++ b/bigtop-packages/src/common/mahout/do-component-build
@@ -22,9 +22,8 @@ mvn clean install -DskipTests -Dmahout.skip.distribution=false \
-Phadoop2 \
-Dhadoop.version=$HADOOP_VERSION \
-Dhbase.version=$HBASE_VERSION-hadoop2 \
+ -Dspark.version=${SPARK_VERSION} \
"$@"
mkdir build
-for i in distribution/target/mahout*.tar.gz ; do
- tar -C build --strip-components=1 -xzf $i
-done
+tar -C build --strip-components=1 -xzf distribution/target/apache-mahout-distribution-$MAHOUT_VERSION.tar.gz
http://git-wip-us.apache.org/repos/asf/bigtop/blob/b1c1e72f/bigtop-packages/src/common/mahout/install_mahout.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/mahout/install_mahout.sh b/bigtop-packages/src/common/mahout/install_mahout.sh
index af8906f..5c6b57d 100644
--- a/bigtop-packages/src/common/mahout/install_mahout.sh
+++ b/bigtop-packages/src/common/mahout/install_mahout.sh
@@ -118,7 +118,8 @@ ln -s /etc/mahout/conf $PREFIX/$LIB_DIR/conf
# Copy in the example files
cp -a ${BUILD_DIR}/examples/ $PREFIX/$DOC_DIR/
-
+cp -a ${BUILD_DIR}/h2o/ $PREFIX/$DOC_DIR/
+
# Copy in the /usr/bin/mahout wrapper
install -d -m 0755 $PREFIX/$BIN_DIR
cat > $PREFIX/$BIN_DIR/mahout <<EOF
@@ -136,9 +137,10 @@ export MAHOUT_CONF_DIR=\${MAHOUT_CONF_DIR:-$CONF_DIR}
# FIXME: the following line is a workaround for BIGTOP-259
export HADOOP_CLASSPATH="`echo /usr/lib/mahout/mahout-examples-*-job.jar`":\$HADOOP_CLASSPATH
exec $INSTALLED_LIB_DIR/bin/mahout "\$@"
+
+export SPARK_HOME=\${SPARK_HOME:-/usr/lib/spark}
EOF
chmod 755 $PREFIX/$BIN_DIR/mahout
rm -f ${PREFIX}/${LIB_DIR}/lib/zookeeper-*.jar
ln -sf /usr/lib/zookeeper/zookeeper.jar ${PREFIX}/${LIB_DIR}/lib/
-
http://git-wip-us.apache.org/repos/asf/bigtop/blob/b1c1e72f/bigtop-packages/src/rpm/mahout/SPECS/mahout.spec
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/mahout/SPECS/mahout.spec b/bigtop-packages/src/rpm/mahout/SPECS/mahout.spec
index 3635b21..09bad5d 100644
--- a/bigtop-packages/src/rpm/mahout/SPECS/mahout.spec
+++ b/bigtop-packages/src/rpm/mahout/SPECS/mahout.spec
@@ -41,7 +41,7 @@ Group: Development/Libraries
BuildArch: noarch
Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
License: ASL 2.0
-Source0: %{name}-distribution-%{mahout_base_version}-src.tar.gz
+Source0: apache-%{name}-distribution-%{mahout_base_version}-src.tar.gz
Source1: do-component-build
Source2: install_%{name}.sh
Source3: bigtop.bom
@@ -74,7 +74,7 @@ Documentation for Apache Mahout
%prep
-%setup -n %{name}-distribution-%{mahout_base_version}
+%setup -n apache-%{name}-distribution-%{mahout_base_version}
%build
bash $RPM_SOURCE_DIR/do-component-build
http://git-wip-us.apache.org/repos/asf/bigtop/blob/b1c1e72f/bigtop-tests/test-artifacts/mahout/src/main/groovy/org/apache/bigtop/itest/mahout/smoke/TestMahoutExamples.groovy
----------------------------------------------------------------------
diff --git a/bigtop-tests/test-artifacts/mahout/src/main/groovy/org/apache/bigtop/itest/mahout/smoke/TestMahoutExamples.groovy b/bigtop-tests/test-artifacts/mahout/src/main/groovy/org/apache/bigtop/itest/mahout/smoke/TestMahoutExamples.groovy
index a4ed8df..3d6ac3a 100644
--- a/bigtop-tests/test-artifacts/mahout/src/main/groovy/org/apache/bigtop/itest/mahout/smoke/TestMahoutExamples.groovy
+++ b/bigtop-tests/test-artifacts/mahout/src/main/groovy/org/apache/bigtop/itest/mahout/smoke/TestMahoutExamples.groovy
@@ -305,7 +305,7 @@ mahout ldatopics \
--randomSelectionPct 40 --overwrite --sequenceFiles -xm sequential""");
assertRun("""trainnb \
--i ${WORK_DIR}/20news-train-vectors -el \
+-i ${WORK_DIR}/20news-train-vectors \
-o ${WORK_DIR}/model \
-li ${WORK_DIR}/labelindex \
-ow""");
http://git-wip-us.apache.org/repos/asf/bigtop/blob/b1c1e72f/bigtop.mk
----------------------------------------------------------------------
diff --git a/bigtop.mk b/bigtop.mk
index 1ef7510..4c5c8f1 100644
--- a/bigtop.mk
+++ b/bigtop.mk
@@ -166,10 +166,10 @@ $(eval $(call PACKAGE,oozie,OOZIE))
MAHOUT_NAME=mahout
MAHOUT_RELNOTES_NAME=Apache Mahout
MAHOUT_PKG_NAME=mahout
-MAHOUT_BASE_VERSION=0.10.0
-MAHOUT_PKG_VERSION=0.10.0
+MAHOUT_BASE_VERSION=0.11.0
+MAHOUT_PKG_VERSION=0.11.0
MAHOUT_RELEASE_VERSION=1
-MAHOUT_TARBALL_DST=mahout-distribution-$(MAHOUT_BASE_VERSION)-src.tar.gz
+MAHOUT_TARBALL_DST=apache-mahout-distribution-$(MAHOUT_BASE_VERSION)-src.tar.gz
MAHOUT_TARBALL_SRC=$(MAHOUT_TARBALL_DST)
MAHOUT_DOWNLOAD_PATH=/mahout/$(MAHOUT_BASE_VERSION)
MAHOUT_SITE=$(APACHE_MIRROR)$(MAHOUT_DOWNLOAD_PATH)