make simulator work with python3

Signed-off-by: Reto Achermann <[email protected]>

Author: achreto

adaptive.py

@@ -7,6 +7,9 @@
 # If you do not find this file, copies can be found by writing to:
 # ETH Zurich D-INFK, Universitaetstr. 6, CH-8092 Zurich. Attn: Systems Group.
 
+import sys
+
+#sys.path.append('contrib/python-graph/core')
 from pygraph.classes.digraph import digraph
 
 import sched_adaptive
@@ -61,8 +64,8 @@ def get_root_node(self):
         c_snd_cost = sorted(_c_snd_cost.items(), key=lambda x: x[1])
         (root, cost) = c_snd_cost[0]
 
-        print 'Choosing node %d as root with cost %d' % \
-            (root, cost)
+        print ('Choosing node %d as root with cost %d' % \
+                    (root, cost))
 
         return root
 
@@ -74,5 +77,8 @@ def _build_tree(self, g):
 
         """
         gout = digraph()
-        map(gout.add_node, [ n for n in g.nodes() ])
+        for n in g.nodes() :
+            gout.add_node(n)
+
+
         return gout

algorithms.py

@@ -108,7 +108,7 @@ def invert_weights(g):
     w = 0
     for (s,d) in g.edges():
         w = max(w, g.edge_weight((s,d)))
-    print 'Maximum edge weight is %d' % w
+    print ('Maximum edge weight is %d' % w)
     w += 1 # Make sure the most expensive edge will have a cost of 1 afterwards
     g_inv = digraph()
     for n in g.nodes():
@@ -121,14 +121,14 @@ def invert_weights(g):
             g_inv.add_edge((s,d), w_inv)
         except:
             assert g_inv.edge_weight((s,d)) == w_inv # This one fails
-            print "Edge %d %d already in graph, ignoring .. " % (s,d)
+            print ("Edge %d %d already in graph, ignoring .. " % (s,d))
     return g_inv
 
 
 def merge_graphs(g1, g2):
     """
-    Merge two graphs to a new graph (V, E) with V = g1.nodes \union g2.nodes
-    and Edge e \in g1 or e \in g2 -> e \in E.
+    Merge two graphs to a new graph (V, E) with V = g1.nodes union g2.nodes
+    and Edge e in g1 or e in g2 -> e in E.
     """
 
     if g1.DIRECTED or g2.DIRECTED:

cluster.py

@@ -41,9 +41,9 @@ def _build_tree(self, g):
 
         """
 
-        print '--------------------------------------------------'
-        print '-- BUILD CLUSTER TOPLOGY'
-        print '--------------------------------------------------'
+        print ('--------------------------------------------------')
+        print ('-- BUILD CLUSTER TOPLOGY')
+        print ('--------------------------------------------------')
 
         coords = self.get_coordinators()
 
@@ -69,7 +69,7 @@ def _build_tree(self, g):
             numa_node = [ n for n in self.mod.get_numa_node(c) if n in g.nodes() ]
             g_simple = sequential(self.mod.get_graph(), numa_node, c)
             g_outer = merge_graphs(g_outer, g_simple)
-            print "%s" % str(numa_node)
+            print ("%s" % str(numa_node))
 
         helpers.output_graph(g_outer, 'cluster_outer_bin', 'neato')
         return g_outer

config.py

@@ -33,7 +33,9 @@
 dir_path = os.path.dirname(os.path.realpath(__file__))
 
 # Path to the machine database.
-MACHINE_DATABASE='%s/machinedb/' % dir_path
+MACHINE_DATABASE='%s/machinedb' % dir_path
+MACHINE_DATABASE_SCRIPTS='%s/machinedb/scripts' % dir_path
+MACHINE_DATABASE_DATA='%s/machinedb/machine-data' % dir_path
 
 # Arguments as given when invoking the simulator
 args = None

draw.py

@@ -158,7 +158,7 @@ def finalize(self, final_time):
 
         # Individual core by core, no merging of neighboring cores in one box
         if not packed:
-            print self.obj_per_core
+            print (self.obj_per_core)
             for c in self.model.get_cores(True):
                 cidx = self.model.get_numa_id(c) % int(len(self.color_map))
                 color = self.color_map[cidx]
@@ -220,18 +220,18 @@ def generate_image(self):
         with open('test.tex', 'w') as f:
 
             _out = self.name.replace('.tex', '.png')
