Changeset 1480 for trunk

Timestamp:

03/26/19 12:01:45 (5 years ago)

Author:

jgipsl

Message:

Change submission at obelix: when launching only 1proc, mpirun must not be set. While using mpirun for only 1proc, the execution will always force to use cpu0 on the node. The issue has been investigated with F. Marabelle but it is still not clear why it is not working correctly. It might be an issue with the version of mpirun.

Following settings in config.card are now treated as the same at obelix:
OOL= (orchidee_ol, orchidee_ol, 1MPI)
OOL= (orchidee_ol, orchidee_ol)

File:

• trunk/libIGCM/libIGCM_sys/libIGCM_sys_obelix.ksh (modified) (1 diff)

trunk/libIGCM/libIGCM_sys/libIGCM_sys_obelix.ksh

@@ -1039 +1039 @@
           echo "export OMP_NUM_THREADS=${comp_proc_omp_loc}" >> script_${ExeNameOut}.ksh
         fi
-        if  ( ${OK_PARA_MPI} ) ; then
+
+        if [ ${mpiTasks} -eq 1 ] && [ ${openMPthreads} -eq 1 ] ; then
+          # Case with only one proc
+          # mpirun should not be used at obelix for only one proc
+          # Output text per process
+          echo "./${ExeNameOut} > out_${ExeNameOut}.out 2>out_${ExeNameOut}.err" >> script_${ExeNameOut}.ksh
+          IGCM_sys_Chmod u+x script_${ExeNameOut}.ksh
+          EXECUTION="time ./script_${ExeNameOut}.ksh"
+        elif  ( ${OK_PARA_MPI} ) ; then
           # Default : mpirun used if nb_proc gt 1
-          # pour sortie out/err par process
+          # Output text per process
           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"
         else
-          # Default : mpirun is NOT used if nb_proc eq 1
-          # pour sortie out/err par process
-          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"
+          # Strange case. 
+          IGCM_debug_Exit "ERROR with OK_PARA_MPI"
+          IGCM_debug_Print 2 "sys Obelix : OK_PARA_MPI=False and mpiTask/openMPthreds different from 1"
+          IGCM_debug_Verif_Exit
         fi