From 697a01bfb4dcc8d747a5bca0c83dfed4206ef6e8 Mon Sep 17 00:00:00 2001 From: Boliang Chen Date: Sat, 10 Jan 2015 10:54:12 +0800 Subject: [PATCH 1/4] har -> jar --- tracker/rabit_hadoop.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tracker/rabit_hadoop.py b/tracker/rabit_hadoop.py index 59866d55a..bd0abc0c4 100755 --- a/tracker/rabit_hadoop.py +++ b/tracker/rabit_hadoop.py @@ -21,7 +21,7 @@ if hadoop_home != None: hadoop_binary = hadoop_home + '/bin/hadoop' assert os.path.exists(hadoop_binary), "HADDOP_HOME does not contain the hadoop binary" if hadoop_streaming_jar == None: - hadoop_streaming_jar = hadoop_home + '/lib/hadoop-streaming.har' + hadoop_streaming_jar = hadoop_home + '/lib/hadoop-streaming.jar' assert os.path.exists(hadoop_streaming_jar), "HADDOP_HOME does not contain the haddop streaming jar" if hadoop_binary == None or hadoop_streaming_jar == None: From 7f5cb3aa0e64c88f05f10c26ae346e06b043280b Mon Sep 17 00:00:00 2001 From: Boliang Chen Date: Sat, 10 Jan 2015 10:58:53 +0800 Subject: [PATCH 2/4] modify hs --- tracker/rabit_hadoop.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tracker/rabit_hadoop.py b/tracker/rabit_hadoop.py index bd0abc0c4..01d242e31 100755 --- a/tracker/rabit_hadoop.py +++ b/tracker/rabit_hadoop.py @@ -25,7 +25,7 @@ if hadoop_home != None: assert os.path.exists(hadoop_streaming_jar), "HADDOP_HOME does not contain the haddop streaming jar" if hadoop_binary == None or hadoop_streaming_jar == None: - print 'Warning: Cannot auto-detect path to hadoop and streaming jar, need to set them via arguments -hs and -hb' + print 'Warning: Cannot auto-detect path to hadoop and hadoop-streaming jar, need to set them via arguments -hs and -hb' print '\tTo enable auto-detection, you can set enviroment variable HADOOP_HOME or modify rabit_hadoop.py line 14' parser = argparse.ArgumentParser(description='Rabit script to submit rabit jobs using Hadoop Streaming') @@ -53,10 +53,10 @@ else: help="path-to-hadoop binary folder") if hadoop_streaming_jar == None: - parser.add_argument('-jar', '--hadoop_streaming_jar', required = True, + parser.add_argument('-hs', '--hadoop_streaming_jar', required = True, help='path-to hadoop streamimg jar file') else: - parser.add_argument('-jar', '--hadoop_streaming_jar', default = hadoop_streaming_jar, + parser.add_argument('-hs', '--hadoop_streaming_jar', default = hadoop_streaming_jar, help='path-to hadoop streamimg jar file') parser.add_argument('command', nargs='+', help = 'command for rabit program') From d986693fbd4c021bf582d931510c3a9523751738 Mon Sep 17 00:00:00 2001 From: Boliang Chen Date: Sun, 11 Jan 2015 00:14:37 +0800 Subject: [PATCH 3/4] fix bugs --- tracker/rabit_hadoop.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tracker/rabit_hadoop.py b/tracker/rabit_hadoop.py index 01d242e31..30d21748f 100755 --- a/tracker/rabit_hadoop.py +++ b/tracker/rabit_hadoop.py @@ -12,7 +12,7 @@ import rabit_tracker as tracker #!!! Set path to hadoop and hadoop streaming jar here hadoop_binary = 'hadoop' -hadoop_streaming_jar = None +hadoop_streaming_jar = None # code hadoop_home = os.getenv('HADOOP_HOME') @@ -67,7 +67,7 @@ if args.jobname is None: def hadoop_streaming(nworker, worker_args): cmd = '%s jar %s -D mapred.map.tasks=%d' % (args.hadoop_binary, args.hadoop_streaming_jar, nworker) - cmd += ' -D mapred.job.name=%d' % (a) + cmd += ' -D mapred.job.name=%s' % (args.jobname) cmd += ' -input %s -output %s' % (args.input, args.output) cmd += ' -mapper \"%s\" -reducer \"/bin/cat\" ' % (' '.join(args.command + worker_args)) fset = set() @@ -75,9 +75,10 @@ def hadoop_streaming(nworker, worker_args): for f in args.command: if os.path.exists(f): fset.add(f) - for flst in args.files: - for f in flst.split('#'): - fset.add(f) + if args.files != None: + for flst in args.files: + for f in flst.split('#'): + fset.add(f) for f in fset: cmd += ' -file %s' % f print cmd From 76c15dffdef6b0dbf792d111096a913c3bbe283c Mon Sep 17 00:00:00 2001 From: Boliang Chen Date: Sun, 11 Jan 2015 00:16:05 +0800 Subject: [PATCH 4/4] remove blank --- tracker/rabit_hadoop.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tracker/rabit_hadoop.py b/tracker/rabit_hadoop.py index 30d21748f..e9b53afbd 100755 --- a/tracker/rabit_hadoop.py +++ b/tracker/rabit_hadoop.py @@ -12,7 +12,7 @@ import rabit_tracker as tracker #!!! Set path to hadoop and hadoop streaming jar here hadoop_binary = 'hadoop' -hadoop_streaming_jar = None +hadoop_streaming_jar = None # code hadoop_home = os.getenv('HADOOP_HOME')