Changeset 774 for branches/reconfiguration/platforms/tsar_generic_iob

Timestamp:

Aug 27, 2014, 10:50:02 AM (10 years ago)

Author:

cfuguet

Message:

reconfiguration/tsar_generic_iob: moving all python scripts in subdirectory

• The run.py don't use anymore the genmap tool. It uses directly the a new main function in the arch.py module to generate the hard_config.h

Location:

branches/reconfiguration/platforms/tsar_generic_iob/scripts

Files:

• . (added)
• arch.py (moved) (moved from branches/reconfiguration/platforms/tsar_generic_iob/arch.py) (2 diffs)
• run.py (moved) (moved from branches/reconfiguration/platforms/tsar_generic_iob/run.py) (3 diffs)

branches/reconfiguration/platforms/tsar_generic_iob/scripts/arch.py

@@ -1 +1 @@
 #!/usr/bin/env python
-
+import sys
 from mapping import *
 
@@ -344 +344 @@
     return mapping
 
+def main(x, y, p, hard_path, xml_path):
+    mapping = arch( x_size    = x,
+                    y_size    = y,
+                    nb_procs  = p)
+
+    with open(xml_path, "w") as map_xml:
+        map_xml.write(mapping.xml())
+    with open(hard_path, "w") as hard_config:
+        hard_config.write(mapping.hard_config())
+
 ################################# platform test #######################################################
 
 if __name__ == '__main__':
-
-    mapping = arch( x_size    = 2,
-                    y_size    = 2,
-                    nb_procs  = 2 )
-
-#   print mapping.netbsd_dts()
-
-    print mapping.xml()
-
-#   print mapping.giet_vsegs()
-
+    main( x_size    = int(sys.argv[1]),
+          y_size    = int(sys.argv[2]),
+          nb_procs  = int(sys.argv[3]))
 
 # Local Variables:

branches/reconfiguration/platforms/tsar_generic_iob/scripts/run.py

@@ -3 +3 @@
 # @author cfuguet <cesar.fuguet-tortolero@lip6.fr>
 
+import sys
 import os
-import sys
 import subprocess
+import arch
 
-nprocs = 4
-
+# define constants
 configs = []
 configs.append([2 ,2 ])
@@ -15 +15 @@
 configs.append([16,16])
 
+nprocs = 4
+
+assert len(sys.argv) > 1, "Introduce platform base directory path"
+
+# goto platform base directory
+os.chdir(sys.argv[1])
+
 # repeat while configurations is not empty
 for x,y in configs:
-    confdir = os.getcwd() + "/conf/config_{}c/".format(x*y)
+    confdir = os.getcwd() + "conf/config_{}c/".format(x*y)
 
     # 1. generate configuration and ouput directories
@@ -23 +30 @@
         os.makedirs(confdir + "config", 0755)
     except OSError:
-        # directory already exists => do nothing
-        pass
+        pass # directory already exists => do nothing
 
     # 2. generate hard_config.h and fault_config.h files
-    returncode = subprocess.call(["scripts/genmap",
-        "--x=" + str(x),
-        "--y=" + str(y),
-        "--p=" + str(nprocs),
-        "--arch=" + os.getcwd(),
-        "--path=" + confdir + "config"
-        ])
-    if returncode != 0:
-        print "Error during genmap execution"
-        sys.exit(1)
+    arch.main( x = x, y = y, p = nprocs,
+               hard_path = confdir + "config/hard_config.h",
+               xml_path = confdir + "config/map.xml" )
 
     # 3. compile simulator executable