From aa60fb74712c707fe288f512454c7db9d894a674 Mon Sep 17 00:00:00 2001 From: Sagar Karandikar Date: Sat, 11 Jun 2022 20:22:24 -0700 Subject: [PATCH] Apply suggestions from code review Co-authored-by: Abraham Gonzalez --- deploy/runtools/run_farm.py | 2 +- deploy/runtools/run_farm_deploy_managers.py | 6 +++--- deploy/runtools/runtime_config.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/deploy/runtools/run_farm.py b/deploy/runtools/run_farm.py index 24c92136..b9dab7e9 100644 --- a/deploy/runtools/run_farm.py +++ b/deploy/runtools/run_farm.py @@ -533,7 +533,7 @@ class ExternallyProvisioned(RunFarm): inst = Inst(num_sims, dispatch_dict[platform], simulation_dir, self.metasimulation_enabled) inst.set_host(ip_addr) assert not ip_addr in self.run_farm_hosts_dict, f"Duplicate host name found in 'run_farm_hosts': {ip_addr}" - self.run_farm_hosts_dict[ip_addr] = [[inst, None]] + self.run_farm_hosts_dict[ip_addr] = [(inst, None)] self.mapper_consumed[ip_addr] = 0 else: raise Exception("Unknown runhost handle") diff --git a/deploy/runtools/run_farm_deploy_managers.py b/deploy/runtools/run_farm_deploy_managers.py index a9061c28..a95d4744 100644 --- a/deploy/runtools/run_farm_deploy_managers.py +++ b/deploy/runtools/run_farm_deploy_managers.py @@ -316,7 +316,7 @@ class EC2InstanceDeployManager(InstanceDeployManager): assert slotno < len(self.parent_node.sim_slots) serv = self.parent_node.sim_slots[slotno] - self.instance_logger("""Copying {sim_type_message} simulation infrastructure for slot: {slotno}.""".format(slotno=slotno, sim_type_message=self.sim_type_message)) + self.instance_logger(f"""Copying {self.sim_type_message} simulation infrastructure for slot: {slotno}.""") remote_home_dir = self.parent_node.get_sim_dir() @@ -366,7 +366,7 @@ class EC2InstanceDeployManager(InstanceDeployManager): def start_sim_slot(self, slotno: int) -> None: if self.instance_assigned_simulations(): - self.instance_logger("""Starting {sim_type_message} simulation for slot: {slotno}.""".format(slotno=slotno, sim_type_message=self.sim_type_message)) + self.instance_logger(f"""Starting {self.sim_type_message} simulation for slot: {slotno}.""") remote_home_dir = self.parent_node.sim_dir remote_sim_dir = """{}/sim_slot_{}/""".format(remote_home_dir, slotno) assert slotno < len(self.parent_node.sim_slots) @@ -385,7 +385,7 @@ class EC2InstanceDeployManager(InstanceDeployManager): def kill_sim_slot(self, slotno: int) -> None: if self.instance_assigned_simulations(): - self.instance_logger("""Killing {sim_type_message} simulation for slot: {slotno}.""".format(slotno=slotno, sim_type_message=self.sim_type_message)) + self.instance_logger(f"""Killing {self.sim_type_message} simulation for slot: {slotno}.""") assert slotno < len(self.parent_node.sim_slots) server = self.parent_node.sim_slots[slotno] with warn_only(), StreamLogger('stdout'), StreamLogger('stderr'): diff --git a/deploy/runtools/runtime_config.py b/deploy/runtools/runtime_config.py index 3cce2cf3..f61afcbb 100644 --- a/deploy/runtools/runtime_config.py +++ b/deploy/runtools/runtime_config.py @@ -218,7 +218,7 @@ class RuntimeHWConfig: design = triplet_pieces[0] target_config = triplet_pieces[1] platform_config = triplet_pieces[2] - rootLogger.info("Building " + self.driver_type_message + " driver for " + str(self.get_deploytriplet_for_config())) + rootLogger.info(f"Building {self.driver_type_message} driver for {str(self.get_deploytriplet_for_config())}") with prefix('cd ../'), \ prefix('export RISCV={}'.format(os.getenv('RISCV', ""))), \ prefix('export PATH={}'.format(os.getenv('PATH', ""))), \ @@ -240,7 +240,7 @@ class RuntimeHWConfig: logcapture = local("""cat {}""".format(buildlogfile), capture=True) rootLogger.debug("[localhost] " + str(logcapture)) if localcap.failed: - rootLogger.info(self.driver_type_message + " driver build failed. Exiting. See log for details.") + rootLogger.info(f"{self.driver_type_message} driver build failed. Exiting. See log for details.") rootLogger.info("""You can also re-run '{}' in the 'firesim/sim' directory to debug this error.""".format(driverbuildcommand)) sys.exit(1)