Changeset 556 for branches/libIGCM_MPI_OpenMP/libIGCM_config/libIGCM_config.ksh

Timestamp:

02/21/12 19:25:29 (12 years ago)

Author:

mafoipsl

Message:

First test on mono-executable (sequential, MPI or hybrid MPI/OpenMP) on vargas and first try to use default value adapted to IPSLCM5A in multi-executable mode (OASIS/1 , ATM/26 and OCE/5)

File:

• branches/libIGCM_MPI_OpenMP/libIGCM_config/libIGCM_config.ksh (modified) (5 diffs)

branches/libIGCM_MPI_OpenMP/libIGCM_config/libIGCM_config.ksh

@@ -538 +538 @@
     fi
 
-    typeset ExeNameIn
+    typeset ExeNameIn ExeNameFirst CompNameFirst
     typeset comp i
-    typeset tempvar tempvarMPI tempvarNOD NbElts j
+    typeset tempvar tempvarMPI tempvarNOD NbElts j NbExec
 
     (( PROCESSUS_NUMBER = 0 ))
     (( i=0 ))
+    (( NbExec=0 ))
 
     OK_PARA_MPI=false
     OK_PARA_OMP=false
     OK_PARA_NOD=false
+    OK_PARA_MPMD=false
+
     for comp in ${config_ListOfComponents[*]} ; do
 
@@ -568 +571 @@
         # Only if we really have an executable for the component :
         if [ X${ExeNameIn} != X\"\" ] ; then
+
+            # Keep the first executable found and the first CompName
+            ExeNameFirst=${ExeNameIn}
+            CompNameFirst=${comp}
+
+            # Are we a second executable?
+            (( NbExec = NbExec + 1 ))
+
+            # set 1 MPI task, 1 OpenMP thread and 1 node as default
+            eval ${comp}_PROC_MPI=1
+            eval ${comp}_PROC_OMP=1
+            eval ${comp}_PROC_NOD=1
+
             eval NbElts=\${#config_Executable_${comp}[@]}
+
             if [ ${NbElts} -ge 2 ] ; then
                 (( j = 2 ))
-                eval ${comp}_PROC_MPI=1
-                eval ${comp}_PROC_OMP=1
-                eval ${comp}_PROC_NOD=1
 
                 while [ $j -lt ${NbElts} ] ; do 
@@ -591 +605 @@
 
                     case ${tempvar} in
-                        *MPI)
+                        *[mM][pP][iI]*)
                             # Read MPI parameter for composante
                             eval ${comp}_PROC_MPI=$( echo ${tempvar} | sed -e "s/MPI//" )
                             OK_PARA_MPI=true;;
-                        *OMP)
+                        *[oO][mM][pP]*)
                             # Read OMP parameter for composante
                             eval ${comp}_PROC_OMP=$( echo ${tempvar} | sed -e "s/OMP//" )
                             OK_PARA_OMP=true;;
-                        *NOD)
+                        *[nN][oO][dD]*)
                             # Read NOD (NumBer of Nodes) parameter for composante
                             eval ${comp}_PROC_NOD=$( echo ${tempvar} | sed -e "s/NOD//" )
@@ -609 +623 @@
                 done
 
-                eval tempvarMPI=\${${comp}_PROC_MPI}
-                eval tempvarNOD=\${${comp}_PROC_NOD}
-                eval tempvarOMP=\${${comp}_PROC_OMP}
-                (( PROCESSUS_NUMBER = PROCESSUS_NUMBER + tempvarMPI * tempvarNOD * tempvarOMP ))
             fi
+
+            eval tempvarMPI=\${${comp}_PROC_MPI}
+            eval tempvarNOD=\${${comp}_PROC_NOD}
+            eval tempvarOMP=\${${comp}_PROC_OMP}
+
+            (( PROCESSUS_NUMBER = PROCESSUS_NUMBER + tempvarMPI * tempvarNOD * tempvarOMP ))
+
         fi
 
@@ -619 +636 @@
     done
 
