Re: [m5-dev] Review Request: python: get rid of internal.enums package.

2010-09-24 Thread Steve Reinhardt
On Wed, Sep 22, 2010 at 9:01 AM, Nathan Binkert n...@binkert.org wrote:
 looks like what I was expecting.  I wonder if we should change some of the 
 internal.params imports to objects.params, but it doesn't matter too much.

Oddly I tried that and it doesn't work.  This particular change seems
to be the problem:

diff --git a/src/python/m5/params.py b/src/python/m5/params.py
--- a/src/python/m5/params.py
+++ b/src/python/m5/params.py
@@ -1168,7 +1168,7 @@

 # Call C++ to create corresponding port connection between C++ objects
 def ccConnect(self):
-from m5.internal.params import connectPorts
+from m5.objects.params import connectPorts

 if self.ccConnected: # already done this
 return

as it leads to this error:

Traceback (most recent call last):
  File string, line 1, in module
  File /home/stever/hg/m5sim.org/m5/src/python/m5/main.py, line 359, in main
exec filecode in scope
  File tests/run.py, line 81, in module
m5.instantiate()
  File /home/stever/hg/m5sim.org/m5/src/python/m5/simulate.py, line
78, in instantiate
for obj in root.descendants(): obj.connectPorts()
  File /home/stever/hg/m5sim.org/m5/src/python/m5/SimObject.py, line
851, in connectPorts
portRef.ccConnect()
  File /home/stever/hg/m5sim.org/m5/src/python/m5/params.py, line
1258, in ccConnect
[el.ccConnect() for el in self.elements]
  File /home/stever/hg/m5sim.org/m5/src/python/m5/params.py, line
1171, in ccConnect
from m5.objects.params import connectPorts
ImportError: No module named params

I have no idea why that doesn't work though... figuring out what's
going on with these imports is not for the faint of heart (or those
pressed for time)...

Steve
___
m5-dev mailing list
m5-dev@m5sim.org
http://m5sim.org/mailman/listinfo/m5-dev


[m5-dev] Review Request: python: get rid of internal.enums package.

2010-09-22 Thread Steve Reinhardt

---
This is an automatically generated e-mail. To reply, visit:
http://reviews.m5sim.org/r/253/
---

Review request for Default.


Summary
---

python: get rid of internal.enums package.

Move generated enums into internal.params, which gets
imported into object.params, restoring backward
compatibility for scripts that expect to find them there.


Diffs
-

  src/python/SConscript ad9041185274 
  src/python/m5/internal/enums.py ad9041185274 
  src/python/m5/internal/params.py ad9041185274 

Diff: http://reviews.m5sim.org/r/253/diff


Testing
---


Thanks,

Steve

___
m5-dev mailing list
m5-dev@m5sim.org
http://m5sim.org/mailman/listinfo/m5-dev


Re: [m5-dev] Review Request: python: get rid of internal.enums package.

2010-09-22 Thread Nathan Binkert

---
This is an automatically generated e-mail. To reply, visit:
http://reviews.m5sim.org/r/253/#review357
---

Ship it!


looks like what I was expecting.  I wonder if we should change some of the 
internal.params imports to objects.params, but it doesn't matter too much.

- Nathan


On 2010-09-22 08:45:32, Steve Reinhardt wrote:
 
 ---
 This is an automatically generated e-mail. To reply, visit:
 http://reviews.m5sim.org/r/253/
 ---
 
 (Updated 2010-09-22 08:45:32)
 
 
 Review request for Default.
 
 
 Summary
 ---
 
 python: get rid of internal.enums package.
 
 Move generated enums into internal.params, which gets
 imported into object.params, restoring backward
 compatibility for scripts that expect to find them there.
 
 
 Diffs
 -
 
   src/python/SConscript ad9041185274 
   src/python/m5/internal/enums.py ad9041185274 
   src/python/m5/internal/params.py ad9041185274 
 
 Diff: http://reviews.m5sim.org/r/253/diff
 
 
 Testing
 ---
 
 
 Thanks,
 
 Steve
 


___
m5-dev mailing list
m5-dev@m5sim.org
http://m5sim.org/mailman/listinfo/m5-dev