-            print 'Generating visualization .. '
+            print ('Generating visualization .. ')
 
             for line in open('template.tex', 'r'):
                 f.write(line.replace('{%file%}', self.name))
 
             f.close()
 
             try:
-                print subprocess.check_output(shlex.split('rm -f test-figure0.pdf'))
-                print subprocess.check_output(shlex.split('pdflatex -shell-escape -interaction nonstopmode test.tex'))
-                print subprocess.check_output(shlex.split('convert -verbose -density 300 test-figure0.pdf %s' % _out))
+                print (subprocess.check_output(shlex.split('rm -f test-figure0.pdf')))
+                print (subprocess.check_output(shlex.split('pdflatex -shell-escape -interaction nonstopmode test.tex')))
+                print (subprocess.check_output(shlex.split('convert -verbose -density 300 test-figure0.pdf %s' % _out)))
 
             except Exception as e:
-                print 'Generating visualization failed, aborting'
+                print ('Generating visualization failed, aborting')
                 raise e

evaluate.py

@@ -767,8 +767,8 @@ def evaluate_all(topo, root, m, sched):
 
         # Dump tree
         for c in m.get_cores(True):
-            print '%d -> %s' % \
-                (c, ','.join([ str(x) for (_, x) in sched.find_schedule(c) ]))
+            print( '%d -> %s' % \
+                            (c, ','.join([ str(x) for (_, x) in sched.find_schedule(c) ])))
 
         return res
 
@@ -853,9 +853,9 @@ def evaluate(self, topo, root, m, sched):
         else:
             send_feedback = 0
 
-        print "Terminating(%d,%s,%s) - cost %d for last_node -> root" % \
-            (self.sim_round, str(self.last_node), str(root),
-             send_feedback + self.model.get_receive_cost(self.last_node, root))
+        print ("Terminating(%d,%s,%s) - cost %d for last_node -> root" % \
+                    (self.sim_round, str(self.last_node), str(root),
+                     send_feedback + self.model.get_receive_cost(self.last_node, root)))
         self.sim_round += send_feedback
         # * Propagation
         self.sim_round += T_PROPAGATE

events.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright (c) 2013-2016, ETH Zurich.
 # All rights reserved.
@@ -11,6 +11,8 @@ class Event():
     def __init__(self, src, dest):
         self.src = src
         self.dest = dest
+    def __lt__(self, other) :
+        return False
 
 class Send(Event):
     """
@@ -20,6 +22,8 @@ class Send(Event):
 
     def get_type(self):
         return 'Send'
+    def __lt__(self, other) :
+        return True
 
 class Receive(Event):
     """
@@ -29,6 +33,8 @@ class Receive(Event):
     """
     def get_type(self):
         return 'Receive'
+    def __lt__(self, other) :
+        return True
 
 class Propagate(Event):
     """
@@ -38,6 +44,8 @@ class Propagate(Event):
     """
     def get_type(self):
         return 'Propagate'
+    def __lt__(self, other) :
+        return False
 
 class Receiving(Event):
     """Indicates that a node is currently receiving a message and no other