-    # sequential case !
-    if [ ${PROCESSUS_NUMBER} -eq 0 ] ; then
-        (( PROCESSUS_NUMBER = 1 ))
-        echo "PROCESSUS_NUMBER is all 0 (sequential use of old definition in config->Executable->list)."
-        echo "We set it to 1."
-    fi
-
-    IGCM_debug_Print 1 "MPI/OMP treatment PROCESSUS_NUMBER = ${PROCESSUS_NUMBER}"
-
-    # Verification with PBS parameter
+    # set MPMD mode if more than 2 executable names.
+    [ ${NbExec} -ge 2 ] && OK_PARA_MPMD=true
+
+    # Verification of BATCH_NUM_PROC_TOT total number of processors set in job header.
     if [ X${BATCH_NUM_PROC_TOT} != X ] ; then
-        if [ ${BATCH_NUM_PROC_TOT} -ne ${PROCESSUS_NUMBER} ] ; then
-            echo "Warning with parallelization parameters !"
-            echo "PBS variable BATCH_NUM_PROC_TOT = ${BATCH_NUM_PROC_TOT} "
-            echo " is the total number of _processors_ reserved."
-            echo "It is not equal to the sum of _processus_ in config.card = ${PROCESSUS_NUMBER}."
-        fi
+        # BATCH_NUM_PROC_TOT is set
         if ( ! ${OK_PARA_MPI} ) ; then
+            # with previous method.
             if [ ${BATCH_NUM_PROC_TOT} -gt 1 ] ; then
-                echo "You have given a reservation of ${BATCH_NUM_PROC_TOT} processors,"
-                echo "but you havn't filled the parallel parameter in config->Executable->list."
-                echo "This is the old method and it is no more supported."
-                echo "Please read documentation or config specific comments."
-                echo "We stop now."
-                exit 1
+                # with more than 1 proc
+                if ( ${OK_PARA_MPMD} ) ; then
+                     # with MPMD ie CPL/oasis method
+                     echo "We will use default number of MPI tasks : 5 for OCE, 1 for CPL and 26 for ATM for coupled configuration"
+                     OK_PARA_MPI=true
+                     CPL_PROC_MPI=1
+                     OCE_PROC_MPI=5
+                     ATM_PROC_MPI=26
+                     PROCESSUS_NUMBER=32
+                else
+                     # with have only one executable
+                     echo "We will use ${BATCH_NUM_PROC_TOT} MPI tasks for ${CompNameFirst} : ${config_Executable_Name} "
+                     OK_PARA_MPI=true
+                     eval ${CompNameFirst}_PROC_MPI=${BATCH_NUM_PROC_TOT}
+                     PROCESSUS_NUMBER=${BATCH_NUM_PROC_TOT}
+                fi
             else 
                 PROCESSUS_NUMBER=1
             fi
         fi
-    else
+        # Verification with PBS parameter
+        if [ ${BATCH_NUM_PROC_TOT} -ne ${PROCESSUS_NUMBER} ] ; then
+            echo "Warning with parallelization parameters !"
+            echo "Job header variable BATCH_NUM_PROC_TOT = ${BATCH_NUM_PROC_TOT} "
+            echo "is the total number of _processors_ reserved."
+            echo "It is not equal to the sum of _processus_  = ${PROCESSUS_NUMBER}."
+            echo "We stop now."
+            exit 1
+        fi
+
+    else # BATCH_NUM_PROC_TOT=""
         if ( ${OK_PARA_MPI} ) ; then
             echo "You have not given a value of ${BATCH_NUM_PROC_TOT} processors,"
             echo "but you have filled the parallel parameter in config->Executable->list."
-            echo "This is the old method and it is no more supported."
-            echo "Please read documentation or config specific comments."
+            echo "Please add BATCH_NUM_PROC_TOT variable in job header."
             echo "We stop now."
             exit 1
-        fi
-    fi
+        else
+        # sequential case !
+            if [ ${PROCESSUS_NUMBER} -eq 0 ] ; then
+               (( PROCESSUS_NUMBER = 1 ))
+               echo "PROCESSUS_NUMBER is all 0 (sequential use of old definition in config->Executable->list)."
+               echo "We set it to 1."
+            fi
+        fi
+    fi
+
+    IGCM_debug_Print 1 "MPI/OMP treatment PROCESSUS_NUMBER = ${PROCESSUS_NUMBER}"
 
 #     if ( ${OK_PARA_MPI} || ${OK_PARA_OMP} || ${OK_PARA_NOD} ) ; then