Changeset 685

Timestamp:

06/15/12 10:02:34 (12 years ago)

Author:

mafoipsl

Message:

On curie add variable to set OpenMP thread maximum memory and other variables required. Adapt execution command to send a script instead of an executable.

File:

• trunk/libIGCM/libIGCM_sys/libIGCM_sys_curie.ksh (modified) (2 diffs)

trunk/libIGCM/libIGCM_sys/libIGCM_sys_curie.ksh

@@ -181 +181 @@
 #====================================================
 #- HOST_MPIRUN_COMMAND
-typeset -r HOST_MPIRUN_COMMAND=${HOST_MPIRUN_COMMAND:="time ccc_mprun"}
+typeset -r HOST_MPIRUN_COMMAND=${HOST_MPIRUN_COMMAND:="/usr/bin/time ccc_mprun"}
 
 #====================================================
@@ -1764 +1764 @@
     for comp in ${config_ListOfComponents[*]} ; do
 
-      eval ExeNameIn=\${config_Executable_${comp}[0]}
+      # Only if we really have an executable for the component :
       eval ExeNameOut=\${config_Executable_${comp}[1]}
-
       if ( [ "X${ExeNameOut}" != X\"\" ] && [ "X${ExeNameOut}" != "Xinca.dat" ] ) ; then
-        if ( ${OK_PARA_MPI} ) ; then
-          eval comp_proc_mpi_loc=\${${comp}_PROC_MPI}
-          EXECUTION="${EXECUTION} -n ${comp_proc_mpi_loc} ./${ExeNameOut}"
-        else
-          EXECUTION="${EXECUTION} ./${ExeNameOut}"
-        fi
+
+        echo "#!/bin/ksh" > script_${ExeNameOut}.ksh
+        echo ""  >> script_${ExeNameOut}.ksh
+        IGCM_sys_Chmod u+x script_${ExeNameOut}.ksh
+
         if ( ${OK_PARA_OMP} ) ; then
           eval comp_proc_omp_loc=\${${comp}_PROC_OMP}
-          EXECUTION="export OMP_NUM_THREADS=${comp_proc_omp_loc} ; ${EXECUTION} "
+          echo ""  >> script_${ExeNameOut}.ksh
+          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
         fi
+
+        if  ( ${OK_PARA_MPI} ) ; then
+          eval comp_proc_mpi_loc=\${${comp}_PROC_MPI}
+          # Default : ccc_mprun used if nb_proc gt 1
+          # to have out/err per process on different files
+          # echo "./${ExeNameOut} > out_${ExeNameOut}.out.\${SLURM_PROCID} 2>out_${ExeNameOut}.err.\${SLURM_PROCID}"  >> script_${ExeNameOut}.ksh
+          echo "./${ExeNameOut}" >> script_${ExeNameOut}.ksh
+          EXECUTION="${HOST_MPIRUN_COMMAND} -n ${comp_proc_mpi_loc} ./script_${ExeNameOut}.ksh"
+        else
+          # Default : ccc_mprun is NOT used if nb_proc eq 1
+          # to have out/err per process on different files
+          # echo "./${ExeNameOut} > out_${ExeNameOut}.out 2>out_${ExeNameOut}.err" >> script_${ExeNameOut}.ksh
+          echo "./${ExeNameOut}" >> script_${ExeNameOut}.ksh
+          EXECUTION="/usr/bin/time ./script_${ExeNameOut}.ksh"
+        fi
+
+        IGCM_debug_Print 1 "sys Curie : script_${ExeNameOut}.ksh contains"
+        cat script_${ExeNameOut}.ksh
+
       fi