Fix bugs
This commit is contained in:
Abraham Gonzalez
parent
f94ddcf522
commit
ef3f7a315a
|
|
@ -179,7 +179,7 @@ class FireSimTopologyWithPasses:
|
|||
serverind = 0
|
||||
|
||||
while len(servers) > serverind:
|
||||
# this call will exit(1) if no such instances are available.
|
||||
# this call will error if no such instances are available.
|
||||
instance_type = self.run_farm.mapper_get_min_sim_host_inst_type_name(1)
|
||||
allocd_instance = self.run_farm.mapper_alloc_instance(instance_type)
|
||||
|
||||
|
|
@ -550,17 +550,17 @@ class FireSimTopologyWithPasses:
|
|||
rootLogger.info("Instances")
|
||||
rootLogger.info("-"*80)
|
||||
for instance in instancestate_map.keys():
|
||||
rootLogger.info("""Instance IP:{:>15} | Terminated: {}""".format(instance, truefalsecolor[instancestate_map[instance]]))
|
||||
rootLogger.info("""Inst. hostname:{:>15} | Terminated: {}""".format(instance, truefalsecolor[instancestate_map[instance]]))
|
||||
rootLogger.info("-"*80)
|
||||
rootLogger.info("Simulated Switches")
|
||||
rootLogger.info("-"*80)
|
||||
for switchinfo in switchstates:
|
||||
rootLogger.info("""Instance IP:{:>15} | Switch name: {} | Switch running: {}""".format(switchinfo['hostip'], switchinfo['switchname'], truefalsecolor[switchinfo['running']]))
|
||||
rootLogger.info("""Inst. hostname:{:>15} | Switch name: {} | Switch running: {}""".format(switchinfo['hostip'], switchinfo['switchname'], truefalsecolor[switchinfo['running']]))
|
||||
rootLogger.info("-"*80)
|
||||
rootLogger.info("Simulated Nodes/Jobs")
|
||||
rootLogger.info("-"*80)
|
||||
for siminfo in simstates:
|
||||
rootLogger.info("""Instance IP:{:>15} | Job: {} | Sim running: {}""".format(siminfo['hostip'], siminfo['simname'], inverttruefalsecolor[siminfo['running']]))
|
||||
rootLogger.info("""Inst. hostname:{:>15} | Job: {} | Sim running: {}""".format(siminfo['hostip'], siminfo['simname'], inverttruefalsecolor[siminfo['running']]))
|
||||
rootLogger.info("-"*80)
|
||||
rootLogger.info("Summary")
|
||||
rootLogger.info("-"*80)
|
||||
|
|
|
|||
|
|
@ -212,6 +212,7 @@ class AWSEC2F1(RunFarm):
|
|||
runhosts_list = self.args["run_farm_hosts"]
|
||||
|
||||
self.run_farm_hosts_dict = defaultdict(list)
|
||||
self.mapper_consumed = defaultdict(int)
|
||||
|
||||
for runhost in runhosts_list:
|
||||
if isinstance(runhost, dict):
|
||||
|
|
@ -225,8 +226,8 @@ class AWSEC2F1(RunFarm):
|
|||
|
||||
if inst_type in self.SUPPORTED_INSTANCE_TYPE_NAMES:
|
||||
num_sim_slots = self.INSTANCE_TYPE_NAME_TO_MAX_FPGA_SLOTS[inst_type]
|
||||
inst = Inst(num_sim_slots, EC2InstanceDeployManager, self.default_simulation_dir)
|
||||
self.run_farm_hosts_dict[inst_type].append(inst)
|
||||
insts = [Inst(num_sim_slots, EC2InstanceDeployManager, self.default_simulation_dir) for n in range(num_insts)]
|
||||
self.run_farm_hosts_dict[inst_type] = insts
|
||||
self.mapper_consumed[inst_type] = 0
|
||||
else:
|
||||
rootLogger.critical(f"WARNING: Skipping {inst_type} since it is not supported. Use {self.SUPPORTED_INSTANCE_TYPE_NAMES}.")
|
||||
|
|
|
|||
|
|
@ -184,7 +184,7 @@ class RuntimeHWConfig:
|
|||
permissive_driver_args += command_linklatencies
|
||||
permissive_driver_args += command_netbws
|
||||
permissive_driver_args += command_shmemportnames
|
||||
driver_call = f"""sudo ./{driver} +permissive {" ".join(permissive_driver_args)} +permissive-off {command_bootbinaries}"""
|
||||
driver_call = f"""sudo ./{driver} +permissive {" ".join(permissive_driver_args)} +permissive-off {" ".join(command_bootbinaries)}"""
|
||||
base_command = f"""script -f -c 'stty intr ^] && {driver_call} && stty intr ^c' uartlog"""
|
||||
screen_wrapped = f"""screen -S {screen_name} -d -m bash -c "{base_command}"; sleep 1"""
|
||||
|
||||
|
|
@ -315,18 +315,22 @@ class InnerRuntimeConfiguration:
|
|||
self.netbandwidth = int(runtime_dict['target_config']['net_bandwidth'])
|
||||
self.profileinterval = int(runtime_dict['target_config']['profile_interval'])
|
||||
|
||||
self.tracerv_config = TracerVConfig()
|
||||
if 'tracing' in runtime_dict:
|
||||
self.tracerv_config.enable = runtime_dict['tracing'].get('enable') == "yes"
|
||||
self.tracerv_config.select = runtime_dict['tracing'].get('selector', "0")
|
||||
self.tracerv_config.start = runtime_dict['tracing'].get('start', "0")
|
||||
self.tracerv_config.end = runtime_dict['tracing'].get('end', "-1")
|
||||
self.tracerv_config.output_format = runtime_dict['tracing'].get('output_format', "0")
|
||||
self.autocounter_config = AutoCounterConfig()
|
||||
if 'autocounter' in runtime_dict:
|
||||
self.autocounter_config.readrate = int(runtime_dict['autocounter'].get('read_rate', "0"))
|
||||
self.defaulthwconfig = runtime_dict['target_config']['default_hw_config']
|
||||
self.hostdebug_config = HostDebugConfig()
|
||||
if 'host_debug' in runtime_dict:
|
||||
self.hostdebug_config.zero_out_dram = runtime_dict['host_debug'].get('zero_out_dram') == "yes"
|
||||
self.hostdebug_config.disable_synth_asserts = runtime_dict['host_debug'].get('disable_synth_asserts') == "yes"
|
||||
self.synthprint_config = SynthPrintConfig()
|
||||
if 'synth_print' in runtime_dict:
|
||||
self.synthprint_config.start = runtime_dict['synth_print'].get("start", "0")
|
||||
self.synthprint_config.end = runtime_dict['synth_print'].get("end", "-1")
|
||||
|
|
|
|||
|
|
@ -34,11 +34,11 @@ aws_ec2_f1_run_farm:
|
|||
# REQUIRED: run farm hosts to spawn
|
||||
run_farm_hosts:
|
||||
# fpga instances
|
||||
- f1.16xlarges: 0
|
||||
- f1.4xlarges: 0
|
||||
- f1.2xlarges: 1
|
||||
- f1.16xlarge: 0
|
||||
- f1.4xlarge: 0
|
||||
- f1.2xlarge: 1
|
||||
# switch-only instances
|
||||
- m4.16xlarges: 0
|
||||
- m4.16xlarge: 0
|
||||
|
||||
|
||||
# Unmanaged list of run farm hosts. Assumed that they are pre-setup to run simulations.
|
||||
|
|
|
|||
Loading…
Reference in New Issue