fix indentations

deploy/runtools/firesim_topology_elements.py

@@ -296,21 +296,21 @@ class FireSimDummyServerNode(FireSimServerNode):
         for index, servernode in enumerate(map( lambda x : x.get_downlink_side(), self.uplinks[0].get_uplink_side().downlinks)):
             if self == servernode:
                 return self.uplinks[0].get_uplink_side().downlinks[index+siblingindex].get_downlink_side()
-     def supernode_get_sibling_mac_address(self, siblingindex):
+    def supernode_get_sibling_mac_address(self, siblingindex):
         """ return the sibling's mac address for supernode mode.
         siblingindex = 1 -> next sibling, 2 = second, 3 = last one."""
         return self.supernode_get_sibling(siblingindex).get_mac_address()
-     def supernode_get_sibling_rootfs(self, siblingindex):
+    def supernode_get_sibling_rootfs(self, siblingindex):
         """ return the sibling's rootfs for supernode mode.
         siblingindex = 1 -> next sibling, 2 = second, 3 = last one."""
         return self.supernode_get_sibling(siblingindex).get_rootfs_name(siblingindex)
-     def supernode_get_sibling_bootbin(self, siblingindex):
+    def supernode_get_sibling_bootbin(self, siblingindex):
         """ return the sibling's rootfs for supernode mode.
         siblingindex = 1 -> next sibling, 2 = second, 3 = last one."""
         return self.supernode_get_sibling(siblingindex).get_bootbin_name(siblingindex)
-     def supernode_get_sibling_rootfs_path(self, siblingindex):
+    def supernode_get_sibling_rootfs_path(self, siblingindex):
         return self.supernode_get_sibling(siblingindex).get_job().rootfs_path()
-     def supernode_get_sibling_bootbinary_path(self, siblingindex):
+    def supernode_get_sibling_bootbinary_path(self, siblingindex):
         return self.supernode_get_sibling(siblingindex).get_job().bootbinary_path()
 
 
@@ -335,7 +335,7 @@ class FireSimDummyServerNode(FireSimServerNode):
             self.get_mac_address(), sibling1mac, sibling2mac, sibling3mac,
             self.get_rootfs_name(), sibling1root, sibling2root, sibling3root,
             slotno, self.server_link_latency, self.server_bw_max, self.server_profile_interval,
-            self.get_bootbin_name(), sibling1bootbin, sibling2bootbin, sibling3bootbin
+            self.get_bootbin_name(), sibling1bootbin, sibling2bootbin, sibling3bootbin,
             self.trace_enable, self.trace_start, self.trace_end, shmemportname)
 
 
@@ -345,7 +345,7 @@ class FireSimDummyServerNode(FireSimServerNode):
 
         def get_path_trailing(filepath):
             return filepath.split("/")[-1]
-         def local_and_remote(filepath, index):
+        def local_and_remote(filepath, index):
             return [filepath, get_path_trailing(filepath) + str(index)]
 
         all_paths = []

deploy/runtools/firesim_topology_with_passes.py

@@ -162,7 +162,7 @@ class FireSimTopologyWithPasses:
                     return
         assert serverind == len(servers), "ERR: all servers were not assigned to a host."
 
-   def pass_simple_networked_host_node_mapping(self):
+    def pass_simple_networked_host_node_mapping(self):
         """ A very simple host mapping strategy.  """
         switches = self.firesimtopol.get_dfs_order_switches()
         f1_2s_used = 0

deploy/runtools/user_topology.py

@@ -270,15 +270,15 @@ class UserTopologies(object):
         self.roots = [FireSimSwitchNode()]
         servers = [FireSimServerNode()] + [FireSimDummyServerNode() for x in range(3)]
         self.roots[0].add_downlinks(servers)
-     def supernode_example_8config(self):
+    def supernode_example_8config(self):
         self.roots = [FireSimSwitchNode()]
         servers = UserTopologies.supernode_flatten([[FireSimServerNode(), FireSimDummyServerNode(), FireSimDummyServerNode(), FireSimDummyServerNode()] for y in range(2)])
         self.roots[0].add_downlinks(servers)
-     def supernode_example_16config(self):
+    def supernode_example_16config(self):
         self.roots = [FireSimSwitchNode()]
         servers = UserTopologies.supernode_flatten([[FireSimServerNode(), FireSimDummyServerNode(), FireSimDummyServerNode(), FireSimDummyServerNode()] for y in range(4)])
         self.roots[0].add_downlinks(servers)
-     def supernode_example_32config(self):
+    def supernode_example_32config(self):
         self.roots = [FireSimSwitchNode()]
         servers = UserTopologies.supernode_flatten([[FireSimServerNode(), FireSimDummyServerNode(), FireSimDummyServerNode(), FireSimDummyServerNode()] for y in range(8)])
         self.roots[0].add_downlinks(servers)
