Changeset 776

Timestamp:

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

Author:

cfuguet

Message:

reconfiguration/tsar_generic_iob: using abspath instead of relpath

• Using absolute paths in the run.py script to allow placing this script anywhere. When passing as argument relpaths, the absolute paths are computed internally

Location:

branches/reconfiguration/platforms/tsar_generic_iob

Files:

• Makefile (modified) (1 diff)
• scripts/run.py (modified) (4 diffs)

branches/reconfiguration/platforms/tsar_generic_iob/Makefile

@@ -14 +14 @@
         rm -rf *.o *.x tty* term*
 
+distclean: clean
+        find . -name "*.pyc" -exec rm -f {} \;
+
 .PHONY: simul.x $(TAGS)
 

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

@@ -22 +22 @@
 assert len(sys.argv) > 1, "Introduce platform base directory path"
 
-# goto platform base directory
-os.chdir(sys.argv[1])
+# translate the relative path (if needed) into an absolute path
+basedir = os.path.abspath(sys.argv[1])
+print "[ run.py ] platform base directory: {}".format(basedir)
 
 # repeat while configurations is not empty
 for faulty in faultylist:
     for x,y in configs:
-        confdir = os.getcwd() + "conf/config_{}c/".format(x*y)
+        confdir = "{}/conf/config_{}c".format(basedir, x*y)
+        print "[ run.py ] generating files for {}".format(confdir)
 
         # 1. generate configuration and ouput directories
         try:
-            os.makedirs(confdir + "config", 0755)
+            os.makedirs(confdir + "/config", 0755)
         except OSError:
             pass # directory already exists => do nothing
@@ -38 +40 @@
         # 2. generate hard_config.h and fault_config.h files
         arch.main( x = x, y = y, p = nprocs,
-                   hard_path = confdir + "config/hard_config.h",
-                   xml_path = confdir + "config/map.xml" )
-        faultyprocs.generate(faulty, confdir + "config/fault_config.h")
+                   hard_path = confdir + "/config/hard_config.h",
+                   xml_path = confdir + "/config/map.xml" )
+        faultyprocs.generate(faulty, confdir + "/config/fault_config.h")
 
         # 3. compile simulator executable
-        if os.path.exists("hard_config.h"): os.unlink("hard_config.h")
-        os.symlink(confdir + "config/hard_config.h", "hard_config.h")
-        subprocess.call("make")
+        dst = basedir + "/hard_config.h"
+        if os.path.lexists(dst): os.unlink(dst)
+        os.symlink(confdir + "/config/hard_config.h", dst)
+        subprocess.call(["make",
+            "-C", basedir
+            ])
 
         # 4. compile distributed boot executable
-        dst = confdir + "config/boot_config.h"
-        if not os.path.exists(dst):
-            os.symlink(os.getcwd() + "/soft/config/boot_config.h", dst)
+        dst = confdir + "/config/boot_config.h"
+        if os.path.lexists(dst): os.unlink(dst)
+        os.symlink(basedir + "/soft/config/boot_config.h", dst)
         subprocess.call(["make",
-            "-C", "soft",
+            "-C", basedir + "/soft",
             "CONFDIR=" + confdir
             ])
@@ -59 +64 @@
         os.environ["DISTRIBUTED_BOOT"] = "1"
         os.environ["SOCLIB_TTY"] = "FILES"
-        with open(confdir + "log", "w") as log_file:
-            subprocess.call(["./simul.x",
-                "-SOFT"   , "soft/build/soft.elf",
+        with open(confdir + "/log", "w") as log_file:
+            subprocess.call([basedir + "/simul.x",
+                "-SOFT"   , basedir + "/soft/build/soft.elf",
                 "-DISK"   , "/dev/null",
                 "-NCYCLES", "10000000"],
@@ -69 +74 @@
 
         # 6. move simulation terminal output into the target config dir
-        os.rename("term0", confdir + "term")
+        os.rename("term0", confdir + "/term")
 
         # end for each config