From 4fa054e26e0153e26517e734a09986acdc01abba Mon Sep 17 00:00:00 2001 From: tqchen Date: Mon, 2 Mar 2015 07:32:25 +0000 Subject: [PATCH] new tracker --- rabit-learn/linear/run-hadoop.sh | 2 +- tracker/rabit_tracker.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/rabit-learn/linear/run-hadoop.sh b/rabit-learn/linear/run-hadoop.sh index e366c79cc..c090f3966 100755 --- a/rabit-learn/linear/run-hadoop.sh +++ b/rabit-learn/linear/run-hadoop.sh @@ -12,7 +12,7 @@ hadoop fs -mkdir $2/data hadoop fs -put ../data/agaricus.txt.train $2/data # submit to hadoop -../../tracker/rabit_hadoop.py -n $1 -i $2/data/agaricus.txt.train -o $2/mushroom.linear.model linear.rabit stdin model_out=stdout "${*:3}" +../../tracker/rabit_hadoop.py --host_ip ip -n $1 -i $2/data/agaricus.txt.train -o $2/mushroom.linear.model linear.rabit stdin model_out=stdout "${*:3}" # get the final model file hadoop fs -get $2/mushroom.linear.model/part-00000 ./linear.model diff --git a/tracker/rabit_tracker.py b/tracker/rabit_tracker.py index e324f7a9b..fe1ec7eb8 100644 --- a/tracker/rabit_tracker.py +++ b/tracker/rabit_tracker.py @@ -141,11 +141,11 @@ class Tracker: def slave_args(self): if self.hostIP == 'auto': host = socket.gethostname() - elif self.hostIP = 'ip': + elif self.hostIP == 'ip': host = socket.gethostbyname(socket.getfqdn()) else: - host = hostIP - return ['rabit_tracker_uri=%s' % hostIP, + host = self.hostIP + return ['rabit_tracker_uri=%s' % host, 'rabit_tracker_port=%s' % self.port] def get_neighbor(self, rank, nslave): rank = rank + 1 @@ -261,8 +261,8 @@ class Tracker: wait_conn[rank] = s self.log_print('@tracker All nodes finishes job', 2) -def submit(nslave, args, fun_submit, verbose): - master = Tracker(verbose = verbose) +def submit(nslave, args, fun_submit, verbose, hostIP): + master = Tracker(verbose = verbose, hostIP = hostIP) submit_thread = Thread(target = fun_submit, args = (nslave, args + master.slave_args())) submit_thread.daemon = True submit_thread.start()