Changeset 1909 for XIOS/trunk/xios_test_suite/TEST_SUITE/step1.py

Timestamp:

06/19/20 18:57:59 (4 years ago)

Author:

yushan

Message:

trunk : add reference generator and archievs

File:

• XIOS/trunk/xios_test_suite/TEST_SUITE/step1.py (modified) (10 diffs)

XIOS/trunk/xios_test_suite/TEST_SUITE/step1.py

@@ -7 +7 @@
 import copy
 
-param_list = ["ATMdomain", "UsingServer2", "NumberClients", "NumberServers", "RatioServer2", "NumberPoolsServer2", "Duration"]
-param_short_list = ["ATMdom", "Srv2", "NbClnt", "NbSrv", "RatioSrv2", "NbPlSrv2", "Duration"]
+param_list = ["ATMdomain", "UsingServer2", "NumberClients", "NumberServers", "RatioServer2", "NumberPoolsServer2", "Duration", "InfoLevel"]
+param_short_list = ["ATMdom", "Srv2", "NbClnt", "NbSrv", "RatioSrv2", "NbPlSrv2", "Duration", "Info"]
 
 mode=os.getenv("mode")
@@ -38 +38 @@
     default_param = json.load(f)
     f.close()
-    return default_param[0]
+    l = list(default_param[0].items())
+    l.sort()
+    def_param=dict(l)
+    return def_param
 
 def generate_job(fn, n):
@@ -62 +65 @@
             fh.write("#MSUB -Q test\n")
             fh.write("#MSUB -m work,scratch\n")
-            fh.write("source ../../../BUILD/build_"+arch+"_"+mode+"/arch.env\n")
+            fh.write("cp ../../build_"+arch+"_"+mode+"/bin/generic_testcase.exe ./\n")
+            fh.write("source ../../build_"+arch+"_"+mode+"/arch.env\n")
             fh.write("ccc_mprun -n "+str(n)+" generic_testcase.exe\n")
 
@@ -81 +85 @@
             fh.write("ulimit -c 0\n")
             fh.write("cd ${SLURM_SUBMIT_DIR}\n")
-            fh.write("source ../../../BUILD/build_"+arch+"_"+mode+"/arch.env\n")
+            fh.write("cp ../../build_"+arch+"_"+mode+"/bin/generic_testcase.exe ./\n")
+            fh.write("source ../../build_"+arch+"_"+mode+"/arch.env\n")
             fh.write("source $I_MPI_ROOT/intel64/bin/mpivars.sh release_mt\n")
             fh.write("srun generic_testcase.exe")
@@ -90 +95 @@
     if machine=="irene":
         with open("full_job_"+arch+"_"+mode+".sh", "a") as fh:
-            fh.write("\ncd ${location}/"+location+"; ccc_mprun -E \'--exclusive\' -n "+str(n)+" generic_testcase.exe > output.out 2> error.out &\n")
+            fh.write("\ncd ${location}/"+location+"; ccc_mprun -E \'--exclusive\' -n "+str(n)+" generic_testcase.exe > output_"+arch+"_"+mode+".out 2> error_"+arch+"_"+mode+".out &\n")
             fh.write("PIDS+=($!)\n")
             fh.write("CONFIGS+=("+location+")\n")
     if machine=="jeanzay":
         with open("full_job_"+arch+"_"+mode+".sh", "a") as fh:
-            fh.write("\ncd ${location}/"+location+"; srun --exclusive -n "+str(n)+" generic_testcase.exe > output.out 2> error.out &\n")
+            fh.write("\ncd ${location}/"+location+"; srun --exclusive -n "+str(n)+" generic_testcase.exe > output_"+arch+"_"+mode+".out 2> error_"+arch+"_"+mode+".out &\n")
 
 def main():
@@ -108 +113 @@
             fh.write("#MSUB -r XIOS\n")
             fh.write("#MSUB -eo\n")
-            fh.write("#MSUB -o client_output.out\n")
-            fh.write("#MSUB -e client_error.err\n")
+            fh.write("#MSUB -o output_"+arch+"_"+mode+".out\n")
+            fh.write("#MSUB -e error_"+arch+"_"+mode+".err\n")
             fh.write("#MSUB -c 1\n")
             fh.write("#MSUB -n "+str(nb_proc_irene)+"\n")
@@ -121 +126 @@
             fh.write("export location="+os.getcwd()+"\n")
             fh.write("export log_location="+os.getcwd()+"\n")
-            fh.write("source ../BUILD/build_"+arch+"_"+mode+"/arch.env\n")
+            fh.write("source build_"+arch+"_"+mode+"/arch.env\n")
             fh.write("echo \"parallel launch arch="+arch+" mode="+mode+"\" >> ${log_location}/Log.txt\n")
             fh.write("date >> ${log_location}/Log.txt\n")
@@ -133 +138 @@
             fh.write("#====================================================\n")
             fh.write("#SBATCH --ntasks="+str(nb_proc_jz)+"\n")
+            fh.write("#SBATCH -o output_"+arch+"_"+mode+".out\n")
+            fh.write("#SBATCH -e error_"+arch+"_"+mode+".out\n")
             fh.write("#SBATCH --hint=nomultithread\n")
             fh.write("#SBATCH -t 00:10:00\n")
@@ -138 +145 @@
             fh.write("ulimit -c 0\n")
             fh.write("cd ${SLURM_SUBMIT_DIR}\n")
-            fh.write("source ../BUILD/build_"+arch+"_"+mode+"/arch.env\n")
+            fh.write("source build_"+arch+"_"+mode+"/arch.env\n")
             fh.write("source $I_MPI_ROOT/intel64/bin/mpivars.sh release_mt\n")
             fh.write("export location="+os.getcwd()+"\n")
@@ -179 +186 @@
             mystr = mystr.replace(":", "")
             mystr = mystr.replace("u'", "")
+            mystr = mystr.replace("b'", "")
             mystr = mystr.replace("'", "")
             mystr = mystr.replace(" ", "_")