From c317c42238a61504dcd9b9b5a944ce79b98f47a0 Mon Sep 17 00:00:00 2001 From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr> Date: Wed, 6 Sep 2023 11:54:45 +0200 Subject: [PATCH] Philippe 06/09/2023: unset MAKEFLAGS in all job_make_examples_* jobs (to prevent problems with multiple commands launched in parallel if MAKEFLAGS='-j xx' previously set) --- src/job_make_examples_Atos_HPCF | 2 ++ src/job_make_examples_BG | 2 ++ src/job_make_examples_BGQ | 2 ++ src/job_make_examples_BullX | 2 ++ src/job_make_examples_BullX_belenos | 2 ++ src/job_make_examples_BullX_irene | 2 ++ src/job_make_examples_BullX_irene_AMD | 2 ++ src/job_make_examples_BullX_occigen | 2 ++ src/job_make_examples_BullX_olympe | 2 ++ src/job_make_examples_CRAY_cca | 2 ++ src/job_make_examples_HPE_jeanzay | 2 ++ src/job_make_examples_IBM_ada | 2 ++ src/job_make_examples_IBM_sp6_vargas | 2 ++ src/job_make_examples_NEC_SX8 | 2 ++ src/job_make_examples_SX8 | 2 ++ src/job_make_examples_cxa | 2 ++ 16 files changed, 32 insertions(+) diff --git a/src/job_make_examples_Atos_HPCF b/src/job_make_examples_Atos_HPCF index 734b7b628..65ba970c3 100755 --- a/src/job_make_examples_Atos_HPCF +++ b/src/job_make_examples_Atos_HPCF @@ -19,6 +19,8 @@ set -e hostname # Echo des commandes +unset MAKEFLAGS + . ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-1-MPIAUTO-O2 export MONORUN="Mpirun -np 1 " export MPIRUN="Mpirun -np 2 " diff --git a/src/job_make_examples_BG b/src/job_make_examples_BG index a2fb687d4..e8f613297 100755 --- a/src/job_make_examples_BG +++ b/src/job_make_examples_BG @@ -18,6 +18,8 @@ set -x cd $LOADL_STEP_INITDIR +unset MAKEFLAGS + . ../conf/profile_mesonh-BG-R8I4-MNH-V5-6-1-MPIAUTO-O2 diff --git a/src/job_make_examples_BGQ b/src/job_make_examples_BGQ index ea7d98721..c03278a8d 100755 --- a/src/job_make_examples_BGQ +++ b/src/job_make_examples_BGQ @@ -18,6 +18,8 @@ cd $LOADL_STEP_INITDIR +unset MAKEFLAGS + . ../conf/profile_mesonh-BGQ-R8I4-MNH-V5-6-1-MPIAUTO-O2NAN set -x diff --git a/src/job_make_examples_BullX b/src/job_make_examples_BullX index ed1422256..0b587f091 100755 --- a/src/job_make_examples_BullX +++ b/src/job_make_examples_BullX @@ -19,6 +19,8 @@ set -e hostname # Echo des commandes +unset MAKEFLAGS + . ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-1-MPIINTEL-O3 export MONORUN="Mpirun -np 1 " export MPIRUN="Mpirun -np 2 " diff --git a/src/job_make_examples_BullX_belenos b/src/job_make_examples_BullX_belenos index 69a9d0679..857cbb403 100755 --- a/src/job_make_examples_BullX_belenos +++ b/src/job_make_examples_BullX_belenos @@ -18,6 +18,8 @@ set -e hostname # Echo des commandes +unset MAKEFLAGS + . ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-1-MPIAUTO-O3 export MONORUN="Mpirun -np 1 " export MPIRUN="Mpirun -np 2 " diff --git a/src/job_make_examples_BullX_irene b/src/job_make_examples_BullX_irene index 4aa1f9050..06ae65615 100755 --- a/src/job_make_examples_BullX_irene +++ b/src/job_make_examples_BullX_irene @@ -21,6 +21,8 @@ set +x # Nom de la machine hostname +unset MAKEFLAGS + . ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-1-MPIAUTO-O2 set -x diff --git a/src/job_make_examples_BullX_irene_AMD b/src/job_make_examples_BullX_irene_AMD index 4c3d972b5..be925880c 100755 --- a/src/job_make_examples_BullX_irene_AMD +++ b/src/job_make_examples_BullX_irene_AMD @@ -20,6 +20,8 @@ set +x # Nom de la machine hostname +unset MAKEFLAGS + . ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-1-AMD-MPIAUTO-O2 set -x diff --git a/src/job_make_examples_BullX_occigen b/src/job_make_examples_BullX_occigen index 5ea497f73..6542f508b 100755 --- a/src/job_make_examples_BullX_occigen +++ b/src/job_make_examples_BullX_occigen @@ -18,6 +18,8 @@ set -x # Nom de la machine hostname +unset MAKEFLAGS + . ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-1-MPIINTEL-O2 export MONORUN="Mpirun -prepend-rank -np 1 " export MPIRUN="Mpirun -prepend-rank -np 4 " diff --git a/src/job_make_examples_BullX_olympe b/src/job_make_examples_BullX_olympe index b8db54ef7..69b879082 100755 --- a/src/job_make_examples_BullX_olympe +++ b/src/job_make_examples_BullX_olympe @@ -17,6 +17,8 @@ set -x # Nom de la machine hostname +unset MAKEFLAGS + . ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-1-MPIINTEL-O2 export MONORUN="mpirun -prepend-rank -np 1 " export MPIRUN="mpirun -prepend-rank -np 4 " diff --git a/src/job_make_examples_CRAY_cca b/src/job_make_examples_CRAY_cca index 12b005a82..377799f81 100755 --- a/src/job_make_examples_CRAY_cca +++ b/src/job_make_examples_CRAY_cca @@ -24,6 +24,8 @@ set -x # Nom de la machine hostname +unset MAKEFLAGS + cd ${PBS_O_WORKDIR} ARCH=LXifort diff --git a/src/job_make_examples_HPE_jeanzay b/src/job_make_examples_HPE_jeanzay index 146accb1c..69cf4ed54 100755 --- a/src/job_make_examples_HPE_jeanzay +++ b/src/job_make_examples_HPE_jeanzay @@ -19,6 +19,8 @@ set -x # Nom de la machine hostname +unset MAKEFLAGS + . ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-1-MPIINTEL-O2 export MONORUN="Exec srun -l -n 1 --export=ALL numabind_core_slurm" export MPIRUN="Exec srun -l -n 4 --export=ALL numabind_core_slurm" diff --git a/src/job_make_examples_IBM_ada b/src/job_make_examples_IBM_ada index acd11c6ff..fab87c7c9 100755 --- a/src/job_make_examples_IBM_ada +++ b/src/job_make_examples_IBM_ada @@ -19,6 +19,8 @@ cd $LOADL_STEP_INITDIR +unset MAKEFLAGS + . ../conf/profile_mesonh-LXifort-R8I4-MNH-V5-6-1-MPIINTEL-O2 # Pour avoir l'echo des commandes diff --git a/src/job_make_examples_IBM_sp6_vargas b/src/job_make_examples_IBM_sp6_vargas index 383244cb7..a9b0f4527 100755 --- a/src/job_make_examples_IBM_sp6_vargas +++ b/src/job_make_examples_IBM_sp6_vargas @@ -24,6 +24,8 @@ set -x cd $LOADL_STEP_INITDIR +unset MAKEFLAGS + . ../conf/profile_mesonh-AIX64-R8I4-MNH-V5-6-1-MPIAUTO-O2 diff --git a/src/job_make_examples_NEC_SX8 b/src/job_make_examples_NEC_SX8 index ba52d312a..c3a8d5b4e 100755 --- a/src/job_make_examples_NEC_SX8 +++ b/src/job_make_examples_NEC_SX8 @@ -16,6 +16,8 @@ set -x # Nom de la machine hostname +unset MAKEFLAGS + [ -d $PBS_O_WORKDIR ] && cd $PBS_O_WORKDIR # . ../conf/profile_mesonh-SX8-R8I4-MNH-V5-6-1-MPIAUTO-O4 diff --git a/src/job_make_examples_SX8 b/src/job_make_examples_SX8 index 599cb71e3..8b64eb53b 100755 --- a/src/job_make_examples_SX8 +++ b/src/job_make_examples_SX8 @@ -16,6 +16,8 @@ set -x # Nom de la machine hostname +unset MAKEFLAGS + [ -d $PBS_O_WORKDIR ] && cd $PBS_O_WORKDIR # diff --git a/src/job_make_examples_cxa b/src/job_make_examples_cxa index 974e6cee4..e47b714db 100755 --- a/src/job_make_examples_cxa +++ b/src/job_make_examples_cxa @@ -34,6 +34,8 @@ echo SHELL=$SHELL cd $LOADL_STEP_INITDIR +unset MAKEFLAGS + . ../conf/profile_mesonh-AIX64-R8I4-MNH-V5-6-1-MPIAUTO-O2 ulimit -c 0 # pas de core -- GitLab