Changeset 1906


Ignore:
Timestamp:
06/17/20 19:24:17 (18 months ago)
Author:
yushan
Message:

trunk : cleanup

Location:
XIOS/trunk/xios_test_suite/TEST_SUITE
Files:
7 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • XIOS/trunk/xios_test_suite/TEST_SUITE/default_param.json

    r1888 r1906  
    22        { 
    33            "ATMdomain": "lmdz", 
    4         "UsingServer2": "true", 
    5         "RatioServer2": 50, 
    6         "NumberPoolsServer2": 1, 
    7         "Duration": "1d", 
    8         "NumberClients": 4, 
     4            "UsingServer2": "true", 
     5            "RatioServer2": 50, 
     6            "NumberPoolsServer2": 1, 
     7            "Duration": "1d", 
     8            "NumberClients": 4, 
    99            "NumberServers": 4 
    1010        } 
  • XIOS/trunk/xios_test_suite/TEST_SUITE/my_run.sh

    r1899 r1906  
    1515echo "#mode" $mode >> ${fn} 
    1616 
    17 python3 step1.py 
     17python step1.py 
    1818 
    1919 
     
    5050 
    5151 
    52 python3 step2.py 
     52python step2.py 
  • XIOS/trunk/xios_test_suite/TEST_SUITE/run_test

    r1901 r1906  
    2020  CHMOD ${rundir}/test_${xios_machine_name}/test_${svnR}_${xios_machine_name}_${arch}_${mode}.txt 
    2121 
    22   mkdir -p ${rundir}/def_files ;  CHMOD ${rundir}/RUN/def_files 
     22  mkdir -p ${rundir}/def_files ;  CHMOD ${rundir}/def_files 
    2323  mkdir -p ${rundir}/def_files/${svnR} ;  CHMOD ${rundir}/def_files/${svnR} 
    2424 
  • XIOS/trunk/xios_test_suite/TEST_SUITE/step1.py

    r1899 r1906  
    1414machine=os.getenv("xios_machine_name") 
    1515 
    16 nb_proc_irene=20 # this must be >= NumberClients+NumberServers for all configs for all test folders 
    17 nb_proc_jz=36 # this must be >= sum(NumberClients+NumberServers) for each test folder 
     16nb_proc_irene=40 # this must be >= NumberClients+NumberServers for all configs for all test folders 
     17nb_proc_jz=40 # to run completly in parallel, this must be set to 40 for the moment 
     18              # otherwise, jobs should be regrouped by test folder. jobs in folder are parallel, folders are sequential  
     19              # in this case,nb_proc_jz >= sum(NumberClients+NumberServers) for each test folder 
    1820 
    1921def OSinfo(runthis): 
     
    4547            fh.write("# Generated by step1.py\n") 
    4648            fh.write("# Called by my_run.sh -> run_test -> run_test_irene\n") 
     49            fh.write("# For Irene\n") 
    4750            fh.write("#====================================================\n") 
    4851            fh.write("#MSUB -r XIOS\n") 
     
    6871            fh.write("# Generated by step1.py\n") 
    6972            fh.write("# Called by my_run.sh -> run_test -> run_test_jeanzay\n") 
     73            fh.write("# For Jean-Zay\n") 
    7074            fh.write("#====================================================\n") 
    7175            fh.write("#SBATCH --ntasks="+str(n)+"\n") 
     
    7882            fh.write("cd ${SLURM_SUBMIT_DIR}\n") 
    7983            fh.write("source ../../../BUILD/build_"+arch+"_"+mode+"/arch.env\n") 
    80             fh.write("source $I_MPI_ROOT/intel64/bin/mpivars.sh release_mt") 
     84            fh.write("source $I_MPI_ROOT/intel64/bin/mpivars.sh release_mt\n") 
    8185            fh.write("srun generic_testcase.exe") 
    8286 
     
    144148 
    145149    test_folder_list = glob.glob('test_*') 
    146     all_config=dict() 
     150    #all_config=dict() 
    147151 
    148152    default_param = get_default_param() 
     
    213217                fh.write("/\n") 
    214218 
    215             generate_job(test_folder+"/CONFIG_"+mystr+"/job.sh", full_config['NumberClients']+full_config['NumberServers']) 
     219            generate_job(test_folder+"/CONFIG_"+mystr+"/job_"+arch+"_"+mode+".sh", full_config['NumberClients']+full_config['NumberServers']) 
    216220            update_full_job(test_folder+"/CONFIG_"+mystr, full_config['NumberClients']+full_config['NumberServers']) 
    217221 
    218         #print(config_name) 
    219         if machine=="jeanzay": 
    220             with open("full_job_"+arch+"_"+mode+".sh", "a") as fh: 
    221                 fh.write("wait\nwait\n") 
    222                 fh.write("echo \"tests in "+test_folder+" finished\"\n") 
    223         all_config[test_folder] = config_name 
     222        #if machine=="jeanzay": 
     223        #    with open("full_job_"+arch+"_"+mode+".sh", "a") as fh: 
     224        #        fh.write("wait\nwait\n") 
     225        #        fh.write("echo \"tests in "+test_folder+" finished\"\n") 
     226        #all_config[test_folder] = config_name 
    224227  
    225228 
    226229    if machine=="irene": 
    227230        with open("full_job_"+arch+"_"+mode+".sh", "a") as fh: 
    228             fh.write("\nfor pid in ${PIDS[@]}; do\n") 
    229             fh.write("wait ${pid}\n") 
    230             fh.write("STATUS+=($?)\ndone\n") 
    231             fh.write("\ni=0\n") 
    232             fh.write("#for st in ${STATUS[@]}; do\n") 
    233             fh.write("#if [[ ${st} -ne 0 ]]; then\n") 
    234             fh.write("#echo \"${CONFIGS[${i}]} -1\" >> ${location}/plain_report.txt\n") 
    235             fh.write("#else\n") 
    236             fh.write("#echo \"${CONFIGS[${i}]} 1\" >> ${location}/plain_report.txt\n") 
    237             fh.write("#fi\n") 
    238             fh.write("#((i+=1))\n") 
    239             fh.write("#done\n\n") 
    240             fh.write("#wait\n") 
    241             fh.write("date >> ${log_location}/Log.txt\n") 
    242     if machine=="jeanzay": 
    243         with open("full_job_"+arch+"_"+mode+".sh", "a") as fh: 
    244             fh.write("date >> ${log_location}/Log.txt\n") 
    245  
    246      
    247     #print(all_config) 
     231            #fh.write("\nfor pid in ${PIDS[@]}; do\n") 
     232            #fh.write("wait ${pid}\n") 
     233            #fh.write("STATUS+=($?)\ndone\n") 
     234            #fh.write("\ni=0\n") 
     235            #fh.write("#for st in ${STATUS[@]}; do\n") 
     236            #fh.write("#if [[ ${st} -ne 0 ]]; then\n") 
     237            #fh.write("#echo \"${CONFIGS[${i}]} -1\" >> ${location}/plain_report.txt\n") 
     238            #fh.write("#else\n") 
     239            #fh.write("#echo \"${CONFIGS[${i}]} 1\" >> ${location}/plain_report.txt\n") 
     240            #fh.write("#fi\n") 
     241            #fh.write("#((i+=1))\n") 
     242            #fh.write("#done\n\n") 
     243            fh.write("wait\nwait\n") 
     244            fh.write("date >> ${log_location}/Log.txt\n") 
     245    if machine=="jeanzay": 
     246        with open("full_job_"+arch+"_"+mode+".sh", "a") as fh: 
     247            fh.write("wait\nwait\n") 
     248            fh.write("date >> ${log_location}/Log.txt\n") 
     249 
    248250 
    249251if __name__== "__main__": 
Note: See TracChangeset for help on using the changeset viewer.