"...model/git@developer.sourcefind.cn:OpenDAS/megatron-lm.git" did not exist on "1016e98a8351e7b1fd630c6930aa4fbb491df895"
Commit 1348e96b authored by Antoine Kaufmann's avatar Antoine Kaufmann
Browse files

experiments: replace references to nics member in hosts to pcidevs

This changed a while ago in one of the refactoring steps so some of the scripts
were broken.
parent 1b225409
...@@ -112,7 +112,7 @@ for host_type in host_types: ...@@ -112,7 +112,7 @@ for host_type in host_types:
ip_prefix=16) ip_prefix=16)
for s in servers: for s in servers:
e.assign_sim_host(s, h_i) e.assign_sim_host(s, h_i)
e.assign_sim_host(s.nics[0].multinic, h_i) e.assign_sim_host(s.pcidevs[0].multinic, h_i)
clients = create_multinic_hosts(e, m, 'client_%d' % (i,), clients = create_multinic_hosts(e, m, 'client_%d' % (i,),
switch, host_class, node.I40eLinuxNode, switch, host_class, node.I40eLinuxNode,
...@@ -121,7 +121,7 @@ for host_type in host_types: ...@@ -121,7 +121,7 @@ for host_type in host_types:
for c in clients: for c in clients:
c.wait = True c.wait = True
e.assign_sim_host(c, h_i) e.assign_sim_host(c, h_i)
e.assign_sim_host(c.nics[0].multinic, h_i) e.assign_sim_host(c.pcidevs[0].multinic, h_i)
racks.append((servers, clients)) racks.append((servers, clients))
...@@ -140,7 +140,7 @@ for host_type in host_types: ...@@ -140,7 +140,7 @@ for host_type in host_types:
for c in clients + servers: for c in clients + servers:
if host_type == 'qt': if host_type == 'qt':
c.nics[0].start_tick = 580000000000 c.pcidevs[0].start_tick = 580000000000
c.extra_deps.append(switch_top) c.extra_deps.append(switch_top)
all_servers = [] all_servers = []
......
...@@ -82,7 +82,7 @@ for host_type in host_types: ...@@ -82,7 +82,7 @@ for host_type in host_types:
m = m - 1 m = m - 1
e.assign_sim_host(servers[0], h_i) e.assign_sim_host(servers[0], h_i)
e.assign_sim_host(servers[0].nics[0], h_i) e.assign_sim_host(servers[0].pcidevs[0], h_i)
clients = create_basic_hosts(e, m, 'client_%d' % (i,), clients = create_basic_hosts(e, m, 'client_%d' % (i,),
switch, sim.I40eNIC, host_class, node.I40eLinuxNode, switch, sim.I40eNIC, host_class, node.I40eLinuxNode,
...@@ -95,7 +95,7 @@ for host_type in host_types: ...@@ -95,7 +95,7 @@ for host_type in host_types:
c.extra_deps.append(servers[0]) c.extra_deps.append(servers[0])
e.assign_sim_host(c, h_i) e.assign_sim_host(c, h_i)
e.assign_sim_host(c.nics[0], h_i) e.assign_sim_host(c.pcidevs[0], h_i)
if h_i != 0: if h_i != 0:
lp = proxy.SocketsNetProxyListener() lp = proxy.SocketsNetProxyListener()
...@@ -111,7 +111,7 @@ for host_type in host_types: ...@@ -111,7 +111,7 @@ for host_type in host_types:
lp.add_n2n(switch_top, switch) lp.add_n2n(switch_top, switch)
for c in clients + servers: for c in clients + servers:
c.nics[0].start_tick = 580000000000 c.pcidevs[0].start_tick = 580000000000
# add to experiments # add to experiments
experiments.append(e) experiments.append(e)
...@@ -91,17 +91,17 @@ for host_type in host_types: ...@@ -91,17 +91,17 @@ for host_type in host_types:
e.assign_sim_host(lp, 0) e.assign_sim_host(lp, 0)
e.assign_sim_host(net, 0) e.assign_sim_host(net, 0)
e.assign_sim_host(servers[0], 0) e.assign_sim_host(servers[0], 0)
e.assign_sim_host(servers[0].nics[0], 0) e.assign_sim_host(servers[0].pcidevs[0], 0)
e.assign_sim_host(cp, 1) e.assign_sim_host(cp, 1)
# round-robin assignment for hosts # round-robin assignment for hosts
k = 1 k = 1
for c in clients: for c in clients:
e.assign_sim_host(c, k) e.assign_sim_host(c, k)
e.assign_sim_host(c.nics[0], k) e.assign_sim_host(c.pcidevs[0], k)
if k != 0: if k != 0:
cp.add_nic(c.nics[0]) cp.add_nic(c.pcidevs[0])
k = (k + 1) % 2 k = (k + 1) % 2
# add to experiments # add to experiments
......
...@@ -97,7 +97,7 @@ for mode in types_of_mode: ...@@ -97,7 +97,7 @@ for mode in types_of_mode:
for se in servers: for se in servers:
se.sync_mode = mode se.sync_mode = mode
se.nics[0].sync_mode = mode se.pcidevs[0].sync_mode = mode
...@@ -105,7 +105,7 @@ for mode in types_of_mode: ...@@ -105,7 +105,7 @@ for mode in types_of_mode:
i = 0 i = 0
for cl in clients: for cl in clients:
cl.sync_mode = mode cl.sync_mode = mode
cl.nics[0].sync_mode = mode cl.pcidevs[0].sync_mode = mode
cl.node_config.app.server_ip = servers[i].node_config.ip cl.node_config.app.server_ip = servers[i].node_config.ip
cl.node_config.app.procs = 2 cl.node_config.app.procs = 2
i += 1 i += 1
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment