You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mahout.apache.org by gc...@apache.org on 2014/06/30 23:41:59 UTC
git commit: MAHOUT-1565 Remove mapreduce-job-specific MAHOUT_OPTS
(nishkamravi via gcapan): this closes apache/mahout#4
Repository: mahout
Updated Branches:
refs/heads/master 3dd18344a -> 37b852539
MAHOUT-1565 Remove mapreduce-job-specific MAHOUT_OPTS (nishkamravi via gcapan): this closes apache/mahout#4
Project: http://git-wip-us.apache.org/repos/asf/mahout/repo
Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/37b85253
Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/37b85253
Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/37b85253
Branch: refs/heads/master
Commit: 37b85253981770b455bd9936cef23de460662483
Parents: 3dd1834
Author: Gokhan Capan <gc...@apache.org>
Authored: Tue Jul 1 00:41:09 2014 +0300
Committer: Gokhan Capan <gc...@apache.org>
Committed: Tue Jul 1 00:41:09 2014 +0300
----------------------------------------------------------------------
bin/mahout | 11 +----------
bin/mahout.cmd | 13 +------------
2 files changed, 2 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mahout/blob/37b85253/bin/mahout
----------------------------------------------------------------------
diff --git a/bin/mahout b/bin/mahout
index e0720ac..b0a8f6e 100755
--- a/bin/mahout
+++ b/bin/mahout
@@ -245,16 +245,7 @@ case "$1" in
MAHOUT_OPTS="$MAHOUT_OPTS -Dhadoop.log.dir=$MAHOUT_LOG_DIR"
MAHOUT_OPTS="$MAHOUT_OPTS -Dhadoop.log.file=$MAHOUT_LOGFILE"
- MAHOUT_OPTS="$MAHOUT_OPTS -Dmapred.min.split.size=512MB"
- MAHOUT_OPTS="$MAHOUT_OPTS -Dmapred.map.child.java.opts=-Xmx4096m"
- MAHOUT_OPTS="$MAHOUT_OPTS -Dmapred.reduce.child.java.opts=-Xmx4096m"
- MAHOUT_OPTS="$MAHOUT_OPTS -Dmapred.output.compress=true"
- MAHOUT_OPTS="$MAHOUT_OPTS -Dmapred.compress.map.output=true"
- MAHOUT_OPTS="$MAHOUT_OPTS -Dmapred.map.tasks=1"
- MAHOUT_OPTS="$MAHOUT_OPTS -Dmapred.reduce.tasks=1"
- MAHOUT_OPTS="$MAHOUT_OPTS -Dio.sort.factor=30"
- MAHOUT_OPTS="$MAHOUT_OPTS -Dio.sort.mb=1024"
- MAHOUT_OPTS="$MAHOUT_OPTS -Dio.file.buffer.size=32786"
+
if [ "x$JAVA_LIBRARY_PATH" != "x" ]; then
MAHOUT_OPTS="$MAHOUT_OPTS -Djava.library.path=$JAVA_LIBRARY_PATH"
http://git-wip-us.apache.org/repos/asf/mahout/blob/37b85253/bin/mahout.cmd
----------------------------------------------------------------------
diff --git a/bin/mahout.cmd b/bin/mahout.cmd
index 195c645..f9328af 100644
--- a/bin/mahout.cmd
+++ b/bin/mahout.cmd
@@ -149,17 +149,6 @@ set MAHOUT_LOGFILE=mahout.log
set MAHOUT_OPTS=%MAHOUT_OPTS% -Dhadoop.log.dir=%MAHOUT_LOG_DIR%
set MAHOUT_OPTS=%MAHOUT_OPTS% -Dhadoop.log.file=%MAHOUT_LOGFILE%
-set MAHOUT_OPTS=%MAHOUT_OPTS% -Dmapred.min.split.size=512MB
-set MAHOUT_OPTS=%MAHOUT_OPTS% -Dmapred.map.child.java.opts=-Xmx4096m
-set MAHOUT_OPTS=%MAHOUT_OPTS% -Dmapred.reduce.child.java.opts=-Xmx4096m
-set MAHOUT_OPTS=%MAHOUT_OPTS% -Dmapred.output.compress=true
-set MAHOUT_OPTS=%MAHOUT_OPTS% -Dmapred.compress.map.output=true
-set MAHOUT_OPTS=%MAHOUT_OPTS% -Dmapred.map.tasks=1
-set MAHOUT_OPTS=%MAHOUT_OPTS% -Dmapred.reduce.tasks=1
-set MAHOUT_OPTS=%MAHOUT_OPTS% -Dio.sort.factor=30
-set MAHOUT_OPTS=%MAHOUT_OPTS% -Dio.sort.mb=1024
-set MAHOUT_OPTS=%MAHOUT_OPTS% -Dio.file.buffer.size=32786
-set HADOOP_OPTS=%HADOOP_OPTS% -Djava.library.path=%HADOOP_HOME%\bin
if not [%JAVA_LIBRARY_PATH%] == [] (
set MAHOUT_OPTS=%MAHOUT_OPTS% -Djava.library.path=%JAVA_LIBRARY_PATH%
@@ -399,4 +388,4 @@ call %HADOOP_HOME%\bin\hadoop jar %MAHOUT_JOB% %CLASS% %*
)
)
-)
\ No newline at end of file
+)