Revert back to single node jobs

benchmark-fast/job-aps.sh

 #!/bin/bash
 #SBATCH --job-name="swiftaps"
-#SBATCH --ntasks=4
+#SBATCH --ntasks=1
 #SBATCH --ntasks-per-node=1
 #SBATCH --output=swiftaps.out
 #SBATCH --error=swiftaps.err
@@ -11,8 +11,7 @@
 #SBATCH --cpus-per-task=32
 
 module load intel_comp/2018
-#module load intel_mpi/2018
-module load intel_mpi/2020-update2
+module load intel_mpi/2018
 module load parmetis/4.0.3
 module load parallel_hdf5/1.10.3
 module load gsl/2.4
@@ -25,4 +24,6 @@ pushd swiftsim/examples/HydroTests/SodShock_3D
 export MPS_STAT_LEVEL=2
 export APS_ARGS="--collection-mode=mpi,omp"
 
-mpirun -np 4 aps $APS_ARGS ../../swift_mpi --hydro -v 1 --threads=64 -n 10000 -P Restarts:enable:0 sodShock.yml
+export I_MPI_HYDRA_DEBUG=1
+
+mpirun -np $SLURM_NTASKS -iface p1p2 aps $APS_ARGS ../../swift_mpi --hydro -v 1 --threads=64 -n 10000 -P Restarts:enable:0 sodShock.yml

benchmark-fast/job-arm.sh

 #!/bin/bash
 #SBATCH --job-name="swiftarm"
-#SBATCH --ntasks=4
+#SBATCH --ntasks=1
 #SBATCH --ntasks-per-node=1
 #SBATCH --output=swiftarm.out
 #SBATCH --error=swiftarm.err
@@ -11,18 +11,17 @@
 #SBATCH --cpus-per-task=32
 
 module load intel_comp/2018
-#module load intel_mpi/2018
-module load intel_mpi/2020-update2
+module load intel_mpi/2018
 module load parmetis/4.0.3
 module load parallel_hdf5/1.10.3
 module load gsl/2.4
 module load fftw/3.3.8epyc
 module load python/3.6.5
-module load vtune
+module load allinea/ddt/20.2.1
 
 pushd swiftsim/examples/HydroTests/SodShock_3D
 
 export MPS_STAT_LEVEL=2
 export APS_ARGS="--collection-mode=mpi,omp"
 
-perf-report --mpi=intel-mpi -np 4 ../../swift_mpi --hydro -v 1 --threads=64 -n 10000 -P Restarts:enable:0 sodShock.yml
+perf-report --mpi=intel-mpi -np $SLURM_NTASKS ../../swift_mpi --hydro -v 1 --threads=64 -n 10000 -P Restarts:enable:0 sodShock.yml