Commit 88475623 authored by Marvin Meiers's avatar Marvin Meiers Committed by Antoine Kaufmann
Browse files

experiments: fix new pylint errors

parent 474d6aa9
...@@ -36,6 +36,8 @@ if not os.path.isfile(out_file): ...@@ -36,6 +36,8 @@ if not os.path.isfile(out_file):
with open(out_file, 'r', encoding='utf-8') as f: with open(out_file, 'r', encoding='utf-8') as f:
lines = f.readlines() lines = f.readlines()
start_time = None
end_time = None
for line in lines: for line in lines:
if 'start:' in line: if 'start:' in line:
start_time = float(line.split()[1]) start_time = float(line.split()[1])
...@@ -43,5 +45,7 @@ with open(out_file, 'r', encoding='utf-8') as f: ...@@ -43,5 +45,7 @@ with open(out_file, 'r', encoding='utf-8') as f:
if 'end:' in line: if 'end:' in line:
end_time = float(line.split()[1]) end_time = float(line.split()[1])
if start_time is None or end_time is None:
raise RuntimeError('could not find start/end time')
time_diff = end_time - start_time time_diff = end_time - start_time
print(f'SimTime: {time_diff} (s)') print(f'SimTime: {time_diff} (s)')
...@@ -55,6 +55,8 @@ for workload in types_of_host: ...@@ -55,6 +55,8 @@ for workload in types_of_host:
with open(path_pat, 'r', encoding='utf-8') as f: with open(path_pat, 'r', encoding='utf-8') as f:
read_lines = f.readlines() read_lines = f.readlines()
start_time = None
end_time = None
for l in read_lines: for l in read_lines:
if 'START' in l: if 'START' in l:
start_time = float(l.split()[1]) start_time = float(l.split()[1])
...@@ -64,6 +66,8 @@ for workload in types_of_host: ...@@ -64,6 +66,8 @@ for workload in types_of_host:
end_time = float(l.split()[1]) end_time = float(l.split()[1])
#print("end_time: %d" % end_time) #print("end_time: %d" % end_time)
if start_time is None or end_time is None:
raise RuntimeError('could not find start/end time')
sim_time = (end_time - start_time) / 60 sim_time = (end_time - start_time) / 60
line.append(f'{sim_time}') line.append(f'{sim_time}')
......
...@@ -46,10 +46,12 @@ for n in kinds_of_net: ...@@ -46,10 +46,12 @@ for n in kinds_of_net:
if n == 'switch': if n == 'switch':
NetClass = sim.SwitchNet NetClass = sim.SwitchNet
if n == 'dumbbell': elif n == 'dumbbell':
NetClass = sim.NS3DumbbellNet NetClass = sim.NS3DumbbellNet
if n == 'bridge': elif n == 'bridge':
NetClass = sim.NS3BridgeNet NetClass = sim.NS3BridgeNet
else:
raise ValueError(f'unknown network type {n}')
# set nic sim # set nic sim
for c in kinds_of_nic: for c in kinds_of_nic:
...@@ -81,7 +83,7 @@ for n in kinds_of_net: ...@@ -81,7 +83,7 @@ for n in kinds_of_net:
ip_start=2 ip_start=2
) )
if c == 'cb': elif c == 'cb':
servers = create_basic_hosts( servers = create_basic_hosts(
e, e,
1, 1,
...@@ -104,7 +106,7 @@ for n in kinds_of_net: ...@@ -104,7 +106,7 @@ for n in kinds_of_net:
ip_start=2 ip_start=2
) )
if c == 'ib': elif c == 'ib':
servers = create_basic_hosts( servers = create_basic_hosts(
e, e,
1, 1,
...@@ -127,6 +129,9 @@ for n in kinds_of_net: ...@@ -127,6 +129,9 @@ for n in kinds_of_net:
ip_start=2 ip_start=2
) )
else:
raise ValueError(f'unknown nic type {c}')
for cl in clients: for cl in clients:
cl.wait = True cl.wait = True
cl.node_config.app.server_ip = servers[0].node_config.ip cl.node_config.app.server_ip = servers[0].node_config.ip
......
...@@ -43,12 +43,14 @@ experiments = [] ...@@ -43,12 +43,14 @@ experiments = []
for n in kinds_of_net: for n in kinds_of_net:
if n == 'wire': if n == 'wire':
NetClass = sim.WireNet NetClass = sim.WireNet
if n == 'switch': elif n == 'switch':
NetClass = sim.SwitchNet NetClass = sim.SwitchNet
if n == 'dumbbell': elif n == 'dumbbell':
NetClass = sim.NS3DumbbellNet NetClass = sim.NS3DumbbellNet
if n == 'bridge': elif n == 'bridge':
NetClass = sim.NS3BridgeNet NetClass = sim.NS3BridgeNet
else:
raise ValueError(f'unknown network type {n}')
# set nic sim # set nic sim
for c in kinds_of_nic: for c in kinds_of_nic:
...@@ -80,7 +82,7 @@ for n in kinds_of_net: ...@@ -80,7 +82,7 @@ for n in kinds_of_net:
ip_start=2 ip_start=2
) )
if c == 'cb': elif c == 'cb':
servers = create_basic_hosts( servers = create_basic_hosts(
e, e,
1, 1,
...@@ -103,7 +105,7 @@ for n in kinds_of_net: ...@@ -103,7 +105,7 @@ for n in kinds_of_net:
ip_start=2 ip_start=2
) )
if c == 'ib': elif c == 'ib':
servers = create_basic_hosts( servers = create_basic_hosts(
e, e,
1, 1,
...@@ -126,6 +128,9 @@ for n in kinds_of_net: ...@@ -126,6 +128,9 @@ for n in kinds_of_net:
ip_start=2 ip_start=2
) )
else:
raise ValueError(f'unknown nic type {c}')
clients[0].wait = True clients[0].wait = True
clients[0].node_config.app.server_ip = servers[0].node_config.ip clients[0].node_config.app.server_ip = servers[0].node_config.ip
......
...@@ -47,10 +47,12 @@ for n in kinds_of_net: ...@@ -47,10 +47,12 @@ for n in kinds_of_net:
if n == 'switch': if n == 'switch':
NetClass = sim.SwitchNet NetClass = sim.SwitchNet
if n == 'dumbbell': elif n == 'dumbbell':
NetClass = sim.NS3DumbbellNet NetClass = sim.NS3DumbbellNet
if n == 'bridge': elif n == 'bridge':
NetClass = sim.NS3BridgeNet NetClass = sim.NS3BridgeNet
else:
raise ValueError(f'unknown network type {n}')
# set nic sim # set nic sim
for c in kinds_of_nic: for c in kinds_of_nic:
...@@ -82,7 +84,7 @@ for n in kinds_of_net: ...@@ -82,7 +84,7 @@ for n in kinds_of_net:
ip_start=2 ip_start=2
) )
if c == 'cb': elif c == 'cb':
servers = create_basic_hosts( servers = create_basic_hosts(
e, e,
1, 1,
...@@ -105,7 +107,7 @@ for n in kinds_of_net: ...@@ -105,7 +107,7 @@ for n in kinds_of_net:
ip_start=2 ip_start=2
) )
if c == 'ib': elif c == 'ib':
servers = create_basic_hosts( servers = create_basic_hosts(
e, e,
1, 1,
...@@ -128,6 +130,9 @@ for n in kinds_of_net: ...@@ -128,6 +130,9 @@ for n in kinds_of_net:
ip_start=2 ip_start=2
) )
else:
raise ValueError(f'unknown nic type {c}')
for cl in clients: for cl in clients:
cl.wait = True cl.wait = True
cl.node_config.app.server_ip = servers[0].node_config.ip cl.node_config.app.server_ip = servers[0].node_config.ip
......
...@@ -174,7 +174,7 @@ for mem_lat in num_mem_lat: ...@@ -174,7 +174,7 @@ for mem_lat in num_mem_lat:
HostClass = gem5_kvm HostClass = gem5_kvm
if h == 'gt': elif h == 'gt':
def gem5_timing(node_config: node.NodeConfig): def gem5_timing(node_config: node.NodeConfig):
gh = sim.Gem5Host(node_config) gh = sim.Gem5Host(node_config)
...@@ -187,6 +187,9 @@ for mem_lat in num_mem_lat: ...@@ -187,6 +187,9 @@ for mem_lat in num_mem_lat:
elif h == 'qk': elif h == 'qk':
HostClass = sim.QemuHost HostClass = sim.QemuHost
else:
raise ValueError(f'unknown host type {h}')
# Add hosts # Add hosts
host_0 = HostClass(node_config0) host_0 = HostClass(node_config0)
host_1 = HostClass(node_config1) host_1 = HostClass(node_config1)
......
...@@ -214,7 +214,7 @@ for mem_lat in num_mem_lat: ...@@ -214,7 +214,7 @@ for mem_lat in num_mem_lat:
HostClass = gem5_kvm HostClass = gem5_kvm
if h == 'gt': elif h == 'gt':
def gem5_timing(node_config: node.NodeConfig): def gem5_timing(node_config: node.NodeConfig):
gh = sim.Gem5Host(node_config) gh = sim.Gem5Host(node_config)
...@@ -227,6 +227,9 @@ for mem_lat in num_mem_lat: ...@@ -227,6 +227,9 @@ for mem_lat in num_mem_lat:
elif h == 'qk': elif h == 'qk':
HostClass = sim.QemuHost HostClass = sim.QemuHost
else:
raise ValueError(f'unknown host type {h}')
# Add hosts # Add hosts
hosts = [] hosts = []
for i in range(num_hosts): for i in range(num_hosts):
......
...@@ -45,10 +45,12 @@ for n in kinds_of_net: ...@@ -45,10 +45,12 @@ for n in kinds_of_net:
if n == 'switch': if n == 'switch':
NetClass = sim.SwitchNet NetClass = sim.SwitchNet
if n == 'dumbbell': elif n == 'dumbbell':
NetClass = sim.NS3DumbbellNet NetClass = sim.NS3DumbbellNet
if n == 'bridge': elif n == 'bridge':
NetClass = sim.NS3BridgeNet NetClass = sim.NS3BridgeNet
else:
raise ValueError(f'unknown network type {n}')
# set nic sim # set nic sim
for c in kinds_of_nic: for c in kinds_of_nic:
...@@ -79,7 +81,7 @@ for n in kinds_of_net: ...@@ -79,7 +81,7 @@ for n in kinds_of_net:
ip_start=2 ip_start=2
) )
if c == 'cb': elif c == 'cb':
servers = create_basic_hosts( servers = create_basic_hosts(
e, e,
1, 1,
...@@ -102,7 +104,7 @@ for n in kinds_of_net: ...@@ -102,7 +104,7 @@ for n in kinds_of_net:
ip_start=2 ip_start=2
) )
if c == 'ib': elif c == 'ib':
servers = create_basic_hosts( servers = create_basic_hosts(
e, e,
1, 1,
...@@ -125,6 +127,9 @@ for n in kinds_of_net: ...@@ -125,6 +127,9 @@ for n in kinds_of_net:
ip_start=2 ip_start=2
) )
else:
raise ValueError(f'unknown nic type {c}')
for cl in clients: for cl in clients:
cl.wait = True cl.wait = True
cl.node_config.app.server_ip = servers[0].node_config.ip cl.node_config.app.server_ip = servers[0].node_config.ip
......
...@@ -43,14 +43,16 @@ experiments = [] ...@@ -43,14 +43,16 @@ experiments = []
for n in kinds_of_net: for n in kinds_of_net:
if n == 'wire': if n == 'wire':
NetClass = sim.WireNet NetClass = sim.WireNet
if n == 'switch': elif n == 'switch':
NetClass = sim.SwitchNet NetClass = sim.SwitchNet
if n == 'dumbbell': elif n == 'dumbbell':
NetClass = sim.NS3DumbbellNet NetClass = sim.NS3DumbbellNet
if n == 'bridge': elif n == 'bridge':
NetClass = sim.NS3BridgeNet NetClass = sim.NS3BridgeNet
if n == 'tofino': elif n == 'tofino':
NetClass = sim.TofinoNet NetClass = sim.TofinoNet
else:
raise ValueError(f'unknown network type {n}')
# set nic sim # set nic sim
for c in kinds_of_nic: for c in kinds_of_nic:
...@@ -81,7 +83,7 @@ for n in kinds_of_net: ...@@ -81,7 +83,7 @@ for n in kinds_of_net:
ip_start=2 ip_start=2
) )
if c == 'cb': elif c == 'cb':
servers = create_basic_hosts( servers = create_basic_hosts(
e, e,
1, 1,
...@@ -104,7 +106,7 @@ for n in kinds_of_net: ...@@ -104,7 +106,7 @@ for n in kinds_of_net:
ip_start=2 ip_start=2
) )
if c == 'ib': elif c == 'ib':
servers = create_basic_hosts( servers = create_basic_hosts(
e, e,
1, 1,
...@@ -127,6 +129,9 @@ for n in kinds_of_net: ...@@ -127,6 +129,9 @@ for n in kinds_of_net:
ip_start=2 ip_start=2
) )
else:
raise ValueError(f'unknown nic type {c}')
clients[0].wait = True clients[0].wait = True
clients[0].node_config.app.server_ip = servers[0].node_config.ip clients[0].node_config.app.server_ip = servers[0].node_config.ip
......
...@@ -47,10 +47,12 @@ for n in kinds_of_net: ...@@ -47,10 +47,12 @@ for n in kinds_of_net:
if n == 'switch': if n == 'switch':
NetClass = sim.SwitchNet NetClass = sim.SwitchNet
if n == 'dumbbell': elif n == 'dumbbell':
NetClass = sim.NS3DumbbellNet NetClass = sim.NS3DumbbellNet
if n == 'bridge': elif n == 'bridge':
NetClass = sim.NS3BridgeNet NetClass = sim.NS3BridgeNet
else:
raise ValueError(f'unknown network type {n}')
# set nic sim # set nic sim
for c in kinds_of_nic: for c in kinds_of_nic:
...@@ -81,7 +83,7 @@ for n in kinds_of_net: ...@@ -81,7 +83,7 @@ for n in kinds_of_net:
ip_start=2 ip_start=2
) )
if c == 'cb': elif c == 'cb':
servers = create_basic_hosts( servers = create_basic_hosts(
e, e,
1, 1,
...@@ -104,7 +106,7 @@ for n in kinds_of_net: ...@@ -104,7 +106,7 @@ for n in kinds_of_net:
ip_start=2 ip_start=2
) )
if c == 'ib': elif c == 'ib':
servers = create_basic_hosts( servers = create_basic_hosts(
e, e,
1, 1,
...@@ -127,6 +129,9 @@ for n in kinds_of_net: ...@@ -127,6 +129,9 @@ for n in kinds_of_net:
ip_start=2 ip_start=2
) )
else:
raise ValueError(f'unknown nic type {c}')
for cl in clients: for cl in clients:
cl.wait = True cl.wait = True
cl.node_config.app.server_ip = servers[0].node_config.ip cl.node_config.app.server_ip = servers[0].node_config.ip
......
...@@ -45,14 +45,16 @@ experiments = [] ...@@ -45,14 +45,16 @@ experiments = []
for n in kinds_of_net: for n in kinds_of_net:
if n == 'wire': if n == 'wire':
NetClass = sim.WireNet NetClass = sim.WireNet
if n == 'switch': elif n == 'switch':
NetClass = sim.SwitchNet NetClass = sim.SwitchNet
if n == 'dumbbell': elif n == 'dumbbell':
NetClass = sim.NS3DumbbellNet NetClass = sim.NS3DumbbellNet
if n == 'bridge': elif n == 'bridge':
NetClass = sim.NS3BridgeNet NetClass = sim.NS3BridgeNet
if n == 'tofino': elif n == 'tofino':
NetClass = sim.TofinoNet NetClass = sim.TofinoNet
else:
raise ValueError(f'unknown network type {n}')
# set nic sim # set nic sim
for c in kinds_of_nic: for c in kinds_of_nic:
...@@ -83,7 +85,7 @@ for n in kinds_of_net: ...@@ -83,7 +85,7 @@ for n in kinds_of_net:
ip_start=2 ip_start=2
) )
if c == 'cb': elif c == 'cb':
servers = create_basic_hosts( servers = create_basic_hosts(
e, e,
1, 1,
...@@ -106,7 +108,7 @@ for n in kinds_of_net: ...@@ -106,7 +108,7 @@ for n in kinds_of_net:
ip_start=2 ip_start=2
) )
if c == 'ib': elif c == 'ib':
servers = create_basic_hosts( servers = create_basic_hosts(
e, e,
1, 1,
...@@ -129,6 +131,9 @@ for n in kinds_of_net: ...@@ -129,6 +131,9 @@ for n in kinds_of_net:
ip_start=2 ip_start=2
) )
else:
raise ValueError(f'unknown nic type {c}')
clients[0].wait = True clients[0].wait = True
clients[0].node_config.app.server_ip = servers[0].node_config.ip clients[0].node_config.app.server_ip = servers[0].node_config.ip
clients[0].node_config.app.rate = rate clients[0].node_config.app.rate = rate
......
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