Changeset 1762


Ignore:
Timestamp:
10/21/19 11:37:04 (2 years ago)
Author:
yushan
Message:

Generic_testcase : flag --omp is used to enable EP_lib. Tested on Irene with generic_testcase and test_omp (ep+intelmpi, ep+openmpi, mpi+intelmpi, mpi+openmpi)

Location:
XIOS/dev/dev_trunk_omp
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • XIOS/dev/dev_trunk_omp/GENERIC_TESTCASE/job_irene.sh

    r1746 r1762  
    123123touch setup.sh 
    124124>setup.sh 
     125 
    125126for i in $(ls -d test_*/) 
    126127do 
     
    130131  echo "echo \"setup.py called from " ${i%%/} "\"">> setup.sh 
    131132done 
    132  
    133133export output=$(python user_config.py 2>&1 >/dev/null) 
    134134 
     
    162162cp report.txt report_mpi_intelmpi.txt 
    163163cp report.html report_mpi_intelmpi.html 
     164 
     165 
  • XIOS/dev/dev_trunk_omp/extern/src_ep_dev/ep_fortran.cpp

    r1746 r1762  
    3434      } 
    3535    } 
    36      
    3736     
    3837    return fint; 
  • XIOS/dev/dev_trunk_omp/inputs/job_irene_openmpi.sh

    r1745 r1762  
    4545 
    4646 
    47 export build_dir=build_ep_openmpi_prod 
     47export build_dir=build_mpi_openmpi_prod 
    4848ccc_mprun ../$build_dir/bin/test_omp.exe 4 
    4949 
  • XIOS/dev/dev_trunk_omp/make_xios

    r1745 r1762  
    1919arch_path_defined="FALSE" 
    2020use_ep="FALSE" 
    21 use_ep2="FALSE" 
     21#use_ep2="FALSE" 
    2222# Traitement de la ligne de commande 
    2323while (($# > 0)) 
     
    6666         "--memtrack")  use_memtrack="true" memtrack=$2  ; shift ; shift ;; 
    6767         "--omp")   use_ep="true" ; shift ;; 
    68          "--omp2")   use_ep2="true" ; shift ;; 
     68#         "--omp2")   use_ep2="true" ; shift ;; 
    6969         *)         code="$1"           ; shift ;; 
    7070      esac 
     
    166166    if [[ "$compil_mode" == "prod" ]] 
    167167        then 
    168         COMPIL_CFLAGS="%PROD_CFLAGS -D_usingEP -D_intelmpi" 
    169         COMPIL_FFLAGS="%PROD_FFLAGS -D_usingEP -D_intelmpi" 
     168        COMPIL_CFLAGS="%PROD_CFLAGS -D_usingEP " 
     169        COMPIL_FFLAGS="%PROD_FFLAGS -D_usingEP " 
    170170    elif [[ "$compil_mode" == "dev" ]] 
    171171        then  
    172         COMPIL_CFLAGS="%DEV_CFLAGS -D_usingEP -D_intelmpi" 
    173         COMPIL_FFLAGS="%DEV_FFLAGS -D_usingEP -D_intelmpi" 
     172        COMPIL_CFLAGS="%DEV_CFLAGS -D_usingEP " 
     173        COMPIL_FFLAGS="%DEV_FFLAGS -D_usingEP " 
    174174    elif [[ "$compil_mode" == "debug" ]] 
    175175        then 
    176         COMPIL_CFLAGS="%DEBUG_CFLAGS -D_usingEP -D_intelmpi" 
    177         COMPIL_FFLAGS="%DEBUG_FFLAGS -D_usingEP -D_intelmpi" 
     176        COMPIL_CFLAGS="%DEBUG_CFLAGS -D_usingEP " 
     177        COMPIL_FFLAGS="%DEBUG_FFLAGS -D_usingEP " 
    178178    fi 
    179179 
     
    198198 
    199199 
    200 if [[ "$use_ep2" == "true" ]]; then 
    201  
    202     if [[ "$compil_mode" == "prod" ]] 
    203         then 
    204         COMPIL_CFLAGS="%PROD_CFLAGS -D_usingEP -D_openmpi" 
    205         COMPIL_FFLAGS="%PROD_FFLAGS -D_usingEP -D_openmpi" 
    206     elif [[ "$compil_mode" == "dev" ]] 
    207         then  
    208         COMPIL_CFLAGS="%DEV_CFLAGS -D_usingEP -D_openmpi" 
    209         COMPIL_FFLAGS="%DEV_FFLAGS -D_usingEP -D_openmpi" 
    210     elif [[ "$compil_mode" == "debug" ]] 
    211         then 
    212         COMPIL_CFLAGS="%DEBUG_CFLAGS -D_usingEP -D_openmpi" 
    213         COMPIL_FFLAGS="%DEBUG_FFLAGS -D_usingEP -D_openmpi" 
    214     fi 
    215  
    216 else 
    217  
    218     if [[ "$compil_mode" == "prod" ]] 
    219         then 
    220         COMPIL_CFLAGS="%PROD_CFLAGS" 
    221         COMPIL_FFLAGS="%PROD_FFLAGS" 
    222     elif [[ "$compil_mode" == "dev" ]] 
    223         then  
    224         COMPIL_CFLAGS="%DEV_CFLAGS" 
    225         COMPIL_FFLAGS="%DEV_FFLAGS" 
    226     elif [[ "$compil_mode" == "debug" ]] 
    227         then 
    228         COMPIL_CFLAGS="%DEBUG_CFLAGS" 
    229         COMPIL_FFLAGS="%DEBUG_FFLAGS" 
    230     fi 
    231  
    232 fi 
     200#if [[ "$use_ep2" == "true" ]]; then 
     201 
     202#    if [[ "$compil_mode" == "prod" ]] 
     203#        then 
     204#        COMPIL_CFLAGS="%PROD_CFLAGS -D_usingEP -D_openmpi" 
     205#        COMPIL_FFLAGS="%PROD_FFLAGS -D_usingEP -D_openmpi" 
     206#    elif [[ "$compil_mode" == "dev" ]] 
     207#        then  
     208#        COMPIL_CFLAGS="%DEV_CFLAGS -D_usingEP -D_openmpi" 
     209#        COMPIL_FFLAGS="%DEV_FFLAGS -D_usingEP -D_openmpi" 
     210#    elif [[ "$compil_mode" == "debug" ]] 
     211#        then 
     212#        COMPIL_CFLAGS="%DEBUG_CFLAGS -D_usingEP -D_openmpi" 
     213#        COMPIL_FFLAGS="%DEBUG_FFLAGS -D_usingEP -D_openmpi" 
     214#    fi 
     215# 
     216#else 
     217 
     218#    if [[ "$compil_mode" == "prod" ]] 
     219#        then 
     220#        COMPIL_CFLAGS="%PROD_CFLAGS" 
     221#        COMPIL_FFLAGS="%PROD_FFLAGS" 
     222#    elif [[ "$compil_mode" == "dev" ]] 
     223#        then  
     224#        COMPIL_CFLAGS="%DEV_CFLAGS" 
     225#        COMPIL_FFLAGS="%DEV_FFLAGS" 
     226#    elif [[ "$compil_mode" == "debug" ]] 
     227#        then 
     228#        COMPIL_CFLAGS="%DEBUG_CFLAGS" 
     229#        COMPIL_FFLAGS="%DEBUG_FFLAGS" 
     230#    fi 
     231 
     232#fi 
    233233 
    234234 
Note: See TracChangeset for help on using the changeset viewer.