From dc12958fc7172ff5e982be5cace8d108fd94f62d Mon Sep 17 00:00:00 2001 From: tqchen Date: Sat, 6 Dec 2014 09:15:31 -0800 Subject: [PATCH] rename master to tracker, to emphasie rabit is p2p in computing --- src/{rabit_master.py => rabit_tracker.py} | 4 ++-- submit_job_hadoop.py => submit_hadoop.py | 4 ++-- submit_job.py => submit_mpi.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) rename src/{rabit_master.py => rabit_tracker.py} (99%) rename submit_job_hadoop.py => submit_hadoop.py (93%) rename submit_job.py => submit_mpi.py (91%) diff --git a/src/rabit_master.py b/src/rabit_tracker.py similarity index 99% rename from src/rabit_master.py rename to src/rabit_tracker.py index dbe303e39..ea77506be 100644 --- a/src/rabit_master.py +++ b/src/rabit_tracker.py @@ -112,7 +112,7 @@ class SlaveEntry: self.wait_accept = len(badset) - len(conset) return rmset -class Master: +class Tracker: def __init__(self, port = 9000, port_end = 9999): sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) for port in range(port, port_end): @@ -172,7 +172,7 @@ def mpi_submit(nslave, args): return subprocess.check_call(cmd, shell = True) def submit(nslave, args, fun_submit = mpi_submit): - master = Master() + master = Tracker() submit_thread = Thread(target = fun_submit, args = (nslave, args + master.slave_args())) submit_thread.start() master.accept_slaves(nslave) diff --git a/submit_job_hadoop.py b/submit_hadoop.py similarity index 93% rename from submit_job_hadoop.py rename to submit_hadoop.py index bf1bac752..ae315f60a 100755 --- a/submit_job_hadoop.py +++ b/submit_hadoop.py @@ -8,7 +8,7 @@ import os import time import subprocess sys.path.append('./src/') -import rabit_master as master +import rabit_tracker as tracker parser = argparse.ArgumentParser(description='Hadoop Streaming submission script') parser.add_argument('-s', '--nslaves', required=True, type=int) @@ -28,5 +28,5 @@ def hadoop_streaming(nslaves, slave_args): subprocess.check_call(cmd, shell = True) start = time.time() -master.submit(args.nslaves, [], fun_submit= hadoop_streaming) +tracker.submit(args.nslaves, [], fun_submit= hadoop_streaming) print 'All run took %s' % (time.time() - start) diff --git a/submit_job.py b/submit_mpi.py similarity index 91% rename from submit_job.py rename to submit_mpi.py index 317ff6f43..14eafff8c 100755 --- a/submit_job.py +++ b/submit_mpi.py @@ -9,7 +9,7 @@ import subprocess # import the tcp_master.py # add path to sync sys.path.append(os.path.dirname(__file__)+'/src/') -import rabit_master as master +import rabit_tracker as tracker # # Note: this submit script is only used for example purpose @@ -33,4 +33,4 @@ if __name__ == '__main__': print 'Usage: ' exit(0) # call submit, with nslave, the commands to run each job and submit function - master.submit(int(sys.argv[1]), sys.argv[2:], fun_submit= mpi_submit) + tracker.submit(int(sys.argv[1]), sys.argv[2:], fun_submit= mpi_submit)