Changeset 1492

Timestamp:

10/18/19 17:29:44 (5 years ago)

Author:

jgipsl

Message:

Treated case MPMD MPI only (executaionType=1) at jeanzay. Note mpivars.h currently needed for this case is sourced from main job for all cases at jeanzay.

Location:

trunk/libIGCM

Files:

• AA_job (modified) (2 diffs)
• libIGCM_sys/libIGCM_sys_jeanzay.ksh (modified) (4 diffs)

trunk/libIGCM/AA_job

@@ -50 +50 @@
 #-Q- jeanzay #SBATCH --output=Script_Output_::Jobname::.000001    # standard output
 #-Q- jeanzay #SBATCH --error=Script_Output_::Jobname::.000001    # error output
-#-Q- jeanzay ####SBATCH -eo
 #-Q- jeanzay #SBATCH --ntasks=::JobNumProcTot::   # Number of MPI tasks
 #-Q- jeanzay #SBATCH --cpus-per-task=::openMPthreads::  # Number of openMP threads.
@@ -487 +486 @@
   IGCM_debug_Verif_Exit
 
+#-Q- jeanzay # Workaround at Jean-Zay
+#-Q- jeanzay source $I_MPI_ROOT/intel64/bin/mpivars.sh release_mt
+
   #D-
   #D---------------------------------------------------------------------==

trunk/libIGCM/libIGCM_sys/libIGCM_sys_jeanzay.ksh

@@ -157 +157 @@
 #====================================================
 #- HOST_MPIRUN_COMMAND
-typeset -r HOST_MPIRUN_COMMAND=${HOST_MPIRUN_COMMAND:="/usr/bin/time srun --mpi=pmi2 "}
+typeset -r HOST_MPIRUN_COMMAND=${HOST_MPIRUN_COMMAND:="/usr/bin/time srun "}
 
 #====================================================
@@ -178 +178 @@
 #- Number of computing cores per node 
 #-
-NB_CORE_PER_NODE=48
+NB_CORE_PER_NODE=40
 
 #D-#==================================================
@@ -1237 +1237 @@
     # case 1 : Only MPI (MPMD)
     if  ( ! ${OK_PARA_OMP} ) ; then
-
       # Build run_file
-
+      current_core=0
       # First loop on the components for the coupler ie oasis (only if oasis3)
       # the coupler ie oasis3 must be the first one
@@ -1247 +1246 @@
         eval ExeNameOut=\${config_Executable_${comp}[1]}
 
-        # for CPL component only
-        if [ "X${comp}" = "XCPL" ] && [ "X${ExeNameOut}" != X\"\" ] ; then
+        # Only if the component has an executable
+        if ( [ "X${ExeNameOut}" != X\"\" ] ) ; then
 
           eval comp_proc_mpi_loc=\${${comp}_PROC_MPI}
-          eval comp_proc_omp_loc=\${${comp}_PROC_OMP}
-          echo "${comp_proc_mpi_loc} ./${ExeNameOut}" >> run_file
+          (( end_core = ${current_core} + ${comp_proc_mpi_loc} - 1 ))
+          echo "${current_core}-${end_core} ./${ExeNameOut}" >> run_file
+          (( current_core = ${end_core} + 1 ))
         fi
       done
 
-      # Then second loop on the components
-      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 and not the coupler ie oasis:
-        if ( [ "X${ExeNameOut}" != X\"\" ] && [ "X${comp}" != "XCPL" ] ) ; then
-
-          eval comp_proc_mpi_loc=\${${comp}_PROC_MPI}
-          eval comp_proc_omp_loc=\${${comp}_PROC_OMP}
-          echo "${comp_proc_mpi_loc} ./${ExeNameOut}" >> run_file
-        fi
-      done
-
-      EXECUTION="${HOST_MPIRUN_COMMAND} -f ./run_file"
+      EXECUTION="${HOST_MPIRUN_COMMAND} --multi-prog ./run_file"
 
       IGCM_sys_Chmod u+x run_file