@@ -287,50 +287,50 @@ class UserTopologies(object):
         self.roots = [FireSimSwitchNode()]
         level2switches = [FireSimSwitchNode() for x in range(2)]
         servers = [UserTopologies.supernode_flatten([[FireSimServerNode(), FireSimDummyServerNode(), FireSimDummyServerNode(), FireSimDummyServerNode()] for y in range(8)]) for x in range(2)]
-         for root in self.roots:
+        for root in self.roots:
             root.add_downlinks(level2switches)
-         for l2switchNo in range(len(level2switches)):
+        for l2switchNo in range(len(level2switches)):
             level2switches[l2switchNo].add_downlinks(servers[l2switchNo])
 
-     def supernode_example_128config(self):
+    def supernode_example_128config(self):
         self.roots = [FireSimSwitchNode()]
         level2switches = [FireSimSwitchNode() for x in range(4)]
         servers = [UserTopologies.supernode_flatten([[FireSimServerNode(), FireSimDummyServerNode(), FireSimDummyServerNode(), FireSimDummyServerNode()] for y in range(8)]) for x in range(4)]
-         for root in self.roots:
+        for root in self.roots:
             root.add_downlinks(level2switches)
-         for l2switchNo in range(len(level2switches)):
+        for l2switchNo in range(len(level2switches)):
             level2switches[l2switchNo].add_downlinks(servers[l2switchNo])
 
-   def supernode_example_256config(self):
+    def supernode_example_256config(self):
         self.roots = [FireSimSwitchNode()]
         level2switches = [FireSimSwitchNode() for x in range(8)]
         servers = [UserTopologies.supernode_flatten([[FireSimServerNode(), FireSimDummyServerNode(), FireSimDummyServerNode(), FireSimDummyServerNode()] for y in range(8)]) for x in range(8)]
-         for root in self.roots:
+        for root in self.roots:
             root.add_downlinks(level2switches)
-         for l2switchNo in range(len(level2switches)):
+        for l2switchNo in range(len(level2switches)):
             level2switches[l2switchNo].add_downlinks(servers[l2switchNo])
 
-     def supernode_example_512config(self):
+    def supernode_example_512config(self):
         self.roots = [FireSimSwitchNode()]
         level1switches = [FireSimSwitchNode() for x in range(2)]
         level2switches = [[FireSimSwitchNode() for x in range(8)] for x in range(2)]
         servers = [[UserTopologies.supernode_flatten([[FireSimServerNode(), FireSimDummyServerNode(), FireSimDummyServerNode(), FireSimDummyServerNode()] for y in range(8)]) for x in range(8)] for x in range(2)]
-         self.roots[0].add_downlinks(level1switches)
-         for switchno in range(len(level1switches)):
+        self.roots[0].add_downlinks(level1switches)
+        for switchno in range(len(level1switches)):
             level1switches[switchno].add_downlinks(level2switches[switchno])
-         for switchgroupno in range(len(level2switches)):
+        for switchgroupno in range(len(level2switches)):
             for switchno in range(len(level2switches[switchgroupno])):
                 level2switches[switchgroupno][switchno].add_downlinks(servers[switchgroupno][switchno])
 
-     def supernode_example_1024config(self):
+    def supernode_example_1024config(self):
         self.roots = [FireSimSwitchNode()]
         level1switches = [FireSimSwitchNode() for x in range(4)]
         level2switches = [[FireSimSwitchNode() for x in range(8)] for x in range(4)]
         servers = [[UserTopologies.supernode_flatten([[FireSimServerNode(), FireSimDummyServerNode(), FireSimDummyServerNode(), FireSimDummyServerNode()] for y in range(8)]) for x in range(8)] for x in range(4)]
-         self.roots[0].add_downlinks(level1switches)
-         for switchno in range(len(level1switches)):
+        self.roots[0].add_downlinks(level1switches)
+        for switchno in range(len(level1switches)):
             level1switches[switchno].add_downlinks(level2switches[switchno])
-         for switchgroupno in range(len(level2switches)):
+        for switchgroupno in range(len(level2switches)):
             for switchno in range(len(level2switches[switchgroupno])):
                 level2switches[switchgroupno][switchno].add_downlinks(servers[switchgroupno][switchno])
 
@@ -340,10 +340,10 @@ class UserTopologies(object):
         level1switches = [FireSimSwitchNode() for x in range(2)]
         level2switches = [[FireSimSwitchNode() for x in range(1)] for x in range(2)]
         servers = [[UserTopologies.supernode_flatten([[FireSimServerNode(), FireSimDummyServerNode(), FireSimDummyServerNode(), FireSimDummyServerNode()] for y in range(8)]) for x in range(1)] for x in range(2)]
-         self.roots[0].add_downlinks(level1switches)
-         for switchno in range(len(level1switches)):
+        self.roots[0].add_downlinks(level1switches)
+        for switchno in range(len(level1switches)):
             level1switches[switchno].add_downlinks(level2switches[switchno])
-         for switchgroupno in range(len(level2switches)):
+        for switchgroupno in range(len(level2switches)):
             for switchno in range(len(level2switches[switchgroupno])):
                 level2switches[switchgroupno][switchno].add_downlinks(servers[switchgroupno][switchno])