Daniel Carvalho has submitted this change and it was merged. (
https://gem5-review.googlesource.com/c/public/gem5/+/13995 )
Change subject: configs: Add missing path to ruby imports
......................................................................
configs: Add missing path to ruby imports
Add missing addToPath to ruby files, so that import
modules from previous folder are visible.
Change-Id: I912d78a2f709974f72fe768e73abac1617126f46
Signed-off-by: Daniel R. Carvalho <[email protected]>
Reviewed-on: https://gem5-review.googlesource.com/c/13995
Reviewed-by: Jason Lowe-Power <[email protected]>
Reviewed-by: Anthony Gutierrez <[email protected]>
Maintainer: Jason Lowe-Power <[email protected]>
---
M configs/ruby/AMD_Base_Constructor.py
M configs/ruby/GPU_RfO.py
M configs/ruby/GPU_VIPER.py
M configs/ruby/GPU_VIPER_Baseline.py
M configs/ruby/GPU_VIPER_Region.py
M configs/ruby/MOESI_AMD_Base.py
M configs/ruby/Ruby.py
7 files changed, 21 insertions(+), 1 deletion(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
Anthony Gutierrez: Looks good to me, but someone else must approve
diff --git a/configs/ruby/AMD_Base_Constructor.py
b/configs/ruby/AMD_Base_Constructor.py
index 23a80a7..96f6575 100644
--- a/configs/ruby/AMD_Base_Constructor.py
+++ b/configs/ruby/AMD_Base_Constructor.py
@@ -36,8 +36,11 @@
import m5
from m5.objects import *
from m5.defines import buildEnv
-from m5.util import convert
+from m5.util import addToPath, convert
from CntrlBase import *
+
+addToPath('../')
+
from topologies.Cluster import Cluster
#
diff --git a/configs/ruby/GPU_RfO.py b/configs/ruby/GPU_RfO.py
index 895c693..fea5e5a 100644
--- a/configs/ruby/GPU_RfO.py
+++ b/configs/ruby/GPU_RfO.py
@@ -35,9 +35,12 @@
import m5
from m5.objects import *
from m5.defines import buildEnv
+from m5.util import addToPath
from Ruby import create_topology
from Ruby import send_evicts
+addToPath('../')
+
from topologies.Cluster import Cluster
from topologies.Crossbar import Crossbar
diff --git a/configs/ruby/GPU_VIPER.py b/configs/ruby/GPU_VIPER.py
index 87c84b8..8d12230 100644
--- a/configs/ruby/GPU_VIPER.py
+++ b/configs/ruby/GPU_VIPER.py
@@ -35,9 +35,12 @@
import m5
from m5.objects import *
from m5.defines import buildEnv
+from m5.util import addToPath
from Ruby import create_topology
from Ruby import send_evicts
+addToPath('../')
+
from topologies.Cluster import Cluster
from topologies.Crossbar import Crossbar
diff --git a/configs/ruby/GPU_VIPER_Baseline.py
b/configs/ruby/GPU_VIPER_Baseline.py
index 19005ea..960cbbd 100644
--- a/configs/ruby/GPU_VIPER_Baseline.py
+++ b/configs/ruby/GPU_VIPER_Baseline.py
@@ -35,9 +35,12 @@
import m5
from m5.objects import *
from m5.defines import buildEnv
+from m5.util import addToPath
from Ruby import create_topology
from Ruby import send_evicts
+addToPath('../')
+
from topologies.Cluster import Cluster
from topologies.Crossbar import Crossbar
diff --git a/configs/ruby/GPU_VIPER_Region.py
b/configs/ruby/GPU_VIPER_Region.py
index 98a054e..90e8b77 100644
--- a/configs/ruby/GPU_VIPER_Region.py
+++ b/configs/ruby/GPU_VIPER_Region.py
@@ -35,8 +35,11 @@
import m5
from m5.objects import *
from m5.defines import buildEnv
+from m5.util import addToPath
from Ruby import send_evicts
+addToPath('../')
+
from topologies.Cluster import Cluster
class CntrlBase:
diff --git a/configs/ruby/MOESI_AMD_Base.py b/configs/ruby/MOESI_AMD_Base.py
index 407f2e8..ad16543 100644
--- a/configs/ruby/MOESI_AMD_Base.py
+++ b/configs/ruby/MOESI_AMD_Base.py
@@ -35,9 +35,12 @@
import m5
from m5.objects import *
from m5.defines import buildEnv
+from m5.util import addToPath
from Ruby import create_topology
from Ruby import send_evicts
+addToPath('../')
+
from topologies.Cluster import Cluster
from topologies.Crossbar import Crossbar
diff --git a/configs/ruby/Ruby.py b/configs/ruby/Ruby.py
index 2fb1740..2ddf608 100644
--- a/configs/ruby/Ruby.py
+++ b/configs/ruby/Ruby.py
@@ -47,6 +47,8 @@
from m5.defines import buildEnv
from m5.util import addToPath, fatal
+addToPath('../')
+
from common import MemConfig
from topologies import *
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/13995
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-Change-Id: I912d78a2f709974f72fe768e73abac1617126f46
Gerrit-Change-Number: 13995
Gerrit-PatchSet: 3
Gerrit-Owner: Daniel Carvalho <[email protected]>
Gerrit-Reviewer: Anthony Gutierrez <[email protected]>
Gerrit-Reviewer: Daniel Carvalho <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
