From 8adb9c3d615f0a55d02992798c06831d9b4a3db4 Mon Sep 17 00:00:00 2001 From: Jonathan Frawley <jonathan.frawley@durham.ac.uk> Date: Thu, 21 Jan 2021 15:16:18 +0000 Subject: [PATCH] Separate into fast and slow benchmarks --- benchmark-fast/job-aps.sh | 10 ++++---- benchmark-fast/job-arm.sh | 16 ++++++++----- benchmark-slow/build.sh | 17 +++++++++++++ .../job-aps.sh | 13 +++++----- benchmark-slow/job-arm.sh | 24 +++++++++++++++++++ 5 files changed, 63 insertions(+), 17 deletions(-) create mode 100644 benchmark-slow/build.sh rename benchmark-fast/job-aps-sodshock.sh => benchmark-slow/job-aps.sh (51%) create mode 100644 benchmark-slow/job-arm.sh diff --git a/benchmark-fast/job-aps.sh b/benchmark-fast/job-aps.sh index a9d8c0f..f6641be 100644 --- a/benchmark-fast/job-aps.sh +++ b/benchmark-fast/job-aps.sh @@ -1,6 +1,6 @@ #!/bin/bash #SBATCH --job-name="swiftaps" -#SBATCH --ntasks=1 +#SBATCH --ntasks=4 #SBATCH --ntasks-per-node=1 #SBATCH --output=swiftaps.out #SBATCH --error=swiftaps.err @@ -11,7 +11,8 @@ #SBATCH --cpus-per-task=32 module load intel_comp/2018 -module load intel_mpi/2018 +#module load intel_mpi/2018 +module load intel_mpi/2020-update2 module load parmetis/4.0.3 module load parallel_hdf5/1.10.3 module load gsl/2.4 @@ -19,10 +20,9 @@ module load fftw/3.3.8epyc module load python/3.6.5 module load vtune -pushd swiftsim/examples/PMillennium/PMillennium-768 +pushd swiftsim/examples/HydroTests/SodShock_3D export MPS_STAT_LEVEL=2 export APS_ARGS="--collection-mode=mpi,omp" -mpirun -np 1 aps $APS_ARGS ../../swift_mpi --cosmology --self-gravity -v 1 --threads=64 -n 1 -P Restarts:enable:0 -PInitialConditions:file_name:/cosma5/data/do008/dc-fraw1/swift_initial_conditions/pmillenium/PMill-768.hdf5 p-mill-768.yml - +mpirun -np 4 aps $APS_ARGS ../../swift_mpi --hydro -v 1 --threads=64 -n 10000 -P Restarts:enable:0 sodShock.yml diff --git a/benchmark-fast/job-arm.sh b/benchmark-fast/job-arm.sh index 64c3ef9..9dfdb90 100644 --- a/benchmark-fast/job-arm.sh +++ b/benchmark-fast/job-arm.sh @@ -1,24 +1,28 @@ #!/bin/bash #SBATCH --job-name="swiftarm" -#SBATCH --ntasks=1 +#SBATCH --ntasks=4 #SBATCH --ntasks-per-node=1 #SBATCH --output=swiftarm.out #SBATCH --error=swiftarm.err -#SBATCH --time=2:40:0 +#SBATCH --time=0:40:0 #SBATCH -p bluefield1 ##SBATCH -A durham #SBATCH -A do008 #SBATCH --cpus-per-task=32 module load intel_comp/2018 -module load intel_mpi/2018 +#module load intel_mpi/2018 +module load intel_mpi/2020-update2 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 allinea/ddt/20.2.1 -pushd swiftsim/examples/PMillennium/PMillennium-768 +module load vtune -perf-report --mpi=intel-mpi -np 1 ../../swift_mpi --cosmology --self-gravity -v 1 --threads=64 -n 1 -P Restarts:enable:0 -PInitialConditions:file_name:/cosma5/data/do008/dc-fraw1/swift_initial_conditions/pmillenium/PMill-768.hdf5 p-mill-768.yml +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 diff --git a/benchmark-slow/build.sh b/benchmark-slow/build.sh new file mode 100644 index 0000000..ffa20be --- /dev/null +++ b/benchmark-slow/build.sh @@ -0,0 +1,17 @@ +module load intel_comp/2018 +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 +rm -rf swiftsim +cp -rf ../../swiftsim ./ +pushd swiftsim +git checkout bd36987f24e03ef35a52d40288dad77fe374dfc4 +git clean -x -f -d +./autogen.sh +cd ./ +./configure CC="icc" CXX="icpc" --enable-ipo --with-tbbmalloc --with-parmetis +make -j 32 + diff --git a/benchmark-fast/job-aps-sodshock.sh b/benchmark-slow/job-aps.sh similarity index 51% rename from benchmark-fast/job-aps-sodshock.sh rename to benchmark-slow/job-aps.sh index bdc8b91..a9d8c0f 100644 --- a/benchmark-fast/job-aps-sodshock.sh +++ b/benchmark-slow/job-aps.sh @@ -1,9 +1,9 @@ #!/bin/bash -#SBATCH --job-name="swiftapssodshock" -#SBATCH --ntasks=4 +#SBATCH --job-name="swiftaps" +#SBATCH --ntasks=1 #SBATCH --ntasks-per-node=1 -#SBATCH --output=swiftapssodshock.out -#SBATCH --error=swiftapssodshock.err +#SBATCH --output=swiftaps.out +#SBATCH --error=swiftaps.err #SBATCH --time=0:40:0 #SBATCH -p bluefield1 ##SBATCH -A durham @@ -19,9 +19,10 @@ module load fftw/3.3.8epyc module load python/3.6.5 module load vtune -pushd swiftsim/examples/HydroTests/SodShock_3D +pushd swiftsim/examples/PMillennium/PMillennium-768 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 +mpirun -np 1 aps $APS_ARGS ../../swift_mpi --cosmology --self-gravity -v 1 --threads=64 -n 1 -P Restarts:enable:0 -PInitialConditions:file_name:/cosma5/data/do008/dc-fraw1/swift_initial_conditions/pmillenium/PMill-768.hdf5 p-mill-768.yml + diff --git a/benchmark-slow/job-arm.sh b/benchmark-slow/job-arm.sh new file mode 100644 index 0000000..64c3ef9 --- /dev/null +++ b/benchmark-slow/job-arm.sh @@ -0,0 +1,24 @@ +#!/bin/bash +#SBATCH --job-name="swiftarm" +#SBATCH --ntasks=1 +#SBATCH --ntasks-per-node=1 +#SBATCH --output=swiftarm.out +#SBATCH --error=swiftarm.err +#SBATCH --time=2:40:0 +#SBATCH -p bluefield1 +##SBATCH -A durham +#SBATCH -A do008 +#SBATCH --cpus-per-task=32 + +module load intel_comp/2018 +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 allinea/ddt/20.2.1 +pushd swiftsim/examples/PMillennium/PMillennium-768 + +perf-report --mpi=intel-mpi -np 1 ../../swift_mpi --cosmology --self-gravity -v 1 --threads=64 -n 1 -P Restarts:enable:0 -PInitialConditions:file_name:/cosma5/data/do008/dc-fraw1/swift_initial_conditions/pmillenium/PMill-768.hdf5 p-mill-768.yml + -- GitLab