Merge commit '0c349d6101652836f2ec23e48f94b4137aac6108'

This commit is contained in:
tqchen 2015-03-26 23:33:41 -07:00
commit 38911fe2b2

View File

@ -49,9 +49,9 @@ class SlaveEntry:
def __init__(self, sock, s_addr): def __init__(self, sock, s_addr):
slave = ExSocket(sock) slave = ExSocket(sock)
self.sock = slave self.sock = slave
self.host = s_addr[0] self.host = socket.gethostbyname(s_addr[0])
magic = slave.recvint() magic = slave.recvint()
assert magic == kMagic, 'invalid magic number=%d from %s' % (magic, s_addr[0]) assert magic == kMagic, 'invalid magic number=%d from %s' % (magic, self.host)
slave.sendint(kMagic) slave.sendint(kMagic)
self.rank = slave.recvint() self.rank = slave.recvint()
self.world_size = slave.recvint() self.world_size = slave.recvint()
@ -136,7 +136,7 @@ class Tracker:
self.sock = sock self.sock = sock
self.verbose = verbose self.verbose = verbose
if hostIP == 'auto': if hostIP == 'auto':
hostIP = 'dns' hostIP = 'ip'
self.hostIP = hostIP self.hostIP = hostIP
self.log_print('start listen on %s:%d' % (socket.gethostname(), self.port), 1) self.log_print('start listen on %s:%d' % (socket.gethostname(), self.port), 1)
def __del__(self): def __del__(self):
@ -145,7 +145,7 @@ class Tracker:
""" """
get enviroment variables for slaves get enviroment variables for slaves
can be passed in as args or envs can be passed in as args or envs
""" """
if self.hostIP == 'dns': if self.hostIP == 'dns':
host = socket.gethostname() host = socket.gethostname()
elif self.hostIP == 'ip': elif self.hostIP == 'ip':