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/common/cores | |
| 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/common/cores')
| -rw-r--r-- | configs/common/cores/__init__.py | 3 | ||||
| -rw-r--r-- | configs/common/cores/arm/HPI.py | 1 | ||||
| -rw-r--r-- | configs/common/cores/arm/O3_ARM_v7a.py | 2 | ||||
| -rw-r--r-- | configs/common/cores/arm/__init__.py | 5 | ||||
| -rw-r--r-- | configs/common/cores/arm/ex5_LITTLE.py | 3 | ||||
| -rw-r--r-- | configs/common/cores/arm/ex5_big.py | 3 |
6 files changed, 16 insertions, 1 deletions
diff --git a/configs/common/cores/__init__.py b/configs/common/cores/__init__.py index 7a2173eab..c61e6d8b5 100644 --- a/configs/common/cores/__init__.py +++ b/configs/common/cores/__init__.py @@ -34,3 +34,6 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # # Authors: Andreas Sandberg + +from __future__ import print_function +from __future__ import absolute_import diff --git a/configs/common/cores/arm/HPI.py b/configs/common/cores/arm/HPI.py index d105790e3..01c088470 100644 --- a/configs/common/cores/arm/HPI.py +++ b/configs/common/cores/arm/HPI.py @@ -46,6 +46,7 @@ at: http://www.arm.com/ResearchEnablement/SystemModeling """ from __future__ import print_function +from __future__ import absolute_import from m5.objects import * diff --git a/configs/common/cores/arm/O3_ARM_v7a.py b/configs/common/cores/arm/O3_ARM_v7a.py index b0ba1280f..3a1f9af7c 100644 --- a/configs/common/cores/arm/O3_ARM_v7a.py +++ b/configs/common/cores/arm/O3_ARM_v7a.py @@ -26,6 +26,8 @@ # # Authors: Ron Dreslinski +from __future__ import print_function +from __future__ import absolute_import from m5.objects import * diff --git a/configs/common/cores/arm/__init__.py b/configs/common/cores/arm/__init__.py index 582e6b859..b90b61eac 100644 --- a/configs/common/cores/arm/__init__.py +++ b/configs/common/cores/arm/__init__.py @@ -35,6 +35,9 @@ # # Authors: Andreas Sandberg +from __future__ import print_function +from __future__ import absolute_import + from pkgutil import iter_modules from importlib import import_module @@ -44,7 +47,7 @@ _cpu_modules = [ for c in _cpu_modules: try: - import_module("." + c, package=__package__) + import_module("." + c, package=__name__) except NameError: # Failed to import a CPU model due to a missing # dependency. This typically happens if gem5 has been compiled diff --git a/configs/common/cores/arm/ex5_LITTLE.py b/configs/common/cores/arm/ex5_LITTLE.py index 1ae0f16df..85fdd5541 100644 --- a/configs/common/cores/arm/ex5_LITTLE.py +++ b/configs/common/cores/arm/ex5_LITTLE.py @@ -29,6 +29,9 @@ # Anastasiia Butko # Louisa Bessad +from __future__ import print_function +from __future__ import absolute_import + from m5.objects import * #----------------------------------------------------------------------- diff --git a/configs/common/cores/arm/ex5_big.py b/configs/common/cores/arm/ex5_big.py index 96323f435..445aa3255 100644 --- a/configs/common/cores/arm/ex5_big.py +++ b/configs/common/cores/arm/ex5_big.py @@ -29,6 +29,9 @@ # Anastasiia Butko # Louisa Bessad +from __future__ import print_function +from __future__ import absolute_import + from m5.objects import * #----------------------------------------------------------------------- |