changeset d60a9bb99038 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=d60a9bb99038
description:
        Backed out prior changeset f9fb64a72259

        Back out use of importlib to avoid implicitly creating
        dependency on Python 2.7.

diffstat:

 configs/ruby/Ruby.py |  13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diffs (33 lines):

diff -r f9fb64a72259 -r d60a9bb99038 configs/ruby/Ruby.py
--- a/configs/ruby/Ruby.py      Sun Nov 23 05:55:26 2014 -0800
+++ b/configs/ruby/Ruby.py      Sun Nov 23 18:00:47 2014 -0800
@@ -39,7 +39,6 @@
 #
 # Authors: Brad Beckmann
 
-import importlib
 import math
 import m5
 from m5.objects import *
@@ -183,15 +182,15 @@
             routers = [], ext_links = [], int_links = [], netifs = [])
     ruby.network = network
 
-    protocol_name = buildEnv['PROTOCOL']
-    protocol = importlib.import_module(protocol_name)
+    protocol = buildEnv['PROTOCOL']
+    exec "import %s" % protocol
     try:
         (cpu_sequencers, dir_cntrls, topology) = \
-             protocol.create_system(options, full_system, system, dma_ports,
-                                    ruby)
+             eval("%s.create_system(options, full_system, system, dma_ports,\
+                                    ruby)"
+                  % protocol)
     except:
-        print "Error: could not create sytem for ruby protocol %s" % \
-            protocol_name
+        print "Error: could not create sytem for ruby protocol %s" % protocol
         raise
 
     # Create a port proxy for connecting the system port. This is
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev

Reply via email to