Changeset 686 for trunk

Timestamp:

06/18/12 09:11:55 (12 years ago)

Author:

mafoipsl

Message:

On Titane : modification of IGCM_sys_build_execution_scripts to work with one MPI/OpenMP executable.

File:

• trunk/libIGCM/libIGCM_sys/libIGCM_sys_titane.ksh (modified) (4 diffs)

trunk/libIGCM/libIGCM_sys/libIGCM_sys_titane.ksh

@@ -1702 +1702 @@
   fi
 
-  typeset max_omp
-
   ulimit -s unlimited
 
-  (( max_omp = 0 ))
-  for comp in ${config_ListOfComponents[*]} ; do
-
-    eval ExeNameIn=\${config_Executable_${comp}[0]}
-    eval ExeNameOut=\${config_Executable_${comp}[1]}
-
-    # Only if we really have an executable for the component :
-    if ( [ "X${ExeNameOut}" != X\"\" ] &&  [ "X${comp}" != "XCPL" ] ) ; then
-      eval comp_proc_omp_loc=\${${comp}_PROC_OMP}
-      if [ ${comp_proc_omp_loc} -gt ${max_omp} ] ; then
-        (( max_omp = comp_proc_omp_loc ))
-      fi
-    fi
-  done
-  if [ ${max_omp} -gt 1 ] ; then
-    module load openmp/${max_omp}thds
-  fi
+  export KMP_STACKSIZE=3g
+  export KMP_LIBRARY=turnaround
+  export MKL_SERIAL=YES
+  unset MPI_PLACING_MODE
 
   IGCM_debug_PopStack "IGCM_sys_activ_variables"
@@ -1849 +1834 @@
           echo "export KMP_LIBRARY=turnaround"  >> script_${ExeNameOut}.ksh
           echo "export MKL_SERIAL=YES"  >> script_${ExeNameOut}.ksh
-          echo "OMP_NUM_THREADS=${comp_proc_omp_loc}" >> script_${ExeNameOut}.ksh
+          echo "export OMP_NUM_THREADS=${comp_proc_omp_loc}" >> script_${ExeNameOut}.ksh
           echo "(( MYMPIRANK = OMPI_COMM_WORLD_RANK - ${start_num})) " >>  script_${ExeNameOut}.ksh
           echo "./${ExeNameOut} > out_${ExeNameOut}.out.\${MYMPIRANK} 2>out_${ExeNameOut}.err.\${MYMPIRANK}"  >> script_${ExeNameOut}.ksh
@@ -1976 +1961 @@
           if ( [ "X${ExeNameOut}" != X\"\" ] && [ "X${ExeNameOut}" != "Xinca.dat" ] ) ; then
 
-              echo "#!/bin/ksh" > script_${ExeNameOut}.ksh
-              echo ""  >> script_${ExeNameOut}.ksh
               if ( ${OK_PARA_OMP} ) ; then
                   eval comp_proc_omp_loc=\${${comp}_PROC_OMP}
-                  echo "export KMP_STACKSIZE=3g"  >> script_${ExeNameOut}.ksh
-                  echo "export KMP_LIBRARY=turnaround"  >> script_${ExeNameOut}.ksh
-                  echo "export MKL_SERIAL=YES"  >> script_${ExeNameOut}.ksh
-                  echo "OMP_NUM_THREADS=${comp_proc_omp_loc}" >> script_${ExeNameOut}.ksh
+                  export OMP_NUM_THREADS=${comp_proc_omp_loc}
               fi
               if  ( ${OK_PARA_MPI} ) ; then
+                  eval comp_proc_mpi_loc=\${${comp}_PROC_MPI}
                   # Default : mpirun used if nb_proc gt 1
-                  # pour sortie out/err par process
+                  # pour sortie out/err par process ? more test required
                   # echo "./${ExeNameOut} > out_${ExeNameOut}.out.\${OMPI_COMM_WORLD_RANK} 2>out_${ExeNameOut}.err.\${OMPI_COMM_WORLD_RANK}"  >> script_${ExeNameOut}.ksh
-                  echo "./${ExeNameOut}" >> script_${ExeNameOut}.ksh
-                  IGCM_sys_Chmod u+x script_${ExeNameOut}.ksh
-                  EXECUTION="${HOST_MPIRUN_COMMAND} ./script_${ExeNameOut}.ksh"
+                  EXECUTION="${HOST_MPIRUN_COMMAND} -np ${comp_proc_mpi_loc} ./${ExeNameOut}"
               else
                   # Default : mpirun is NOT used if nb_proc eq 1
-                  # pour sortie out/err par process
+                  # pour sortie out/err par process ? more test required
                   # echo "./${ExeNameOut} > out_${ExeNameOut}.out 2>out_${ExeNameOut}.err" >> script_${ExeNameOut}.ksh
-                  echo "./${ExeNameOut}" >> script_${ExeNameOut}.ksh
-                  IGCM_sys_Chmod u+x script_${ExeNameOut}.ksh
-                  EXECUTION="time ./script_${ExeNameOut}.ksh"
+                  EXECUTION="time ./${ExeNameOut}"
               fi
           fi
@@ -2006 +1983 @@
 
   IGCM_debug_Print 1 "sys Titane : La commande d execution est "
-  IGCM_debug_Print 1 $EXECUTION
+  IGCM_debug_Print 1 "$EXECUTION"
 
   IGCM_debug_PopStack "IGCM_sys_build_execution_scripts"