diff options
| author | Andreas Sandberg <andreas.sandberg@arm.com> | 2019-02-25 11:55:02 +0000 |
|---|---|---|
| committer | Andreas Sandberg <andreas.sandberg@arm.com> | 2019-03-18 15:13:52 +0000 |
| commit | fe3e8084959a6910f4c8d075c5c03e40d0269527 (patch) | |
| tree | 7e4e43608dfd8d3d5544177e439f57733f3837d8 /configs/ruby/Ruby.py | |
| parent | 9e22a2ab603d743b187108986cfbeba07c0c0b8d (diff) | |
| download | gem5-fe3e8084959a6910f4c8d075c5c03e40d0269527.tar.xz | |
configs: Use absolute import paths
Use absoluate import paths to be Python 3 compatible. This also
imports absolute_import from __future__ to ensure that Python 2.7
behaves the same way as Python 3.
Change-Id: Ica06ed95814e9cd3e768b3e1785075e36f6e56d0
Signed-off-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/16708
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Diffstat (limited to 'configs/ruby/Ruby.py')
| -rw-r--r-- | configs/ruby/Ruby.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configs/ruby/Ruby.py b/configs/ruby/Ruby.py index 03e836eb0..ffa5a0294 100644 --- a/configs/ruby/Ruby.py +++ b/configs/ruby/Ruby.py @@ -81,7 +81,7 @@ def define_options(parser): help="Recycle latency for ruby controller input buffers") protocol = buildEnv['PROTOCOL'] - exec "import %s" % protocol + exec("from . import %s" % protocol) eval("%s.define_options(parser)" % protocol) Network.define_options(parser) @@ -144,7 +144,7 @@ def create_topology(controllers, options): found in configs/topologies/BaseTopology.py This is a wrapper for the legacy topologies. """ - exec "import topologies.%s as Topo" % options.topology + exec("import topologies.%s as Topo" % options.topology) topology = eval("Topo.%s(controllers)" % options.topology) return topology @@ -160,7 +160,7 @@ def create_system(options, full_system, system, piobus = None, dma_ports = [], ruby.network = network protocol = buildEnv['PROTOCOL'] - exec "import %s" % protocol + exec("from . import %s" % protocol) try: (cpu_sequencers, dir_cntrls, topology) = \ eval("%s.create_system(options, full_system, system, dma_ports,\ |