diff options
Diffstat (limited to 'configs/ruby/Ruby.py')
| -rw-r--r-- | configs/ruby/Ruby.py | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/configs/ruby/Ruby.py b/configs/ruby/Ruby.py index e9a8a3c3f..0cd63b4f9 100644 --- a/configs/ruby/Ruby.py +++ b/configs/ruby/Ruby.py @@ -145,17 +145,12 @@ def create_system(options, system, piobus = None, dma_ports = []): class ExtLinkClass(SimpleExtLink): pass class RouterClass(Switch): pass - # - # Important: the topology must be instantiated before the network and after - # the controllers. Hence the separation between topology definition and - # instantiation. - # - routers, int_links, ext_links = topology.makeTopology(options, - IntLinkClass, ExtLinkClass, RouterClass) - network = NetworkClass(ruby_system = ruby, routers = routers, - int_links = int_links, ext_links = ext_links, - topology = topology.description) + # Create the network topology + network = NetworkClass(ruby_system = ruby, topology = topology.description, + routers = [], ext_links = [], int_links = []) + topology.makeTopology(options, network, IntLinkClass, ExtLinkClass, + RouterClass) if options.network_fault_model: assert(options.garnet_network == "fixed") |