@@ -53,3 +61,5 @@ class Receiving(Event):
     """
     def get_type(self):
         return 'Receiving'
+    def __lt__(self, other) :
+        return False

fibonacci.py

@@ -44,7 +44,7 @@ def _build_tree(self, g):
         while algorithms.F(fibno+2)-1<num_cores:
             fibno += 1
 
-        print 'Fibonacci number for this machine is %d' % fibno
+        print ('Fibonacci number for this machine is %d' % fibno)
 
         # Build tree
         nodes = []
@@ -54,7 +54,7 @@ def _build_tree(self, g):
         assert len(nodes)>=num_cores
 
         # Sort nodes such that nodes further up in the tree come first
-        nodes = sorted(nodes, cmp=lambda x, y: cmp(len(x),len(y)))
+        nodes = sorted(nodes, key=lambda x: len(x))
 
         # Shorten nodes so that we have just enough cores
         nodes = nodes[:num_cores]

helpers.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright (c) 2013-2016, ETH Zurich.
 # All rights reserved.
@@ -15,13 +15,17 @@
 sys.path.append('/usr/lib64/graphviz/python/')
 sys.path.append('/home/skaestle/bin/')
 sys.path.append(os.getenv('HOME') + '/bin/')
+
 import gv
-import Queue
+import queue
 import logging
 import re
 
 import config
 
+import sys
+sys.path.append('./contrib/python-graph/core')
+sys.path.append('./contrib/python-graph/dot')
 from pygraph.classes.graph import graph
 from pygraph.classes.digraph import digraph
 
@@ -51,7 +55,7 @@ def output_clustered_graph(graph, name, clustering):
                   '#9467bd', '#c5b0d5', '#8c564b', '#c49c94',
                   '#e377c2', '#f7b6d2', '#7f7f7f', '#c7c7c7',
                   '#bcbd22', '#dbdb8d', '#17becf', '#9edae5' ]
-    clist = [ tableau20[i*2] for i in range(0, len(tableau20)/2)]
+    clist = [ tableau20[i*2] for i in range(0, len(tableau20)//2)]
 
     i = 0
     for c in clustering:
@@ -104,7 +108,7 @@ def output_quorum_configuration(model, hierarchies, root, sched, topo, midx,
     d = core_index_dict(model.graph.nodes())
 
     dim = model.get_num_cores()
-    mat = [[0 for x in xrange(dim)] for x in xrange(dim)]
+    mat = [[0 for x in range(dim)] for x in range(dim)]
 
     import hybrid_model
 
@@ -238,7 +242,7 @@ def walk_graph(g, root, func, mat, sched, core_dict):
     """
     assert isinstance(g, graph) or isinstance(g, digraph)
 
-    active = Queue.Queue()
+    active = queue.Queue()
     done = []
 
     active.put((root, None))
@@ -274,8 +278,8 @@ def draw_final(mod, sched, topo):
     assert isinstance(sched, scheduling.Scheduling)
     assert isinstance(topo, Overlay)
 
-    print 'Name of machine is:', mod.get_name()
-    print 'Name of topology is:', topo.get_name()
+    print ('Name of machine is:', mod.get_name())
+    print ('Name of topology is:', topo.get_name())
 
     import pygraphviz as pgv
     A = pgv.AGraph()
@@ -302,7 +306,7 @@ def draw_final(mod, sched, topo):
             A.add_subgraph(c, name='cluster_%d' % i, color=clist[i % len(clist)])
             i += 1
     else:
-        print 'Not drawing NUMA nodes'
+        print ('Not drawing NUMA nodes')
 
     desc = 'mc' if mc else 'full'
 
@@ -314,8 +318,8 @@ def draw_final(mod, sched, topo):
         A.write(_name + '.dot')
 
     except Exception as e:
-        print 'Generating PNGs for graph topologies faield, continuing'
-        print e
+        print ('Generating PNGs for graph topologies faield, continuing')
+        print (e)
 
 
 def fill_matrix(s, children, parent, mat, sched, core_dict):
@@ -444,7 +448,7 @@ class bcolors:
     UNDERLINE = '\033[4m'
 
 def warn(msg):
-    print bcolors.WARNING + 'WARNING: ' + msg + bcolors.ENDC
+    print (bcolors.WARNING + 'WARNING: ' + msg + bcolors.ENDC)
 
 
 def git_version():

hybrid.py

@@ -54,15 +54,15 @@ def __init__(self, mod, mp_topology):
             g = digraph()
 
             clusters = self.mod.machine_topology['Cache level 3']
-            print str(clusters)
+            print (str(clusters))
             coords = []
 
             for cluster in clusters.get():
 
                 # First core in cluster acts as coordinator
                 coords.append(cluster[0])
 
-            print str(coords)
+            print (str(coords))
             coords = map(int, coords)
             g.add_nodes(coords)
 
@@ -75,7 +75,7 @@ def __init__(self, mod, mp_topology):
 
             self.mp_tree = self.mp_topology(simplemachine.SimpleMachine(g))
             tmp = self.mp_tree.get_broadcast_tree()
-            print 'broadcast', str(tmp[0].graph)
+            print ('broadcast', str(tmp[0].graph))
             self.mp_tree_topo = tmp[0].graph
 
             for (cluster, coord) in zip(clusters.get(), coords):
@@ -116,7 +116,7 @@ def get_scheduler(self, graph):
         """
         XXX Graph is ignored!!
         """
-        print "get_scheduler for hybrid tree using %s" % str(self.mp_tree)
+        print ("get_scheduler for hybrid tree using %s" % str(self.mp_tree))
         return self.mp_tree.get_scheduler(self.mp_tree._get_broadcast_tree())
 
     def get_name(self):