Changeset 1906

Timestamp:

06/17/20 19:24:17 (5 years ago)

Author:

yushan

Message:

trunk : cleanup

Location:

XIOS/trunk/xios_test_suite/TEST_SUITE

Files:

• check.py (deleted)
• config.py (deleted)
• default_param.json (modified) (1 diff)
• iodef.xml.template (deleted)
• my_run.sh (modified) (2 diffs)
• param_list.py (deleted)
• run_sub_test.sh (deleted)
• run_test (modified) (1 diff)
• setup.py (deleted)
• step1.py (modified) (6 diffs)
• user_config.py (deleted)

XIOS/trunk/xios_test_suite/TEST_SUITE/default_param.json

@@ -2 +2 @@
         {
             "ATMdomain": "lmdz",
-        "UsingServer2": "true",
-        "RatioServer2": 50,
-        "NumberPoolsServer2": 1,
-        "Duration": "1d",
-        "NumberClients": 4,
+            "UsingServer2": "true",
+            "RatioServer2": 50,
+            "NumberPoolsServer2": 1,
+            "Duration": "1d",
+            "NumberClients": 4,
             "NumberServers": 4
         }

XIOS/trunk/xios_test_suite/TEST_SUITE/my_run.sh

@@ -15 +15 @@
 echo "#mode" $mode >> ${fn}
 
-python3 step1.py
+python step1.py
 
 
@@ -50 +50 @@
 
 
-python3 step2.py
+python step2.py

XIOS/trunk/xios_test_suite/TEST_SUITE/run_test

@@ -20 +20 @@
   CHMOD ${rundir}/test_${xios_machine_name}/test_${svnR}_${xios_machine_name}_${arch}_${mode}.txt
 
-  mkdir -p ${rundir}/def_files ;  CHMOD ${rundir}/RUN/def_files
+  mkdir -p ${rundir}/def_files ;  CHMOD ${rundir}/def_files
   mkdir -p ${rundir}/def_files/${svnR} ;  CHMOD ${rundir}/def_files/${svnR}
 

XIOS/trunk/xios_test_suite/TEST_SUITE/step1.py

@@ -14 +14 @@
 machine=os.getenv("xios_machine_name")
 
-nb_proc_irene=20 # this must be >= NumberClients+NumberServers for all configs for all test folders
-nb_proc_jz=36 # this must be >= sum(NumberClients+NumberServers) for each test folder
+nb_proc_irene=40 # this must be >= NumberClients+NumberServers for all configs for all test folders
+nb_proc_jz=40 # to run completly in parallel, this must be set to 40 for the moment
+              # otherwise, jobs should be regrouped by test folder. jobs in folder are parallel, folders are sequential 
+              # in this case,nb_proc_jz >= sum(NumberClients+NumberServers) for each test folder
 
 def OSinfo(runthis):
@@ -45 +47 @@
             fh.write("# Generated by step1.py\n")
             fh.write("# Called by my_run.sh -> run_test -> run_test_irene\n")
+            fh.write("# For Irene\n")
             fh.write("#====================================================\n")
             fh.write("#MSUB -r XIOS\n")
@@ -68 +71 @@
             fh.write("# Generated by step1.py\n")
             fh.write("# Called by my_run.sh -> run_test -> run_test_jeanzay\n")
+            fh.write("# For Jean-Zay\n")
             fh.write("#====================================================\n")
             fh.write("#SBATCH --ntasks="+str(n)+"\n")
@@ -78 +82 @@
             fh.write("cd ${SLURM_SUBMIT_DIR}\n")
             fh.write("source ../../../BUILD/build_"+arch+"_"+mode+"/arch.env\n")
-            fh.write("source $I_MPI_ROOT/intel64/bin/mpivars.sh release_mt")
+            fh.write("source $I_MPI_ROOT/intel64/bin/mpivars.sh release_mt\n")
             fh.write("srun generic_testcase.exe")
 
@@ -144 +148 @@
 
     test_folder_list = glob.glob('test_*')
-    all_config=dict()
+    #all_config=dict()
 
     default_param = get_default_param()
@@ -213 +217 @@
                 fh.write("/\n")
 
-            generate_job(test_folder+"/CONFIG_"+mystr+"/job.sh", full_config['NumberClients']+full_config['NumberServers'])
+            generate_job(test_folder+"/CONFIG_"+mystr+"/job_"+arch+"_"+mode+".sh", full_config['NumberClients']+full_config['NumberServers'])
             update_full_job(test_folder+"/CONFIG_"+mystr, full_config['NumberClients']+full_config['NumberServers'])
 
-        #print(config_name)
-        if machine=="jeanzay":
-            with open("full_job_"+arch+"_"+mode+".sh", "a") as fh:
-                fh.write("wait\nwait\n")
-                fh.write("echo \"tests in "+test_folder+" finished\"\n")
-        all_config[test_folder] = config_name
+        #if machine=="jeanzay":
+        #    with open("full_job_"+arch+"_"+mode+".sh", "a") as fh:
+        #        fh.write("wait\nwait\n")
+        #        fh.write("echo \"tests in "+test_folder+" finished\"\n")
+        #all_config[test_folder] = config_name
  
 
     if machine=="irene":
         with open("full_job_"+arch+"_"+mode+".sh", "a") as fh:
-            fh.write("\nfor pid in ${PIDS[@]}; do\n")
-            fh.write("wait ${pid}\n")
-            fh.write("STATUS+=($?)\ndone\n")
-            fh.write("\ni=0\n")
-            fh.write("#for st in ${STATUS[@]}; do\n")
-            fh.write("#if [[ ${st} -ne 0 ]]; then\n")
-            fh.write("#echo \"${CONFIGS[${i}]} -1\" >> ${location}/plain_report.txt\n")
-            fh.write("#else\n")
-            fh.write("#echo \"${CONFIGS[${i}]} 1\" >> ${location}/plain_report.txt\n")
-            fh.write("#fi\n")
-            fh.write("#((i+=1))\n")
-            fh.write("#done\n\n")
-            fh.write("#wait\n")
-            fh.write("date >> ${log_location}/Log.txt\n")
-    if machine=="jeanzay":
-        with open("full_job_"+arch+"_"+mode+".sh", "a") as fh:
-            fh.write("date >> ${log_location}/Log.txt\n")
-
-    
-    #print(all_config)
+            #fh.write("\nfor pid in ${PIDS[@]}; do\n")
+            #fh.write("wait ${pid}\n")
+            #fh.write("STATUS+=($?)\ndone\n")
+            #fh.write("\ni=0\n")
+            #fh.write("#for st in ${STATUS[@]}; do\n")
+            #fh.write("#if [[ ${st} -ne 0 ]]; then\n")
+            #fh.write("#echo \"${CONFIGS[${i}]} -1\" >> ${location}/plain_report.txt\n")
+            #fh.write("#else\n")
+            #fh.write("#echo \"${CONFIGS[${i}]} 1\" >> ${location}/plain_report.txt\n")
+            #fh.write("#fi\n")
+            #fh.write("#((i+=1))\n")
+            #fh.write("#done\n\n")
+            fh.write("wait\nwait\n")
+            fh.write("date >> ${log_location}/Log.txt\n")
+    if machine=="jeanzay":
+        with open("full_job_"+arch+"_"+mode+".sh", "a") as fh:
+            fh.write("wait\nwait\n")
+            fh.write("date >> ${log_location}/Log.txt\n")
+
 
 if __name__== "__main__":