Changeset 778 for branches

Timestamp:

Aug 27, 2014, 6:13:01 PM (10 years ago)

Author:

cfuguet

Message:

reconfiguration/tsar_generic_iob: fixing python version incompatibility issues

Location:

branches/reconfiguration/platforms/tsar_generic_iob

Files:

• scripts/faultyprocs.py (modified) (1 diff)
• scripts/run.py (modified) (2 diffs)
• top.cpp (modified) (1 diff)

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

@@ -14 +14 @@
 
     for x, y, l in faulty:
-        content.append("    ({} << 6) | ({} << 2) | {},\n".format(x, y, l))
+        content.append("    ({0} << 6) | ({1} << 2) | {2},\n".format(x, y, l))
 
     content.append( "};\n"

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

@@ -24 +24 @@
 # 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)
+print "[ run.py ] platform base directory: {0}".format(basedir)
 
 # repeat while configurations is not empty
 for faulty in faultylist:
     for x,y in configs:
-        confdir = "{}/conf/config_{}c".format(basedir, x*y)
-        print "[ run.py ] generating files for {}".format(confdir)
+        confdir = "{0}/conf/config_{1}c".format(basedir, x*y)
+        print "[ run.py ] generating files for {0}".format(confdir)
 
         # 1. generate configuration and ouput directories
@@ -64 +64 @@
         os.environ["DISTRIBUTED_BOOT"] = "1"
         os.environ["SOCLIB_TTY"] = "FILES"
-        with open(confdir + "/log", "w") as log_file:
+
+        if x*y <= 4: ompthreads = x*y
+        else:        ompthreads = 4
+        with open(confdir + "/log", "w") as logfile:
+            print "executing simul.x"
             subprocess.call([basedir + "/simul.x",
                 "-SOFT"   , basedir + "/soft/build/soft.elf",
                 "-DISK"   , "/dev/null",
-                "-NCYCLES", "10000000"],
-                stdout=log_file,
-                stderr=log_file,
+                "-THREADS", str(ompthreads),
+                "-NCYCLES", "1000000"],
+                stdout=logfile,
+                stderr=logfile,
                 )
 

branches/reconfiguration/platforms/tsar_generic_iob/top.cpp

@@ -150 +150 @@
 //               Parallelisation
 ///////////////////////////////////////////////////
-#define USE_OPENMP               0
-
 #if USE_OPENMP
 #include <omp.h>