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/03/08 06:19:05 UTC
mahout git commit: MAHOUT-1797: Typos for SPARK_ASSEMBLY_BIN
Repository: mahout
Updated Branches:
refs/heads/flink-binding e3935bbad -> f66e022c6
MAHOUT-1797: Typos for SPARK_ASSEMBLY_BIN
Project: http://git-wip-us.apache.org/repos/asf/mahout/repo
Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/f66e022c
Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/f66e022c
Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/f66e022c
Branch: refs/heads/flink-binding
Commit: f66e022c631c134e8b7e138e25d8fd94011d1b4c
Parents: e3935bb
Author: Andrew Musselman <ak...@apache.org>
Authored: Fri Jan 15 19:22:41 2016 -0800
Committer: smarthi <sm...@apache.org>
Committed: Tue Mar 8 00:18:49 2016 -0500
----------------------------------------------------------------------
bin/mahout | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mahout/blob/f66e022c/bin/mahout
----------------------------------------------------------------------
diff --git a/bin/mahout b/bin/mahout
index 24f01ba..c58e865 100755
--- a/bin/mahout
+++ b/bin/mahout
@@ -211,7 +211,7 @@ then
CLASSPATH=${CLASSPATH}:$f;
done
- SPARK_CP_BIN="${SPARK_HOME}/bin/compute-classpath.sh"
+ SPARK_CP_BIN="${MAHOUT_HOME}/bin/compute-classpath.sh"
if [ -x "${SPARK_CP_BIN}" ]; then
SPARK_CLASSPATH=$("${SPARK_CP_BIN}" 2>/dev/null)
CLASSPATH="${CLASSPATH}:${SPARK_CLASSPATH}"
@@ -220,6 +220,14 @@ then
exit -1
fi
+ SPARK_ASSEMBLY_BIN="${MAHOUT_HOME}/bin/mahout-spark-class.sh"
+ if [ -x "${SPARK_ASSEMBLY_BIN}" ]; then
+ SPARK_ASSEMBLY_CLASSPATH=$("${SPARK_ASSEMBLY_BIN}" 2>/dev/null)
+ CLASSPATH="${CLASSPATH}:${SPARK_ASSEMBLY_BIN}"
+ else
+ echo "Cannot find Spark assembly classpath. Is 'SPARK_HOME' set?"
+ exit -1
+ fi
fi
# add release dependencies to CLASSPATH